diff options
| author | Benjamin Otte <otte@gnome.org> | 2004-03-14 10:33:44 +0000 |
|---|---|---|
| committer | Benjamin Otte <otte@gnome.org> | 2004-03-14 10:33:44 +0000 |
| commit | 517e5d888c1d2c02fa2de81c59b8fb9ed9bc4571 (patch) | |
| tree | 89f78874a2f48ab4274c91c2be5a6f1af2badf73 | |
| parent | 9a78b5acf65b8595bd5c8d87194e2d85091b561a (diff) | |
move gstreamer-gconf pkgconfig files to pkgconfig/ dir. Make sure they get rebuilt properly
Original commit message from CVS:
* configure.ac:
* gst-libs/gst/gconf/Makefile.am:
* pkgconfig/Makefile.am:
move gstreamer-gconf pkgconfig files to pkgconfig/ dir. Make sure
they get rebuilt properly
* configure.ac:
when checking for vorbis, try pkgconfig first.
* gst/modplug/gstmodplug.cc:
add fixate function
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | configure.ac | 17 |
2 files changed, 23 insertions, 6 deletions
@@ -1,3 +1,15 @@ +2004-03-14 Benjamin Otte <otte@gnome.org> + + * configure.ac: + * gst-libs/gst/gconf/Makefile.am: + * pkgconfig/Makefile.am: + move gstreamer-gconf pkgconfig files to pkgconfig/ dir. Make sure + they get rebuilt properly + * configure.ac: + when checking for vorbis, try pkgconfig first. + * gst/modplug/gstmodplug.cc: + add fixate function + 2004-03-14 Ronald Bultje <rbultje@ronald.bitfreak.net> * gst/qtdemux/qtdemux.c: (qtdemux_parse_trak): diff --git a/configure.ac b/configure.ac index 1c4adb74..c36810ea 100644 --- a/configure.ac +++ b/configure.ac @@ -1334,11 +1334,16 @@ dnl *** vorbis *** dnl AM_PATH_VORBIS only takes two options translit(dnm, m, l) AM_CONDITIONAL(USE_VORBIS, true) GST_CHECK_FEATURE(VORBIS, [vorbis plug-in], vorbisenc vorbisdec, [ - XIPH_PATH_VORBIS(HAVE_VORBIS=yes, HAVE_VORBIS=no) - AS_SCRUB_INCLUDE(VORBIS_CFLAGS) + PKG_CHECK_MODULES(VORBIS, vorbis >= 1.0 vorbisenc >= 1.0, [ + HAVE_VORBIS="yes" + ], [ + XIPH_PATH_VORBIS(HAVE_VORBIS="yes", HAVE_VORBIS="no") + AS_SCRUB_INCLUDE(VORBIS_CFLAGS) + ]) ]) if test "x$HAVE_VORBIS" = "xyes"; then ac_cflags_save="$CFLAGS" + dnl FIXME: does this work on non-gcc? -- Company CFLAGS="-Wall -Werror" AC_COMPILE_IFELSE( AC_LANG_PROGRAM([ @@ -1567,14 +1572,14 @@ dnl ######################### AC_CONFIG_FILES( Makefile +pkgconfig/gstreamer-gconf.pc +pkgconfig/gstreamer-gconf-uninstalled.pc +pkgconfig/gstreamer-interfaces.pc +pkgconfig/gstreamer-interfaces-uninstalled.pc pkgconfig/gstreamer-libs.pc pkgconfig/gstreamer-libs-uninstalled.pc pkgconfig/gstreamer-play.pc pkgconfig/gstreamer-play-uninstalled.pc -pkgconfig/gstreamer-interfaces.pc -pkgconfig/gstreamer-interfaces-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 |