From 0da3d21614b214e95377bfe9eeab60b530031671 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Mon, 7 Apr 2003 21:34:30 +0000 Subject: [PATCH] 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) 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) --- Makefile.am | 41 ++++++++++++-------------------- configure.ac | 22 ++++++++++++----- gst-element-check.m4 | 20 ---------------- gst-libs/gst/gconf/Makefile.am | 2 ++ gstreamer-libs-uninstalled.pc.in | 9 ------- gstreamer-libs.pc.in | 11 --------- gstreamer-play-uninstalled.pc.in | 13 ---------- gstreamer-play.pc.in | 12 ---------- 8 files changed, 33 insertions(+), 97 deletions(-) delete mode 100644 gst-element-check.m4 delete mode 100644 gstreamer-libs-uninstalled.pc.in delete mode 100644 gstreamer-libs.pc.in delete mode 100644 gstreamer-play-uninstalled.pc.in delete mode 100644 gstreamer-play.pc.in diff --git a/Makefile.am b/Makefile.am index 6c5ae33e77..f3036f7e5b 100644 --- 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 +SUBDIRS=gst-libs \ + gst sys $(EXT_DIR) \ + $(EXAMPLES_DIR) \ + tools \ + $(GCONF_DIR) \ + testsuite \ + pkgconfig -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 +DIST_SUBDIRS=gst-libs \ + gst sys ext \ + examples \ + tools \ + gconf \ + testsuite \ + pkgconfig -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 \ +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 790ae53bc5..3e0b3988b1 100644 --- 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 index f900dace75..0000000000 --- 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 -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 8a4c2a26e6..faec62223b 100644 --- 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/gstreamer-libs-uninstalled.pc.in b/gstreamer-libs-uninstalled.pc.in deleted file mode 100644 index ef0669edce..0000000000 --- a/gstreamer-libs-uninstalled.pc.in +++ /dev/null @@ -1,9 +0,0 @@ -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/gstreamer-libs.pc.in deleted file mode 100644 index e4eb159760..0000000000 --- a/gstreamer-libs.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ - -Name: GStreamer Media-Specific Libraries -Description: Streaming-media framework, media-specific libraries -Requires: gstreamer-@GST_MAJORMINOR@ -Version: @VERSION@ -Libs: -Cflags: -I${includedir} diff --git a/gstreamer-play-uninstalled.pc.in b/gstreamer-play-uninstalled.pc.in deleted file mode 100644 index 9c87f886c8..0000000000 --- a/gstreamer-play-uninstalled.pc.in +++ /dev/null @@ -1,13 +0,0 @@ -# the standard variables don't make sense for an uninstalled copy -prefix= -exec_prefix= -libdir=${pcfiledir} -includedir=${pcfiledir} - -Name: GStreamer Play Library, uninstalled -Description: Streaming-media framework, play libraries, not installed -Requires: gstreamer >= @VERSION@ -Version: @VERSION@ - -Libs: ${pcfiledir}/gst-libs/gst/play/libgstplay-@GST_MAJORMINOR@.la -lgstcontrol-@GST_MAJORMINOR@ -Cflags: -I${pcfiledir}/libs diff --git a/gstreamer-play.pc.in b/gstreamer-play.pc.in deleted file mode 100644 index 99dc6e7d1c..0000000000 --- a/gstreamer-play.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ - -Name: GStreamer Play Library -Description: Streaming-media framework, play libraries -Requires: gstreamer-@GST_MAJORMINOR@ -Version: @VERSION@ - -Libs: -L${libdir} -lgstplay-@GST_MAJORMINOR@ -lgstcontrol-@GST_MAJORMINOR@ -Cflags: -I${includedir}