diff options
Diffstat (limited to 'Configure')
| -rwxr-xr-x | Configure | 57 |
1 files changed, 26 insertions, 31 deletions
@@ -16,9 +16,9 @@ # The dist package (which contains metaconfig) is available via SVN: # svn co https://svn.sourceforge.net/svnroot/dist/trunk/dist -# $Id: Head.U 25 2008-05-28 11:19:25Z rmanfredi $ +# $Id: Head.U 35 2010-11-27 14:04:55Z rmanfredi $ # -# Generated on Wed May 28 13:22:26 CEST 2008 [metaconfig 3.5-25] +# Generated on Sat Nov 27 15:09:44 CET 2010 [metaconfig 3.5-34] cat >c1$$ <<EOF ARGGGHHHH!!!!! @@ -217,6 +217,7 @@ make='' mkdir='' more='' mv='' +nawk='' nm='' nroff='' perl='' @@ -384,8 +385,7 @@ bin='/usr/local/bin' cc='cc' : Possible local include directories to search. : Set locincpth to "" in a hint file to defeat local include searches. -locincpth="/usr/local/include /opt/local/include /usr/gnu/include" -locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" +locincpth="" : : no include file wanted by default inclwanted='' @@ -393,8 +393,7 @@ inclwanted='' : change the next line if compiling for Xenix/286 on Xenix/386 xlibpth='/usr/lib/386 /lib/386' : Possible local library directories to search. -loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" -loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" +loclibpth="" : general looking path for locating libraries glibpth="/lib /usr/lib $xlibpth" @@ -715,7 +714,7 @@ while test $# -gt 0; do esac shift ;; - -V) echo "$me generated by metaconfig 3.5-25." >&2 + -V) echo "$me generated by metaconfig 3.5-34." >&2 exit 0;; --) break;; -*) echo "$me: unknown option $1" >&2; shift; error=true;; @@ -1373,7 +1372,7 @@ vi zcat " pth=`echo $PATH | sed -e "s/$p_/ /g"` -pth="$pth /lib /usr/lib" +pth="$pth /sbin /usr/sbin /lib /usr/lib /etc" for file in $loclist; do eval xxx=\$$file case "$xxx" in @@ -1381,7 +1380,7 @@ for file in $loclist; do if test -f "$xxx"; then : ok else - ./warn "no $xxx -- ignoring your setting for $file." + ./warn "no $xxx -- ignoring your setting for $file." 4>&4 xxx=`./loc $file $file $pth` fi ;; @@ -1414,7 +1413,7 @@ for file in $trylist; do if test -f "$xxx"; then : ok else - ./warn "no $xxx -- ignoring your setting for $file." + ./warn "no $xxx -- ignoring your setting for $file." 4>&4 xxx=`./loc $file $file $pth` fi ;; @@ -1563,7 +1562,7 @@ EOM [yY]*) cc=gcc; ccname=gcc; ccflags=''; despair=no; $cat *.cbu >checktmp 2>/dev/null if $contains ccflags checktmp >/dev/null; then - ./warn <<EOM + ./warn 4>&4 <<EOM Any previous setting of the C compiler flags has been lost. It may be necessary to pass -Dcc=gcc to Configure right away. EOM @@ -3336,20 +3335,22 @@ $rm -f foo.c foo.cpp echo " " echo "Checking for GNU cc in disguise and/or its version number..." >&4 $cat >try.c <<EOM -#include <stdio.h> -int main() { +int main(void) { #ifdef __GNUC__ -#ifdef __VERSION__ - printf("%s\n", __VERSION__); -#else - printf("%s\n", "1"); +gcc_version_major __GNUC__ +#ifdef __GNUC_MINOR__ +gcc_version_minor __GNUC__ +#endif +#ifdef __GNUC_PATCHLEVEL__ +gcc_version_patchlevel __GNUC_PATCHLEVEL__ #endif #endif - exit(0); } EOM -if $cc -o try $ccflags $ldflags try.c >/dev/null 2>&1; then - gccversion=`$run ./try` +if $cc -E try.c > try 2>&1 +then + gccversion=`$grep gcc_version_major try | + sed 's/^.*gcc_version_major[\t ]*//'` case "$gccversion" in '') echo "You are not using GNU cc." ;; *) echo "You are using GNU cc $gccversion." @@ -3357,15 +3358,7 @@ if $cc -o try $ccflags $ldflags try.c >/dev/null 2>&1; then ;; esac else - echo " " - echo "*** WHOA THERE!!! ***" >&4 - echo " Your C compiler \"$cc\" doesn't seem to be working!" >&4 - case "$knowitall" in - '') - echo " You'd better start hunting for one and let me know about it." >&4 - exit 1 - ;; - esac + gccversion='' fi $rm -f try try.* case "$gccversion" in @@ -3713,7 +3706,7 @@ else fi case "$hint" in -default|recommended) dflt="$ccflags $dflt" ;; +default|recommended) dflt="$dflt $ccflags" ;; *) dflt="$ccflags";; esac @@ -4484,6 +4477,7 @@ myhostname='$myhostname' myuname='$myuname' n='$n' nametype='$nametype' +nawk='$nawk' nm='$nm' nroff='$nroff' optimize='$optimize' @@ -4554,7 +4548,8 @@ EOT $test -f $src/patchlevel.h && \ awk '/^#define/ {printf "%s=%s\n",$2,$3}' $src/patchlevel.h >>config.sh $test -f $src/revision.h && \ -awk '/^#define/ {printf "%s=%s\n",$2,$3}' $src/revision.h >>config.sh +sed -ne 's/^#define \([A-Za-z0-9_]*\) ".*: \([0-9]*\).*"/\1=\2/p' \ + < revision.h >>config.sh echo "CONFIG=true" >>config.sh : propagate old symbols |