svn commit: samba r14950 - in branches/SAMBA_4_0/source: . include

[metze at samba.org]

Author: metze
Date: 2006-04-06 12:30:06 +0000 (Thu, 06 Apr 2006)
New Revision: 14950

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14950

Log:
make sure include/config.h is only updated when the content was changed

metze
Modified:
   branches/SAMBA_4_0/source/autogen.sh
   branches/SAMBA_4_0/source/configure.in
   branches/SAMBA_4_0/source/include/
   branches/SAMBA_4_0/source/main.mk


Changeset:
Modified: branches/SAMBA_4_0/source/autogen.sh
===================================================================
--- branches/SAMBA_4_0/source/autogen.sh	2006-04-06 11:32:54 UTC (rev 14949)
+++ branches/SAMBA_4_0/source/autogen.sh	2006-04-06 12:30:06 UTC (rev 14950)
@@ -51,7 +51,7 @@
 ./script/mkversion.sh || exit 1
 
 rm -rf autom4te*.cache
-rm -f configure include/config.h*
+rm -f configure include/config_tmp.h*
 
 echo "$0: running $AUTOHEADER"
 $AUTOHEADER || exit 1

Modified: branches/SAMBA_4_0/source/configure.in
===================================================================
--- branches/SAMBA_4_0/source/configure.in	2006-04-06 11:32:54 UTC (rev 14949)
+++ branches/SAMBA_4_0/source/configure.in	2006-04-06 12:30:06 UTC (rev 14950)
@@ -7,7 +7,7 @@
 AC_INIT([samba],[],[samba-technical at samba.org])
 
 AC_CONFIG_SRCDIR([include/includes.h])
-AC_CONFIG_HEADER(include/config.h)
+AC_CONFIG_HEADER(include/config_tmp.h)
 
 # Configuration rules.
 sinclude(build/m4/env.m4)
@@ -110,6 +110,12 @@
 $SMB_INFO_LIBRARIES
 CEOF
 
+cmp include/config_tmp.h include/config.h >/dev/null 2>&1
+CMP_RET=$?
+if [ $CMP_RET != 0 ];then
+	cp include/config_tmp.h include/config.h
+fi
+
 AC_OUTPUT_COMMANDS(
 [$PERL -I${builddir} -I${srcdir} -I${srcdir}/build ${srcdir}/build/smb_build/main.pl || exit $?],[
 PERL="$PERL";export PERL;export srcdir; export builddir;


Property changes on: branches/SAMBA_4_0/source/include
___________________________________________________________________
Name: svn:ignore
   - includes.d
config.h
config.h.in
build.h
includes.h.gch
stamp-h
version.h

   + includes.d
config.h
config_tmp.h
config_tmp.h.in
build.h
includes.h.gch


Modified: branches/SAMBA_4_0/source/main.mk
===================================================================
--- branches/SAMBA_4_0/source/main.mk	2006-04-06 11:32:54 UTC (rev 14949)
+++ branches/SAMBA_4_0/source/main.mk	2006-04-06 12:30:06 UTC (rev 14950)
@@ -251,7 +251,7 @@
 	@-rm -f $(PROTO_HEADERS)
 
 distclean: clean
-	-rm -f include/config.h include/smb_build.h
+	-rm -f include/config.h include/config_tmp.h include/build.h
 	-rm -f Makefile 
 	-rm -f config.status
 	-rm -f config.log config.cache
@@ -262,7 +262,7 @@
 	-rm -f *.bak *~ */*.bak */*~ */*/*.bak */*/*~ */*/*/*.bak */*/*/*~
 
 realdistclean: distclean removebackup
-	-rm -f include/config.h.in
+	-rm -f include/config_tmp.h.in
 	-rm -f include/version.h
 	-rm -f configure
 	-rm -f $(MANPAGES)