diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-14 16:27:55 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-14 16:27:55 +0200 |
| commit | 9c7b147a1878bd2c9290bb3377f41bc4a27ddccd (patch) | |
| tree | c7164d2d6320a32aa28f4b1b89b34621086d671a | |
| parent | bef22ce53428befb105b342fed2d8d76213793e2 (diff) | |
| download | xine-lib-9c7b147a1878bd2c9290bb3377f41bc4a27ddccd.tar.gz xine-lib-9c7b147a1878bd2c9290bb3377f41bc4a27ddccd.tar.bz2 | |
Cleanup CPPFLAGS, remove LIBFFMPEG_CPPFLAGS as ffmpeg's configure takes care of it.
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index f003d22c8..5920e2ea1 100644 --- a/configure.ac +++ b/configure.ac @@ -374,9 +374,6 @@ use internal ffmpeg. *********************************************************************]) else AC_MSG_RESULT([using included ffmpeg]) - LIBFFMPEG_CPPFLAGS="-DHAVE_AV_CONFIG_H -DRUNTIME_CPUDETECT -DXINE_MPEG_ENCODER -D_ISOC9X_SOURCE -DCONFIG_DECODERS" - AC_CHECK_TYPES(int_fast8_t, [], [LIBFFMPEG_CPPFLAGS="$LIBFFMPEG_CPPFLAGS -DEMULATE_FAST_INT"]) - AC_SUBST([LIBFFMPEG_CPPFLAGS]) fi AM_CONDITIONAL(HAVE_FFMPEG, test "x$with_external_ffmpeg" = "xyes") @@ -2560,13 +2557,14 @@ esac AC_SUBST([NOUNDEF]) dnl Common cflags for all platforms -CFLAGS="-D_REENTRANT -D_FILE_OFFSET_BITS=64 -DXINE_COMPILE \$(MULTIPASS_CFLAGS) $warnflags $CFLAGS" -DEBUG_CFLAGS="-D_REENTRANT -D_FILE_OFFSET_BITS=64 -DXINE_COMPILE $DEBUG_CFLAGS" +CPPFLAGS="-D_REENTRANT -D_FILE_OFFSET_BITS=64 -DXINE_COMPILE $CPPFLAGS" +CFLAGS="\$(MULTIPASS_CFLAGS) $warnflags $CFLAGS" +DEBUG_CFLAGS="$warnflags $DEBUG_CFLAGS" if test "x$enable_debug" = "xyes"; then - CFLAGS="$CFLAGS -DDEBUG" + CPPFLAGS="$CPPFLAGS -DDEBUG" else - CFLAGS="$CFLAGS -DNDEBUG" + CPPFLAGS="$CPPFLAGS -DNDEBUG" fi dnl --------------------------------------------- |