summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsource4/autogen.sh2
-rw-r--r--source4/configure.in8
-rw-r--r--source4/main.mk4
3 files changed, 10 insertions, 4 deletions
diff --git a/source4/autogen.sh b/source4/autogen.sh
index ed9a9f5bc3..c80ece77c9 100755
--- a/source4/autogen.sh
+++ b/source4/autogen.sh
@@ -51,7 +51,7 @@ echo "$0: running script/mkversion.sh"
./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
diff --git a/source4/configure.in b/source4/configure.in
index 67ee8d8a41..456b34f650 100644
--- a/source4/configure.in
+++ b/source4/configure.in
@@ -7,7 +7,7 @@ dnl AC_PREREQ(2.53)
AC_INIT([samba],[],[samba-technical@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_SUBSYSTEMS
$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;
diff --git a/source4/main.mk b/source4/main.mk
index e127974ccd..8d4582e2b4 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -251,7 +251,7 @@ clean:: clean_pch
@-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 @@ removebackup:
-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)