diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2003-04-07 21:34:30 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2003-04-07 21:34:30 +0000 |
| commit | 13cf1785d813f23c5cfae18a98568058ed94dfa7 (patch) | |
| tree | 3df886e601eda5ee680356516fac565713c96723 /configure.ac | |
| parent | f2f86939c3dd8382217ba14f7342a9a15da11ef6 (diff) | |
| download | gst-plugins-bad-13cf1785d813f23c5cfae18a98568058ed94dfa7.tar.gz gst-plugins-bad-13cf1785d813f23c5cfae18a98568058ed94dfa7.tar.bz2 gst-plugins-bad-13cf1785d813f23c5cfae18a98568058ed94dfa7.zip | |
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)
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 790ae53b..3e0b3988 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 |