diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2003-01-08 16:41:26 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2003-01-08 16:41:26 +0000 |
| commit | e116d853418a37824413fe6cb21c772fada744d3 (patch) | |
| tree | 4a111bfa7d158ac187da0c36045270861737bbc3 /configure.ac | |
| parent | 85ad491b517207ec907f5910467c50e5a7450601 (diff) | |
merge back from release
Original commit message from CVS:
merge back from release
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 59d6d302..4ad07ad1 100644 --- a/configure.ac +++ b/configure.ac @@ -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 *** |