aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2011-06-26 09:44:31 +0200
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2011-06-26 09:50:18 +0200
commitebc64dc81881bd514144b9ddf6ee08c1bc116574 (patch)
treed0a45a0ae9b3df1ea4a768272a0fe9b59bb2c45e /configure
parent11096804340ac2cec37ef1bce828105bd0a7dfbe (diff)
downloadffmpeg-ebc64dc81881bd514144b9ddf6ee08c1bc116574.tar.gz
Revert "build: Remove multiple inclusion guards from config.mak."
This reverts commit 89b5829d0a4d9510efeff65dbeeaed50e0980120. Conflicts: configure
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure3
1 files changed, 3 insertions, 0 deletions
diff --git a/configure b/configure
index 65a8884d11..af3c09f7c5 100755
--- a/configure
+++ b/configure
@@ -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