From 3f073b4c6bfcd7e44fc3dd561874790200bd4d12 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 25 Oct 2007 20:13:06 +0200
Subject: r25736: make sure we include "config.h" as first header

in code generated from et_compile

metze
(This used to be commit 8757b09052c5e07b23b8b50f7227f884201d9e98)
---
 source4/heimdal_build/et_compile_wrapper.sh | 15 ++++++++++++++-
 source4/heimdal_build/et_deps.pl            |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'source4/heimdal_build')

diff --git a/source4/heimdal_build/et_compile_wrapper.sh b/source4/heimdal_build/et_compile_wrapper.sh
index a1cb5b311c..d7d47ba363 100755
--- a/source4/heimdal_build/et_compile_wrapper.sh
+++ b/source4/heimdal_build/et_compile_wrapper.sh
@@ -10,7 +10,8 @@ DESTDIR=$3
 
 CMD=$4
 FILE=$5
-shift 5
+SOURCE=$6
+shift 6
 
 test -z "${SRCDIR}" && {
 	echo "${SELF}:SRCDIR: '${SRCDIR}'" >&2;
@@ -37,6 +38,11 @@ test -z "${FILE}" && {
 	exit 1;
 }
 
+test -z "${SOURCE}" && {
+	echo "${SELF}:SOURCE: '${SOURCE}'" >&2;
+	exit 1;
+}
+
 CURDIR=`pwd`
 
 cd ${SRCDIR} && {
@@ -58,6 +64,13 @@ cd ${BUILDDIR} && {
 cd ${DESTDIR} && {
 	${ABS_BUILDDIR}/${CMD} ${ABS_SRCDIR}/${FILE} >&2 || exit 1;
 	cd ${CURDIR}
+	TMP="${SOURCE}.$$"
+	mv ${SOURCE} ${TMP} && {
+		echo "#include \"config.h\"" > ${SOURCE} && {
+			cat ${TMP} >> ${SOURCE}
+		}
+	}
+	rm ${TMP}
 } || {
 	echo "${SELF}:cannot cd into '${BUILDDIR}'" >&2;
 	exit 1;
diff --git a/source4/heimdal_build/et_deps.pl b/source4/heimdal_build/et_deps.pl
index 1ebe496618..2385dbd085 100755
--- a/source4/heimdal_build/et_deps.pl
+++ b/source4/heimdal_build/et_deps.pl
@@ -10,7 +10,7 @@ my $header = "$dirname/$basename"; $header =~ s/\.et$/.h/;
 my $source = "$dirname/$basename"; $source =~ s/\.et$/.c/;
 print "$header $source: $file bin/compile_et\n";
 print "\t\@echo \"Compiling error table $file\"\n";
-print "\t\@\$(builddir)/heimdal_build/et_compile_wrapper.sh \$(srcdir) \$(builddir) $dirname bin/compile_et $file\n\n";
+print "\t\@\$(builddir)/heimdal_build/et_compile_wrapper.sh \$(srcdir) \$(builddir) $dirname bin/compile_et $file $source\n\n";
 
 print "clean:: \n";
 print "\t\@rm -f $header $source\n\n";
-- 
cgit