Revert "build: Remove multiple inclusion guards from config.mak."
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>
Sun, 26 Jun 2011 07:44:31 +0000 (09:44 +0200)
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>
Sun, 26 Jun 2011 07:50:18 +0000 (09:50 +0200)
This reverts commit 89b5829d0a4d9510efeff65dbeeaed50e0980120.

Conflicts:

configure

configure

index 65a8884..af3c09f 100755 (executable)
--- 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