X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=config%2Fconfigure.inc;h=c65b8f253055e45f90e2055c7bb41ad6a4c7446b;hb=f6c8fc1320dddeb10b4dd6d5c27e3af8b6a00b60;hp=a698422d06b00cf17a6290aa4372860a044ef0cc;hpb=d8cb7b11ba2bc21c52d343f56d83d6fb3b9db7a6;p=bup.git

diff --git a/config/configure.inc b/config/configure.inc
index a698422..c65b8f2 100644
--- a/config/configure.inc
+++ b/config/configure.inc
@@ -1,3 +1,5 @@
+# -*-shell-script-*-
+
 #   @(#) configure.inc 1.40@(#)
 #   Copyright (c) 1999-2007 David Parsons. All rights reserved.
 #   
@@ -583,7 +585,8 @@ MF_PATH_INCLUDE () {
 #
 AC_INIT () {
     __config_files="config.cmd config.sub config.h config.mak config.log"
-    rm -f $__config_files
+    __config_detritus="config.h.tmp"
+    rm -f $__config_files $__config_detritus
     __cwd=`pwd`
     exec 5>&1 1>$__cwd/config.log 2>&1
     AC_CONFIGURE_FOR=__AC_`echo $1 | sed -e 's/\..$//' | tr 'a-z' 'A-Z' | tr ' ' '_'`_D
@@ -608,7 +611,8 @@ AC_INIT () {
 
     LOG "Configuring for [$1]"
 
-    cat > $__cwd/config.h << EOF
+    rm -f $__cwd/config.h
+    cat > $__cwd/config.h.tmp << EOF
 /*
  * configuration for $1${2:+" ($2)"}, generated `date`
  * by ${LOGNAME:-`whoami`}@`hostname`
@@ -651,7 +655,7 @@ EOF
     AC_PROG_CPP
     AC_PROG_INSTALL
 
-    ac_os=`uname -s`
+    ac_os=`uname -s | sed 's/[-_].*//; s/[^a-zA-Z0-9]/_/g'`
     _os=`echo $ac_os | tr '[a-z]' '[A-Z]'`
     AC_DEFINE OS_$_os	1
     eval OS_${_os}=1
@@ -867,7 +871,7 @@ EOF
 	TLOG " (found)"
 	rc=0
     else
-	echo "typedef int pid_t;" >> $__cwd/config.h
+	echo "typedef int pid_t;" >> $__cwd/config.h.tmp
 	TLOG " (not found)"
 	rc=1
     fi
@@ -930,7 +934,7 @@ EOF
     rc=1
     LOGN "defining WORD & DWORD scalar types"
     if $AC_CC /tmp/pd$$.c -o /tmp/pd$$; then
-	if /tmp/pd$$  >> $__cwd/config.h; then
+	if /tmp/pd$$  >> $__cwd/config.h.tmp; then
 	    rc=0
 	fi
     fi
@@ -949,6 +953,7 @@ AC_OUTPUT () {
     cd $__cwd
     AC_SUB 'LIBS'    "$AC_LIBS"
     AC_SUB 'CONFIGURE_FILES' "$__config_files"
+    AC_SUB 'CONFIGURE_DETRITUS' "$__config_detritus"
     AC_SUB 'GENERATED_FILES' "$*"
     AC_SUB 'CFLAGS'  "$AC_CFLAGS"
     AC_SUB 'FCFLAGS' "$AC_FCFLAGS"
@@ -967,8 +972,8 @@ AC_OUTPUT () {
 	test "$AC_SED_PROG" || AC_PROG_SED
 	test "$AC_SED_PROG" || return 1
 
-	echo                                   >> config.h
-	echo "#endif/* ${AC_CONFIGURE_FOR} */" >> config.h
+	echo                                   >> config.h.tmp
+	echo "#endif/* ${AC_CONFIGURE_FOR} */" >> config.h.tmp
 
 	rm -f config.cmd
 	Q=\'
@@ -994,6 +999,7 @@ EOF
     else
 	echo 
     fi
+    cp $__cwd/config.h.tmp $__cwd/config.h
 }
 
 #
@@ -1281,13 +1287,17 @@ AC_MAK() {
 #
 # AC_DEFINE adds a #define to config.h
 AC_DEFINE() {
-    echo "#define $1 ${2:-1}" >> $__cwd/config.h
+    local name="$1" value="${2:-1}"
+    if ! printf -v "ac_defined_$name" '%s' "$value"; then
+        AC_FATAL 'AC_DEFINE unable to set "ac_defined_$name" to "$value"'
+    fi
+    echo "#define $name $value" >> $__cwd/config.h.tmp
 }
 
 #
 # AC_INCLUDE adds a #include to config.h
 AC_INCLUDE() {
-    echo "#include \"$1\"" >> $__cwd/config.h
+    echo "#include \"$1\"" >> $__cwd/config.h.tmp
 }
 
 #