diff options
author | Thomas Vander Stichele <thomas@apestaart.org> | 2003-01-06 23:10:12 +0000 |
---|---|---|
committer | Thomas Vander Stichele <thomas@apestaart.org> | 2003-01-06 23:10:12 +0000 |
commit | 043e9245e30b78198e72321b327d7f9c22b3f303 (patch) | |
tree | 6274e586ec3a1363a0b6b3c90a8f075bacbeda7d | |
parent | 33ef6595d53d9ab536e2a69aad9cbdf468ca3a8c (diff) | |
download | gstreamer-plugins-base-043e9245e30b78198e72321b327d7f9c22b3f303.tar.gz |
ffmpeg build fix new prerelease
Original commit message from CVS:
ffmpeg build fix
new prerelease
-rw-r--r-- | configure.ac | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 24c0f3f33..0705c4d1f 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ AM_MAINTAINER_MODE dnl when going to/from release please set the nano (fourth number) right ! dnl releases only do Wall, cvs and prerelease does Werror too -AS_VERSION(gst-plugins, GST_PLUGINS_VERSION, 0, 5, 0, 2, GST_ERROR="-Wall", GST_ERROR="-Wall -Werror") +AS_VERSION(gst-plugins, GST_PLUGINS_VERSION, 0, 5, 0, 3, GST_ERROR="-Wall", GST_ERROR="-Wall -Werror") AM_INIT_AUTOMAKE($PACKAGE,$VERSION) dnl our libraries and install dirs use major.minor as a version @@ -529,12 +529,13 @@ GST_CHECK_FEATURE(FFMPEG, [ffmpeg plug-ins], ffmpeg, [ AC_MSG_NOTICE(slurping FFmpeg CVS source) AS_SLURP_FFMPEG(gst-libs/ext/ffmpeg, 2002-12-14 12:00 GMT, HAVE_FFMPEG=yes, HAVE_FFMPEG=no) - AC_DEFINE_UNQUOTED(HAVE_FFMPEG_UNINSTALLED, 1, - [defined if we use uninstalled ffmpeg]) else AC_MSG_NOTICE(FFmpeg CVS code should be included already) HAVE_FFMPEG=yes fi + # we only bother with uninstalled (included) ffmpeg for now + AC_DEFINE_UNQUOTED(HAVE_FFMPEG_UNINSTALLED, 1, + [defined if we use uninstalled ffmpeg]) ]) dnl *** Gnome VFS *** |