[FFmpeg-cvslog] Revert "build: Remove multiple inclusion guards from config.mak."

[Reimar Döffinger]

ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Sun Jun 26 09:44:31 2011 +0200| [ebc64dc81881bd514144b9ddf6ee08c1bc116574] | committer: Reimar Döffinger

Revert "build: Remove multiple inclusion guards from config.mak."

This reverts commit 89b5829d0a4d9510efeff65dbeeaed50e0980120.

Conflicts:

	configure

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ebc64dc81881bd514144b9ddf6ee08c1bc116574
---

 configure |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/configure b/configure
index 65a8884..af3c09f 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