diff options
author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-06-26 09:44:31 +0200 |
---|---|---|
committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-06-26 09:50:18 +0200 |
commit | ebc64dc81881bd514144b9ddf6ee08c1bc116574 (patch) | |
tree | d0a45a0ae9b3df1ea4a768272a0fe9b59bb2c45e /configure | |
parent | 11096804340ac2cec37ef1bce828105bd0a7dfbe (diff) | |
download | ffmpeg-streaming-ebc64dc81881bd514144b9ddf6ee08c1bc116574.zip ffmpeg-streaming-ebc64dc81881bd514144b9ddf6ee08c1bc116574.tar.gz |
Revert "build: Remove multiple inclusion guards from config.mak."
This reverts commit 89b5829d0a4d9510efeff65dbeeaed50e0980120.
Conflicts:
configure
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -3319,6 +3319,8 @@ config_files="$TMPH config.mak" cat > config.mak <<EOF # Automatically generated by configure - do not modify! +ifndef FFMPEG_CONFIG_MAK +FFMPEG_CONFIG_MAK=1 FFMPEG_CONFIGURATION=$FFMPEG_CONFIGURATION prefix=$prefix LIBDIR=\$(DESTDIR)$libdir @@ -3461,6 +3463,7 @@ SEEK_TESTS=$(print_enabled -n _test $SEEK_TESTS) EOF echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH +echo "endif # FFMPEG_CONFIG_MAK" >> config.mak # Do not overwrite an unchanged config.h to avoid superfluous rebuilds. cp_if_changed $TMPH config.h |