From 1cd06144d77bcec60b316766e20f2111ea0e6c5a Mon Sep 17 00:00:00 2001 From: rmanfredi Date: Sat, 14 Nov 2015 15:06:46 +0000 Subject: Regenarated Configure with the newest units. git-svn-id: svn://svn.code.sf.net/p/dist/code/trunk/dist@198 2592e710-e01b-42a5-8df0-11608a6cc53d --- Configure | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) (limited to 'Configure') diff --git a/Configure b/Configure index f27fe64..40a347d 100755 --- a/Configure +++ b/Configure @@ -14,11 +14,11 @@ # Note: this Configure script was generated automatically. Rather than # working with this copy of Configure, you may wish to get metaconfig. # The dist package (which contains metaconfig) is available via SVN: -# svn co https://svn.sourceforge.net/svnroot/dist/trunk/dist +# svn co https://svn.code.sf.net/p/dist/code/trunk/dist -# $Id: Head.U 41 2010-11-28 00:21:26Z rmanfredi $ +# $Id: Head.U 167 2013-05-08 17:58:00Z rmanfredi $ # -# Generated on Tue Feb 7 19:02:16 RST 2012 [metaconfig 3.5-123] +# Generated on Sat Nov 14 16:05:58 CET 2015 [metaconfig 3.5-197] cat >c1$$ <&2 + -V) echo "$me generated by metaconfig 3.5-197." >&2 exit 0;; --) break;; -*) echo "$me: unknown option $1" >&2; shift; error=true;; @@ -787,8 +788,13 @@ case "$silent" in true) exec 1>/dev/null;; esac -: run the defines and the undefines, if any, but leave the file out there... touch optdef.sh +if grep -q '\\' optdef.sh >/dev/null 2>&1; then + echo "Configure does not support \\ in -D or -U arguments" >&2 + exit 1 +fi + +: run the defines and the undefines, if any, but leave the file out there... . ./optdef.sh : create the posthint manipulation script and leave the file out there... touch posthint.sh @@ -1620,6 +1626,7 @@ EOSC : determine whether symbolic links are supported echo " " $rm -f blurfl sym +$touch blurfl if $ln -s blurfl sym > /dev/null 2>&1 && $test -f sym; then echo "Symbolic links are supported." >&4 lns="$ln -s" @@ -2136,6 +2143,7 @@ esac saved_osname="$osname" saved_osvers="$osvers" +saved_libswanted="$libswanted" tmp_n="$n" tmp_c="$c" tmp_sh="$sh" @@ -2196,6 +2204,12 @@ osvers="$saved_osvers" n="$tmp_n" c="$tmp_c" +case "$libswanted" in +"$saved_libswanted") ;; +*) libs='';; +esac +libswanted="$saved_libswanted" + . ./checkcc case "$targetarch" in '') ;; @@ -3314,9 +3328,19 @@ your organization... EOM cont=x while test "$cont"; do + case "$MAILDOMAIN" in + '') + if $test -s /etc/mailname; then + maildomain=`$cat /etc/mailname` + else + maildomain="$myhostname$mydomain" + fi + ;; + *) maildomain="$MAILDOMAIN";; + esac case "$cf_email" in - '') dflt="$cf_by@$myhostname$mydomain";; - *) dflt="$cf_email";; + '') dflt="$cf_by@$maildomain";; + *) dflt="$cf_email";; esac rp='What is your e-mail address?' . ./myread @@ -3675,6 +3699,7 @@ case "$optimize" in 'none') optimize=" ";; esac + dflt='' : We will not override a previous value, but we might want to : augment a hint file @@ -3868,7 +3893,7 @@ rmlist="$rmlist pdp11" : coherency check echo " " echo "Checking your choice of C compiler and flags for coherency..." >&4 -set X $cc $optimize $ccflags $ldflags -o try try.c +set X $cc $optimize $pthread $ccflags $ldflags -o try try.c shift $cat >try.msg <