Port some changes from 0.6.0/0.6.1 back to HEAD (.pc files moved to pkg-config/,...

Original commit message from CVS:
Port some changes from 0.6.0/0.6.1 back to HEAD (.pc files moved to pkg-config/, .m4 file moved from plugins to core)

diff --git a/Makefile.am b/Makefile.am
index 6c5ae33..f3036f7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,34 +16,23 @@ else
 EXAMPLES_DIR=
 endif
 
-all-local: gstreamer-libs-@GST_MAJORMINOR@.pc gstreamer-play-@GST_MAJORMINOR@.pc gstreamer-libs-@GST_MAJORMINOR@-uninstalled.pc gstreamer-play-@GST_MAJORMINOR@-uninstalled.pc gst-element-check-@GST_MAJORMINOR@.m4
-
-gstreamer-libs-@GST_MAJORMINOR@.pc: gstreamer-libs.pc gstreamer-libs.pc.in
-       cp gstreamer-libs.pc gstreamer-libs-@GST_MAJORMINOR@.pc
-gstreamer-play-@GST_MAJORMINOR@.pc: gstreamer-play.pc gstreamer-play.pc.in
-       cp gstreamer-play.pc gstreamer-play-@GST_MAJORMINOR@.pc
-gstreamer-libs-@GST_MAJORMINOR@-uninstalled.pc: gstreamer-libs-uninstalled.pc gstreamer-libs-uninstalled.pc.in
-       cp gstreamer-libs-uninstalled.pc gstreamer-libs-@GST_MAJORMINOR@-uninstalled.pc
-gstreamer-play-@GST_MAJORMINOR@-uninstalled.pc: gstreamer-play-uninstalled.pc gstreamer-play-uninstalled.pc.in
-       cp gstreamer-play-uninstalled.pc gstreamer-play-@GST_MAJORMINOR@-uninstalled.pc
-gst-element-check-@GST_MAJORMINOR@.m4: gst-element-check.m4
-       cp $(srcdir)/gst-element-check.m4 gst-element-check-@GST_MAJORMINOR@.m4
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = \
-       gstreamer-libs-@GST_MAJORMINOR@.pc \
-       gstreamer-play-@GST_MAJORMINOR@.pc
-
-aclocaldir = $(datadir)/aclocal
-aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4
-
-SUBDIRS=gst-libs gst sys $(EXT_DIR) $(EXAMPLES_DIR) tools $(GCONF_DIR) testsuite
-
-DIST_SUBDIRS=gst-libs gst sys ext examples tools gconf testsuite
-
-EXTRA_DIST=gst-plugins.spec depcomp gst-element-check.m4 \
-           gstreamer-libs.pc.in gstreamer-libs-uninstalled.pc.in \
-           gstreamer-play.pc.in gstreamer-play-uninstalled.pc.in \
+SUBDIRS=gst-libs \
+       gst sys $(EXT_DIR) \
+       $(EXAMPLES_DIR) \
+       tools \
+       $(GCONF_DIR) \
+       testsuite \
+       pkgconfig
+
+DIST_SUBDIRS=gst-libs \
+       gst sys ext \
+       examples \
+       tools \
+       gconf \
+       testsuite \
+       pkgconfig
+
+EXTRA_DIST=gst-plugins.spec depcomp \
           AUTHORS COPYING README RELEASE REQUIREMENTS \
           ChangeLog autogen.sh common m4
 

diff --git a/configure.ac b/configure.ac
index 790ae53..3e0b398 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -157,10 +157,17 @@ if test -z $GST_TOOLS_DIR; then
 fi
 AC_SUBST(GST_TOOLS_DIR)
 
-dnl additional gstcontrol libs
-GST_CONTROL_LIBS=`pkg-config --variable=gstcontrol_libs gstreamer-$GST_MAJORMINOR`
+dnl check for gstreamer-control; uninstalled is selected preferentially
+PKG_CHECK_MODULES(GST_CONTROL, gstreamer-control-$GST_MAJORMINOR >= $GST_PLUGINS_VERSION_MAJOR.$GST_PLUGINS_VERSION_MINOR.$GST_PLUGINS_VERSION_MICRO,
+  HAVE_GST_CONTROL="yes", HAVE_GST_CONTROL="no")
+
+if test "x$HAVE_GST_CONTROL" = "xno"; then
+  AC_MSG_ERROR(no GStreamer Control Libs found)
+fi
+
 AC_SUBST(GST_CONTROL_LIBS)
 
+
 dnl Set up conditionals for (target) architecture:
 dnl ==============================================
 
@@ -1015,10 +1022,12 @@ dnl #########################
 
 AC_CONFIG_FILES(
 Makefile
-gstreamer-libs.pc
-gstreamer-libs-uninstalled.pc
-gstreamer-play.pc
-gstreamer-play-uninstalled.pc
+pkgconfig/gstreamer-libs.pc
+pkgconfig/gstreamer-libs-uninstalled.pc
+pkgconfig/gstreamer-play.pc
+pkgconfig/gstreamer-play-uninstalled.pc
+gst-libs/gst/gconf/gstreamer-gconf.pc
+gst-libs/gst/gconf/gstreamer-gconf-uninstalled.pc
 gst-plugins.spec
 gst/Makefile
 gst/ac3parse/Makefile
@@ -1159,6 +1168,7 @@ testsuite/alsa/Makefile
 testsuite/Makefile
 tools/Makefile
 gconf/Makefile
+pkgconfig/Makefile
 )
 AC_OUTPUT
 

diff --git a/gst-element-check.m4 b/gst-element-check.m4
deleted file mode 100644 (file)
index f900dac..0000000
--- a/gst-element-check.m4
+++ /dev/null
@@ -1,20 +0,0 @@
-dnl Perform a check for a GStreamer element using gst-inspect
-dnl Thomas Vander Stichele <thomas at apestaart dot org>
-dnl Last modification: 23/10/2002
-
-dnl AM_GST_ELEMENT_CHECK(ELEMENT-NAME, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
-
-AC_DEFUN(AM_GST_ELEMENT_CHECK,
-[
-  AC_CHECK_PROG(GST_INSPECT, gst-inspect, gst-inspect, [])
-  if test "x$GST_INSPECT" != "x"; then
-    AC_MSG_CHECKING(GStreamer element $1)
-    if [ $GST_INSPECT $1 > /dev/null 2> /dev/null ]; then
-      AC_MSG_RESULT(found.)
-      $2
-    else
-      AC_MSG_RESULT(not found.)
-      $3
-    fi
-  fi
-])

diff --git a/gst-libs/gst/gconf/Makefile.am b/gst-libs/gst/gconf/Makefile.am
index 8a4c2a2..faec622 100644 (file)
--- a/gst-libs/gst/gconf/Makefile.am
+++ b/gst-libs/gst/gconf/Makefile.am
@@ -15,3 +15,5 @@ test_gconf_LDADD = $(GST_LIBS) $(GCONF_LIBS) libgstgconf-@GST_MAJORMINOR@.la
 libgstgconf_@GST_MAJORMINOR@_la_LIBADD = $(GCONF_LIBS) $(GST_LIBS)
 libgstgconf_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS)
 libgstgconf_@GST_MAJORMINOR@_la_LDFLAGS = @GST_PLUGINS_LT_LDFLAGS@ -version-info @GST_PLUGINS_LIBVERSION@
+
+EXTRA_DIST = gstreamer-gconf.pc.in gstreamer-gconf-uninstalled.pc.in

diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
new file mode 100644 (file)
index 0000000..9692616
--- /dev/null
+++ b/pkgconfig/Makefile.am
@@ -0,0 +1,42 @@
+if USE_GCONF
+GCONF_PC=gstreamer-gconf-@GST_MAJORMINOR@.pc
+GCONF_PC_UNINSTALLED=gstreamer-gconf-@GST_MAJORMINOR@-uninstalled.pc
+else
+GCONF_PC=
+GCONF_PC_UNINSTALLED=
+endif
+
+### all of the standard pc files we need to generate
+pcfiles =  \
+       gstreamer-libs-@GST_MAJORMINOR@.pc \
+       gstreamer-play-@GST_MAJORMINOR@.pc
+pcfiles_uninstalled = \
+       gstreamer-libs-@GST_MAJORMINOR@-uninstalled.pc \
+       gstreamer-play-@GST_MAJORMINOR@-uninstalled.pc
+
+all-local: $(pcfiles) $(pcfiles_uninstalled) \
+       $(GCONF_PC) \
+       $(GCONF_PC_UNINSTALLED)
+
+### how to generate pc files
+$(pcfiles): %-@GST_MAJORMINOR@.pc: %.pc
+       cp $< $@
+$(pcfiles_uninstalled): %-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc
+       cp $< $@
+
+gstreamer-gconf-@GST_MAJORMINOR@.pc: \
+       $(srcdir)/../gst-libs/gst/gconf/gstreamer-gconf.pc
+       cp $< $@
+gstreamer-gconf-@GST_MAJORMINOR@-uninstalled.pc: \
+       $(srcdir)/../gst-libs/gst/gconf/gstreamer-gconf-uninstalled.pc
+       cp $< $@
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = \
+       $(GCONF_PC) \
+       gstreamer-libs-@GST_MAJORMINOR@.pc \
+       gstreamer-play-@GST_MAJORMINOR@.pc
+
+EXTRA_DIST= \
+           gstreamer-libs.pc.in gstreamer-libs-uninstalled.pc.in \
+           gstreamer-play.pc.in gstreamer-play-uninstalled.pc.in

diff --git a/pkgconfig/gstreamer-gconf-uninstalled.pc.in b/pkgconfig/gstreamer-gconf-uninstalled.pc.in
new file mode 100644 (file)
index 0000000..932f3eb
--- /dev/null
+++ b/pkgconfig/gstreamer-gconf-uninstalled.pc.in
@@ -0,0 +1,13 @@
+# the standard variables don't make sense for an uninstalled copy
+prefix=
+exec_prefix=
+libdir=${pcfiledir}
+includedir=${pcfiledir}
+
+Name: GStreamer GConf Library, uninstalled
+Description: Streaming media framework, GConf support library, not installed
+Requires: gstreamer >= @VERSION@
+Version: @VERSION@
+
+Libs: ${pcfiledir}/gst-libs/gst/gconf/libgstgconf-@GST_MAJORMINOR@.la
+Cflags: -I${pcfiledir}/gst-libs

diff --git a/pkgconfig/gstreamer-gconf.pc.in b/pkgconfig/gstreamer-gconf.pc.in
new file mode 100644 (file)
index 0000000..2cbf807
--- /dev/null
+++ b/pkgconfig/gstreamer-gconf.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+
+Name: GStreamer GConf Library
+Description: Streaming media framework, GConf support library
+Requires: gstreamer-@GST_MAJORMINOR@
+Version: @VERSION@
+
+Libs: -L${libdir} -lgstgconf-@GST_MAJORMINOR@
+Cflags: -I${includedir}

diff --git a/gstreamer-libs-uninstalled.pc.in b/pkgconfig/gstreamer-libs-uninstalled.pc.in
similarity index 58%
rename from gstreamer-libs-uninstalled.pc.in
rename to pkgconfig/gstreamer-libs-uninstalled.pc.in
index ef0669e..0657218 100644 (file)
--- a/gstreamer-libs-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-libs-uninstalled.pc.in
@@ -2,8 +2,4 @@ Name: GStreamer Uninstalled Media-Specific Libraries
 Description: Streaming-media framework media-specific libraries, not installed
 Version: @VERSION@
 Requires: gstreamer = @VERSION@
-Libs: -L${pcfiledir}/gst-libs/gst/gconf \
-       -L${pcfiledir}/gst-libs/gst/audio \
-       -L${pcfiledir}/gst-libs/gst/video \
-       -L${pcfiledir}/gst-libs/gst/play
 Cflags: -I${pcfiledir}/gst-libs

diff --git a/gstreamer-libs.pc.in b/pkgconfig/gstreamer-libs.pc.in
similarity index 100%
rename from gstreamer-libs.pc.in
rename to pkgconfig/gstreamer-libs.pc.in

diff --git a/gstreamer-play-uninstalled.pc.in b/pkgconfig/gstreamer-play-uninstalled.pc.in
similarity index 100%
rename from gstreamer-play-uninstalled.pc.in
rename to pkgconfig/gstreamer-play-uninstalled.pc.in

diff --git a/gstreamer-play.pc.in b/pkgconfig/gstreamer-play.pc.in
similarity index 100%
rename from gstreamer-play.pc.in
rename to pkgconfig/gstreamer-play.pc.in