From: Ronald B. <rb...@us...> - 2003-04-07 21:35:12
|
CVS Root: /cvsroot/gstreamer Module: gst-plugins Changes by: rbultje Date: Mon Apr 07 2003 14:35:12 PDT Log message: 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) Modified files: . : Makefile.am configure.ac Removed files: . : gst-element-check.m4 gstreamer-libs-uninstalled.pc.in gstreamer-libs.pc.in gstreamer-play-uninstalled.pc.in gstreamer-play.pc.in Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/Makefile.am.diff?r1=1.38&r2=1.39 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/configure.ac.diff?r1=1.248&r2=1.249 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst-element-check.m4 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gstreamer-libs-uninstalled.pc.in http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gstreamer-libs.pc.in http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gstreamer-play-uninstalled.pc.in http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gstreamer-play.pc.in ====Begin Diffs==== Index: Makefile.am =================================================================== RCS file: /cvsroot/gstreamer/gst-plugins/Makefile.am,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- Makefile.am 3 Jan 2003 17:03:22 -0000 1.38 +++ Makefile.am 7 Apr 2003 21:34:26 -0000 1.39 @@ -16,34 +16,23 @@ 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 +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 +DIST_SUBDIRS=gst-libs \ + gst sys ext \ + examples \ + tools \ + gconf \ + testsuite \ + pkgconfig -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 Index: configure.ac =================================================================== RCS file: /cvsroot/gstreamer/gst-plugins/configure.ac,v retrieving revision 1.248 retrieving revision 1.249 diff -u -d -r1.248 -r1.249 --- configure.ac 5 Apr 2003 20:09:05 -0000 1.248 +++ configure.ac 7 Apr 2003 21:34:26 -0000 1.249 @@ -157,10 +157,17 @@ 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 @@ 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/Makefile tools/Makefile gconf/Makefile +pkgconfig/Makefile ) AC_OUTPUT --- gst-element-check.m4 DELETED --- --- gstreamer-libs-uninstalled.pc.in DELETED --- --- gstreamer-libs.pc.in DELETED --- --- gstreamer-play-uninstalled.pc.in DELETED --- --- gstreamer-play.pc.in DELETED --- |