# HG changeset patch
# User rosfran
# Date 1168461131 0
# Node ID 0bddbe7eba515099b0d6087304846e57a75a0df5
# Parent 9f0346db9a46382d73d21c4c796a1305925967e4
[svn r253] Fixes some autotools problems.
diff -r 9f0346db9a46 -r 0bddbe7eba51 gmyth-upnp/ChangeLog
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/gmyth-upnp/ChangeLog Wed Jan 10 20:32:11 2007 +0000
@@ -0,0 +1,24 @@
+2006-08-17 Rosfran Borges <rosfran.borges@indt.org.br>
+ * Added the correct gstreamer-base package (GSTBASE) at the configure.ac;
+ GSTBASE_CFLAGS and GSTBASE_LIBS variables had the same values from
+ the GST_CFLAGS/GST_LIBS.
+
+2006-08-16 Rosfran Borges <rosfran.borges@indt.org.br>
+ * Fixed some installation issues, regarding lib-installing to the
+ correct directory, and copying the header files to the destination
+ dir (make install).
+ * Put 'pkg-config' resource to the Maemo Myth library. The name of the
+ PKG-CONFIG resource is 'maemo-myth', plus the minor and major version.
+ Actually, the version is '0.1', so the library config file is:
+ 'maemo-myth-0.1.pc'. You can type: 'pkg-config --cflags --libs
+ maemo-myth-0.1'.
+ * Many adjustments in the automake/autoconf configuration files
+ (configure.ac, Makefile.am) - some autotools misusage fixed.
+ * Added the MythURI structure, and the URI parsing utility functions
+ (missing in the GLib).
+ * Some functions were exported (myth_socket, gmyth_context), that's
+ why many ther modules need to use them.
+ * Fixed some library dependencies.
+ * Prepared to be used inside the GStreamer (linking with the MythTV
+ plug-in).
+
diff -r 9f0346db9a46 -r 0bddbe7eba51 gmyth-upnp/Makefile.am
--- a/gmyth-upnp/Makefile.am Wed Jan 10 17:19:50 2007 +0000
+++ b/gmyth-upnp/Makefile.am Wed Jan 10 20:32:11 2007 +0000
@@ -1,12 +1,12 @@
SUBDIRS= src
### all of the standard pc files we need to generate
-pcfiles = gmyth-@GMYTH_MAJORMINOR@.pc
+pcfiles = gmyth-upnp.pc
all-local: $(pcfiles)
### how to generate pc files
-%-@GMYTH_MAJORMINOR@.pc: %.pc
+%.pc: %.pc
cp $< $@
pkgconfigdir = $(libdir)/pkgconfig
diff -r 9f0346db9a46 -r 0bddbe7eba51 gmyth-upnp/autogen.sh
--- a/gmyth-upnp/autogen.sh Wed Jan 10 17:19:50 2007 +0000
+++ b/gmyth-upnp/autogen.sh Wed Jan 10 20:32:11 2007 +0000
@@ -2,7 +2,7 @@
# Run this to generate all the initial makefiles, etc.
DIE=0
-package=gmyth
+package=gmyth-upnp
srcfile=configure.ac
# a quick cvs co if necessary to alleviate the pain - may remove this
diff -r 9f0346db9a46 -r 0bddbe7eba51 gmyth-upnp/configure.ac
--- a/gmyth-upnp/configure.ac Wed Jan 10 17:19:50 2007 +0000
+++ b/gmyth-upnp/configure.ac Wed Jan 10 20:32:11 2007 +0000
@@ -34,33 +34,17 @@
DX_XML_FEATURE(OFF)
DX_PDF_FEATURE(OFF)
DX_PS_FEATURE(OFF)
-DX_INIT_DOXYGEN(gmyth, doxygen.cfg, docs)
+DX_INIT_DOXYGEN(gmyth-upnp, doxygen.cfg, docs)
# Checks for libraries.
-## Check for gmyth-0.1
-PKG_CHECK_MODULES(LIBGMYTH, gmyth-0.1, HAVE_LIBGMYTH=yes,HAVE_LIBGMYTH=no)
-
-# Give error and exit if we don't have gmyth-0.1
-if test "x$HAVE_LIBGMYTH" = "xno"; then
- AC_MSG_ERROR(you need gmyth-0.1 installed)
+# Check for pkgconfig
+AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
+# Give error and exit if we don't have pkgconfig
+if test "x$HAVE_PKGCONFIG" = "xno"; then
+ AC_MSG_ERROR(you need to have pkgconfig installed !)
fi
-# make LIBXML_CFLAGS and LIBXML_LIBS available
-AC_SUBST(LIBGMYTH_CFLAGS)
-AC_SUBST(LIBGMYTH_LIBS)
-
-dnl ========== Check for Cyberlink UPnP Libraries
-PKG_CHECK_MODULES(CYBERLINK, clinkc,
- HAVE_CYBERLINK=yes, HAVE_CYBERLINK=no)
-
-if test "x$HAVE_CYBERLINK" = "xno"; then
- AC_MSG_ERROR(you need clinkc installed)
-
-dnl make CYBERLINK_CFLAGS and CYBERLINK_LIBS available
-AC_SUBST(CYBERLINK_CFLAGS)
-AC_SUBST(CYBERLINK_LIBS)
-
# Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h unistd.h])
@@ -83,6 +67,16 @@
AC_FUNC_VPRINTF
AC_CHECK_FUNCS([memset socket stime strstr strtoul gethostname inet_ntoa localtime_r select strrchr localtime strptime])
+##############################
+# Checks for Network functions
+##############################
+
+AC_CHECK_FUNCS([socket])
+AC_CHECK_FUNCS([inet_ntoa])
+AC_CHECK_HEADERS([ifaddrs.h])
+AC_CHECK_FUNCS([getifaddrs])
+AC_CHECK_FUNCS([time])
+
AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
CFLAGS="$CFLAGS -I/usr/include"
@@ -97,14 +91,7 @@
CFLAGS="$CFLAGS -g -DGMYTH_USE_DEBUG"
else
CFLAGS="$CFLAGS -O2 -DG_DISABLE_CHECKS"
-fi
-
-# Check for pkgconfig
-AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
-# Give error and exit if we don't have pkgconfig
-if test "x$HAVE_PKGCONFIG" = "xno"; then
- AC_MSG_ERROR(you need to have pkgconfig installed !)
-fi
+fi
# Check for Glib2.0
PKG_CHECK_MODULES(GLIB, glib-2.0, HAVE_GLIB=yes,HAVE_GLIB=no)
@@ -132,30 +119,39 @@
AC_SUBST(GOBJECT_CFLAGS)
AC_SUBST(GOBJECT_LIBS)
-##############################
-# Checks for Network functions
-##############################
+## Check for gmyth-0.1
+PKG_CHECK_MODULES(LIBGMYTH, gmyth-0.1, HAVE_LIBGMYTH=yes,HAVE_LIBGMYTH=no)
-AC_CHECK_FUNCS([socket])
-AC_CHECK_FUNCS([inet_ntoa])
-AC_CHECK_HEADERS([ifaddrs.h])
-AC_CHECK_FUNCS([getifaddrs])
-AC_CHECK_FUNCS([time])
+# Give error and exit if we don't have gmyth-0.1
+if test "x$HAVE_LIBGMYTH" = "xno"; then
+ AC_MSG_ERROR([you need gmyth-0.1 installed])
+fi
+
+# make LIBXML_CFLAGS and LIBXML_LIBS available
+AC_SUBST(LIBGMYTH_CFLAGS)
+AC_SUBST(LIBGMYTH_LIBS)
+
+dnl ========== Check for Cyberlink UPnP Libraries
+PKG_CHECK_MODULES(CYBERLINK, clinkc,
+ HAVE_CYBERLINK=yes, HAVE_CYBERLINK=no)
+
+if test "x$HAVE_CYBERLINK" = "xno"; then
+ AC_MSG_ERROR([you need clinkc installed])
+fi
+
+dnl make CYBERLINK_CFLAGS and CYBERLINK_LIBS available
+AC_SUBST(CYBERLINK_CFLAGS)
+AC_SUBST(CYBERLINK_LIBS)
#dnl Enable gtk-doc
#GTK_DOC_CHECK(1.4)
-AC_SUBST(CFLAGS)
-AC_SUBST(LDFLAGS)
-AC_SUBST(LIBS)
-
AC_OUTPUT([
Makefile
src/Makefile
-tests/Makefile
-gmyth.pc])
+gmyth-upnp.pc])
-if test x"$enable_debug" != xno; then
+if test "x$enable_debug" != "xno"; then
AC_MSG_NOTICE([Debug: Enabled])
else
AC_MSG_NOTICE([Debug: Disabled])
diff -r 9f0346db9a46 -r 0bddbe7eba51 gmyth-upnp/gmyth-upnp.pc.in
--- a/gmyth-upnp/gmyth-upnp.pc.in Wed Jan 10 17:19:50 2007 +0000
+++ b/gmyth-upnp/gmyth-upnp.pc.in Wed Jan 10 20:32:11 2007 +0000
@@ -6,7 +6,7 @@
Name: gmyth-upnp
Description: Myth TV upnp library based upon GLib/GObject paradigm
Version: @VERSION@
-Requires: gobject-2.0 glib-2.0 clinkc
+Requires: gobject-2.0 glib-2.0 clinkc gmyth-0.1
-Libs: @CYBERLINK_LIBS@ @LIBGMYTH_LIBS@ -L${libdir} -lgmyth
-Cflags: @CYBERLINK_CFLAGS@ @LIBGMYTH_CFLAGS @-I${includedir}/gmyth-upnp
+Libs: @CYBERLINK_LIBS@ @LIBGMYTH_LIBS@ -L${libdir} -lgmythupnp
+Cflags: @CYBERLINK_CFLAGS@ @LIBGMYTH_CFLAGS@ -I${includedir}/gmyth-upnp
diff -r 9f0346db9a46 -r 0bddbe7eba51 gmyth-upnp/src/Makefile.am
--- a/gmyth-upnp/src/Makefile.am Wed Jan 10 17:19:50 2007 +0000
+++ b/gmyth-upnp/src/Makefile.am Wed Jan 10 20:32:11 2007 +0000
@@ -1,81 +1,24 @@
SUBDIRS = .
-lib_LTLIBRARIES = libgmyth.la
+lib_LTLIBRARIES = libgmythupnp.la
-BUILT_SOURCES = \
- gmyth_marshal.c \
- gmyth_marshal.h
+libgmythupnp_la_SOURCES = \
+ gmyth_upnp.c
+
+libgmythupnp_la_CFLAGS = \
+ -DDATADIR=\"$(pkgdatadir)\" \
+ $(LIBGMYTH_CFLAGS) \
+ $(CYBERLINK_CFLAGS)
-libgmyth_la_SOURCES = \
- gmyth_common.c \
- gmyth_debug.c \
- gmyth_epg.c \
- gmyth_recorder.c \
- gmyth_remote_util.c \
- gmyth_tvchain.c \
- gmyth_scheduler.c \
- gmyth_util.c \
- gmyth_query.c \
- gmyth_socket.c \
- gmyth_stringlist.c \
- gmyth_monitor_handler.c \
- gmyth_file_transfer.c \
- gmyth_livetv.c \
- gmyth_backendinfo.c \
- gmyth_programinfo.c \
- gmyth_uri.c \
- $(BUILT_SOURCES)
+libgmythupnp_la_LDFLAGS = \
+ -export-dynamic \
+ $(LIBGMYTH_LIBS) \
+ $(CYBERLINK_LIBS)
-
-EXTRA_libgmyth_la_SOURCES = gmyth_marshal.list
-
-gmyth_marshal.h: gmyth_marshal.list
- glib-genmarshal --header --prefix=gmyth_marshal gmyth_marshal.list > gmyth_marshal.h.tmp
- mv gmyth_marshal.h.tmp gmyth_marshal.h
-
-gmyth_marshal.c: gmyth_marshal.list gmyth_marshal.h
- echo "#include \"glib-object.h\"" > gmyth_marshal.c.tmp
- echo "#include \"gmyth_marshal.h\"" >> gmyth_marshal.c.tmp
- glib-genmarshal --body --prefix=gmyth_marshal $(srcdir)/gmyth_marshal.list >> gmyth_marshal.c.tmp
- mv gmyth_marshal.c.tmp gmyth_marshal.c
-
-libgmyth_la_CFLAGS = \
- -DDATADIR=\"$(pkgdatadir)\" \
- $(GLIB_CFLAGS) \
- $(GOBJECT_CFLAGS) \
- $(GST_CFLAGS) \
- $(GSTBASE_CFLAGS) \
- $(GSTPLUGINSBASE_CFLAGS) \
- $(MYSQL_CFLAGS)
-
-libgmyth_la_LDFLAGS = \
- -export-dynamic \
- $(MYSQL_LIBS) \
- $(GST_LIBS) \
- $(GSTBASE_LIBS) \
- $(GSTPLUGINS_LIBS)
-
-libgmyth_includedir = \
+libgmythupnp_includedir = \
$(pkgincludedir)
-libgmyth_include_HEADERS = \
- gmyth.h \
- gmyth_common.h \
- gmyth_debug.h \
- gmyth_epg.h \
- gmyth_recorder.h \
- gmyth_scheduler.h \
- gmyth_tvchain.h \
- gmyth_util.h \
- gmyth_query.h \
- gmyth_socket.h \
- gmyth_remote_util.h \
- gmyth_stringlist.h \
- gmyth_monitor_handler.h \
- gmyth_file_transfer.h \
- gmyth_livetv.h \
- gmyth_backendinfo.h \
- gmyth_programinfo.h \
- gmyth_uri.h
+libgmythupnp_include_HEADERS = \
+ gmyth_upnp.h
CLEANFILES = $(BUILT_SOURCES)