summaryrefslogtreecommitdiff
path: root/Configure
diff options
context:
space:
mode:
authorrmanfredi <rmanfredi@2592e710-e01b-42a5-8df0-11608a6cc53d>2012-01-29 21:27:40 +0000
committerrmanfredi <rmanfredi@2592e710-e01b-42a5-8df0-11608a6cc53d>2012-01-29 21:27:40 +0000
commitbb7c0183e14e22ac660825a2ea625a5d5e419953 (patch)
tree3a3884e64c221e3d9e9596c2d59d9d059f538e4b /Configure
parent1ecc1fbfca2701191007f841f5eaace5621c1c45 (diff)
Regenerated.
git-svn-id: svn://svn.code.sf.net/p/dist/code/trunk/dist@117 2592e710-e01b-42a5-8df0-11608a6cc53d
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure104
1 files changed, 68 insertions, 36 deletions
diff --git a/Configure b/Configure
index a43c6ec..40a8eee 100755
--- a/Configure
+++ b/Configure
@@ -18,7 +18,7 @@
# $Id: Head.U 41 2010-11-28 00:21:26Z rmanfredi $
#
-# Generated on Mon Nov 29 00:07:52 CET 2010 [metaconfig 3.5-49]
+# Generated on Sun Jan 29 22:26:48 CET 2012 [metaconfig 3.5-116]
cat >c1$$ <<EOF
ARGGGHHHH!!!!!
@@ -200,7 +200,9 @@ emacs=''
expr=''
find=''
flex=''
+gcc=''
gmake=''
+gmsgfmt=''
grep=''
gzip=''
inews=''
@@ -217,6 +219,8 @@ mailx=''
make=''
mkdir=''
more=''
+msgfmt=''
+msgmerge=''
mv=''
nawk=''
nm=''
@@ -246,6 +250,7 @@ uname=''
uniq=''
uuname=''
vi=''
+xgettext=''
zcat=''
zip=''
incpath=''
@@ -401,7 +406,7 @@ glibpth="/lib /usr/lib $xlibpth"
glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
test -f /shlib/libc.so && glibpth="/shlib $glibpth"
-
+glibpth="$glibpth /lib32 /lib64 "`ls -1d /usr/lib/*-gnu 2>/dev/null`
: Private path used by Configure to find libraries. Its value
: is prepended to libpth. This variable takes care of special
: machines, like the mips. Usually, it should be empty.
@@ -429,10 +434,10 @@ case "$sh" in
sh="$xxx"
break
elif test -f "$xxx$_exe"; then
- sh="$xxx"
+ sh="$xxx$_exe"
break
elif test -f "$xxx.exe"; then
- sh="$xxx"
+ sh="$xxx.exe"
break
fi
done
@@ -715,7 +720,7 @@ while test $# -gt 0; do
esac
shift
;;
- -V) echo "$me generated by metaconfig 3.5-49." >&2
+ -V) echo "$me generated by metaconfig 3.5-116." >&2
exit 0;;
--) break;;
-*) echo "$me: unknown option $1" >&2; shift; error=true;;
@@ -1339,6 +1344,7 @@ cp
echo
expr
grep
+make
mkdir
mv
rm
@@ -1356,7 +1362,6 @@ less
line
ln
mail
-make
more
nroff
perl
@@ -1396,7 +1401,7 @@ for file in $loclist; do
;;
*)
echo "I don't know where '$file' is, and my life depends on it." >&4
- echo "Go find a public domain implementation or fix your PATH setting!" >&4
+ echo "Go find a public domain implementation or fix your PATH!" >&4
exit 1
;;
esac
@@ -1434,21 +1439,21 @@ for file in $trylist; do
esac
done
case "$egrep" in
-egrep)
+egrep$_exe)
echo "Substituting grep for egrep."
egrep=$grep
_egrep=$_grep
;;
esac
case "$ln" in
-ln)
+ln$_exe)
echo "Substituting cp for ln."
ln=$cp
_ln=$_cp
;;
esac
case "$make" in
-make)
+make$_exe)
case "$gmake" in
gmake)
echo "I can't find make or gmake, and my life depends on it." >&4
@@ -1459,11 +1464,10 @@ make)
;;
esac
case "$gmake" in
-gmake) ;;
-*) # We can't have osname yet.
- if test -f "/system/gnu_library/bin/ar.pm"; then # Stratus VOS
- # Assume that gmake, if found, is definitely GNU make
- # and prefer it over the system make.
+gmake$_exe) ;;
+*)
+ if test -f "/system/gnu_library/bin/ar.pm"; then
+ : Stratus VOS
echo "Substituting gmake for make."
make=$gmake
_make=$_gmake
@@ -1471,8 +1475,9 @@ gmake) ;;
;;
esac
case "$test" in
-test)
+test|test$_exe)
echo "Hopefully test is built into your sh."
+ test=test
;;
*)
if `sh -c "PATH= test true" >/dev/null 2>&1`; then
@@ -1483,13 +1488,14 @@ test)
;;
esac
case "$echo" in
-echo)
+echo|echo$_exe)
echo "Hopefully echo is built into your sh."
+ echo=echo
;;
'') ;;
*)
echo " "
-echo "Checking compatibility between $echo and builtin echo (if any)..." >&4
+echo "Checking compatibility between $_echo and builtin echo (if any)..." >&4
$echo $n "hi there$c" >foo1
echo $n "hi there$c" >foo2
if cmp foo1 foo2 >/dev/null 2>&1; then
@@ -1610,8 +1616,7 @@ EOSC
: determine whether symbolic links are supported
echo " "
-$touch blurfl
-$rm -f sym
+$rm -f blurfl sym
if $ln -s blurfl sym > /dev/null 2>&1 && $test -f sym; then
echo "Symbolic links are supported." >&4
lns="$ln -s"
@@ -1836,7 +1841,8 @@ $test -z "$myuname" && myuname=`hostname 2>/dev/null`
myuname=`echo $myuname | $sed -e 's/^[^=]*=//' -e 's/\///g' | \
./tr '[A-Z]' '[a-z]' | $tr $trnl ' '`
newmyuname="$myuname"
-$test -f "$uname$_exe" && has_uname=y
+has_uname=
+$test -f "$uname" && has_uname=y
: Guessing of the OS name -- half the following guesses are probably wrong...
: If you have better tests or hints, please send them to the metaconfig
@@ -1897,7 +1903,8 @@ if $test "X$has_uname" != X; then
osvers=4
elif $contains _SYSV3 /usr/include/stdio.h > /dev/null 2>&1 ; then
osvers=3
- elif $contains _POSIX_SOURCE /usr/include/stdio.h > /dev/null 2>&1 ; then
+ elif $contains _POSIX_SOURCE /usr/include/stdio.h > /dev/null 2>&1
+ then
osvers=2
fi
fi
@@ -1925,7 +1932,10 @@ if $test "X$has_uname" != X; then
osvers=`$uname -r`
;;
cygwin*) osname=cygwin
- osvers="$3"
+ osvers=`echo "$3" | sed -e 's/\(.*\)(.*/\1/'`
+ ;;
+ mingw*) osname=mingw
+ osvers=`echo "$3" | sed -e 's/\(.*\)(.*/\1/'`
;;
*dc.osx) osname=dcosx
osvers="$3"
@@ -2121,6 +2131,12 @@ case "$knowitall" in
*) dflt=y;;
esac
+saved_osname="$osname"
+saved_osvers="$osvers"
+tmp_n="$n"
+tmp_c="$c"
+tmp_sh="$sh"
+
: Get old answers from config file if it was generated on the same system
hint=default
if $test -f ../config.sh; then
@@ -2133,14 +2149,19 @@ if $test -f ../config.sh; then
myuname="$newmyuname"
;;
*) echo "Fetching default answers from your old config.sh file..." >&4
- tmp_n="$n"
- tmp_c="$c"
- tmp_sh="$sh"
. ../config.sh
cp ../config.sh .
- n="$tmp_n"
- c="$tmp_c"
hint=previous
+ case "$dflt" in
+ n)
+ echo " "
+ rp="Do you want further invocations to use these defaults?"
+ . ./myread
+ case "$ans" in
+ y*|Y*) myuname="$newmyuname";;
+ esac
+ ;;
+ esac
;;
esac
fi
@@ -2148,17 +2169,12 @@ fi
*)
echo " "
echo "Fetching default answers from $config_sh..." >&4
- tmp_n="$n"
- tmp_c="$c"
- tmp_sh="$sh"
cd ..
cp $config_sh config.sh 2>/dev/null
chmod +w config.sh
. ./config.sh
cd UU
cp ../config.sh .
- n="$tmp_n"
- c="$tmp_c"
hint=previous
;;
esac
@@ -2169,9 +2185,14 @@ $test "$override" && . ./optdef.sh
: Restore computed paths
for file in $loclist $trylist; do
- eval $file="\$_$file"
+ eval $file="\$_$file"$_exe
done
+osname="$saved_osname"
+osvers="$saved_osvers"
+n="$tmp_n"
+c="$tmp_c"
+
. ./checkcc
case "$targetarch" in
'') ;;
@@ -3856,8 +3877,7 @@ and I got the following output:
EOM
$cat > try.c <<'EOF'
-#include <stdio.h>
-int main() { exit(0); }
+int main() { return 0; }
EOF
dflt=y
if sh -c "$cc $optimize $ccflags $ldflags -o try try.c" >>try.msg 2>&1; then
@@ -4219,6 +4239,13 @@ if $test -r $rsrc/revision.h;then
revision=`awk \
'/^#[ ]*define[ ][ ]*REVISION/ {print $3}' \
< $rsrc/revision.h`
+ case "$revision" in
+ '"$Revision:')
+ revision=`awk \
+ '/^#[ ]*define[ ][ ]*REVISION/ {print $4}' \
+ < $rsrc/revision.h`
+ ;;
+ esac
else
revision=0
fi
@@ -4434,10 +4461,12 @@ find='$find'
firstmakefile='$firstmakefile'
flex='$flex'
from='$from'
+gcc='$gcc'
gccosandvers='$gccosandvers'
gccversion='$gccversion'
glibpth='$glibpth'
gmake='$gmake'
+gmsgfmt='$gmsgfmt'
grep='$grep'
groupcat='$groupcat'
gzip='$gzip'
@@ -4476,6 +4505,8 @@ mansrcexp='$mansrcexp'
mips_type='$mips_type'
mkdir='$mkdir'
more='$more'
+msgfmt='$msgfmt'
+msgmerge='$msgmerge'
mv='$mv'
mydomain='$mydomain'
myhostname='$myhostname'
@@ -4544,6 +4575,7 @@ usecrosscompile='$usecrosscompile'
usrinc='$usrinc'
uuname='$uuname'
vi='$vi'
+xgettext='$xgettext'
xlibpth='$xlibpth'
zcat='$zcat'
zip='$zip'