some fixes to handle builddirs, which distcheck uses, along with complete .pc files

Original commit message from CVS:
some fixes to handle builddirs, which distcheck uses, along with complete .pc files

diff --git a/configure.in b/configure.in
index 686026e..781719f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -515,7 +515,7 @@ AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
 AC_MSG_CHECKING(arts library)
 dnl AC_CHECK_LIB(artsflow, convert_stereo_ifloat_2float, HAVE_ARTS=yes, HAVE_ARTS=no, -lmcop -lartsflow_idl)
-AC_CHECK_HEADER(arts/artsflow.h, HAVE_ARTS=yes, HAVE_ARTS=no)
+dnl AC_CHECK_HEADER(arts/artsflow.h, HAVE_ARTS=yes, HAVE_ARTS=no)
 AC_LANG_RESTORE
 
 dnl Check for libraw1394
@@ -939,18 +939,18 @@ AC_SUBST(CORE_CFLAGS)
 dnl FIXME: having to AC_SUBST these is messy.  Not sure if CPPFLAGS and LDFLAGS
 dnl need it, either.
 
-dnl Private vars for libgst only
-LIBGST_LIBS="$LIBS"
-LIBGST_CFLAGS="$CFLAGS"
-AC_SUBST(LIBGST_LIBS)
-AC_SUBST(LIBGST_CFLAGS)
-
 dnl Vars for everyone else
 GST_LIBS="\$(top_builddir)/gst/libgst.la"
 GST_CFLAGS="-I\$(top_srcdir) -I\$(top_srcdir)/include"
 AC_SUBST(GST_LIBS)
 AC_SUBST(GST_CFLAGS)
 
+dnl Private vars for libgst only
+LIBGST_LIBS="$LIBS"
+LIBGST_CFLAGS="$CFLAGS $GST_CFLAGS"
+AC_SUBST(LIBGST_LIBS)
+AC_SUBST(LIBGST_CFLAGS)
+
 dnl CFLAGS for everyone else
 CFLAGS="$CFLAGS $GST_CFLAGS"
 AC_SUBST(LIBS)

diff --git a/gst/Makefile.am b/gst/Makefile.am
index edd8c0d..2e701e0 100644 (file)
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -52,11 +52,12 @@ libgst_la_SOURCES =         \
 #LTCOMPILE2=$(LTCOMPILE) -O2
 #COMPILE2=$(COMPILE) -O2
 
-cothreads.lo: cothreads.c cothreads.h gst_private.h ../config.h gstinfo.c \
-gstarch.h gsti386.h
+# FIXME this only lists the x86 arch file, we really should merge them all
+cothreads.lo: $(srcdir)/cothreads.c $(srcdir)/cothreads.h $(srcdir)/gst_private.h \
+  $(top_builddir)/config.h $(srcdir)/gstinfo.c $(srcdir)/gstarch.h $(srcdir)/gsti386.h
        $(LIBTOOL) --mode=compile $(COMPILE) -O2 -c $<
-cothreads.o: cothreads.c cothreads.h gst_private.h ../config.h gstinfo.c \
-gstarch.h gsti386.h
+cothreads.o: $(srcdir)/cothreads.c $(srcdir)/cothreads.h $(srcdir)/gst_private.h \
+  $(top_builddir)/config.h $(srcdir)/gstinfo.c $(srcdir)/gstarch.h $(srcdir)/gsti386.h
        $(COMPILE) -O2 -c $<
 
 # NOTDEPEND.cothreads.lo: cothreads.c

diff --git a/gstreamer-uninstalled.pc.in b/gstreamer-uninstalled.pc.in
index 0cc88fd..ae74073 100644 (file)
--- a/gstreamer-uninstalled.pc.in
+++ b/gstreamer-uninstalled.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: GStreamer Uninstalled
 Description: Streaming-media framework, Not Installed
 Version: @VERSION@
-Requires: glib gtk+
-Libs:  ${pcbuilddir}/${pcfiledir}/gst/libgst.la
+Requires: glib >= 1.2.0, gtk+ >= 1.2.0, libxml >= 1.8.1
+Libs: ${pcbuilddir}/${pcfiledir}/gst/libgst.la
 Cflags: -I${pcbuilddir}/${pcfiledir}

diff --git a/gstreamer.pc.in b/gstreamer.pc.in
index 47ed44b..584dc78 100644 (file)
--- a/gstreamer.pc.in
+++ b/gstreamer.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: GStreamer
 Description: Streaming-media framework
-Requires:
+Requires: glib >= 1.2.0, gtk+ >= 1.2.0, libxml >= 1.8.1
 Version: @VERSION@
 Libs: -L${libdir} -lgst
-Cflags:
+Cflags: -I${includedir}