summaryrefslogtreecommitdiff
path: root/Configure
diff options
context:
space:
mode:
authorrmanfredi <rmanfredi@2592e710-e01b-42a5-8df0-11608a6cc53d>2010-11-28 23:08:52 +0000
committerrmanfredi <rmanfredi@2592e710-e01b-42a5-8df0-11608a6cc53d>2010-11-28 23:08:52 +0000
commit3aa6dc39faea413a5a66078f9d2e29783abefa41 (patch)
treeb657bbf51c3a6070c501565ae4e73dfab571f0ed /Configure
parent383e199f516789518200cee15869d03e47e6b229 (diff)
Regenerated.
git-svn-id: svn://svn.code.sf.net/p/dist/code/trunk/dist@50 2592e710-e01b-42a5-8df0-11608a6cc53d
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure65
1 files changed, 35 insertions, 30 deletions
diff --git a/Configure b/Configure
index b6ed02b..a43c6ec 100755
--- a/Configure
+++ b/Configure
@@ -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 35 2010-11-27 14:04:55Z rmanfredi $
+# $Id: Head.U 41 2010-11-28 00:21:26Z rmanfredi $
#
-# Generated on Sat Nov 27 15:09:44 CET 2010 [metaconfig 3.5-34]
+# Generated on Mon Nov 29 00:07:52 CET 2010 [metaconfig 3.5-49]
cat >c1$$ <<EOF
ARGGGHHHH!!!!!
@@ -63,7 +63,7 @@ if test -d c:/. ; then
OS2_SHELL=`cmd /c "echo %OS2_SHELL%" | tr '\\\\' / | tr '[A-Z]' '[a-z]'`
elif test -n "$DJGPP"; then
case "X${MACHTYPE:-nonesuchmach}" in
- *cygwin) ;;
+ *cygwin|*msys) ;;
*) p_=\; ;;
esac
fi
@@ -174,6 +174,7 @@ d_dos=''
d_eunice=''
d_linux=''
d_os2=''
+d_windows=''
d_xenix=''
_exe=''
eunicefix=''
@@ -247,6 +248,8 @@ uuname=''
vi=''
zcat=''
zip=''
+incpath=''
+mips_type=''
hint=''
myuname=''
osname=''
@@ -339,8 +342,6 @@ startperl=''
startsh=''
sysman=''
trnl=''
-incpath=''
-mips_type=''
usrinc=''
CONFIG=''
@@ -714,7 +715,7 @@ while test $# -gt 0; do
esac
shift
;;
- -V) echo "$me generated by metaconfig 3.5-34." >&2
+ -V) echo "$me generated by metaconfig 3.5-49." >&2
exit 0;;
--) break;;
-*) echo "$me: unknown option $1" >&2; shift; error=true;;
@@ -1037,7 +1038,6 @@ fi
rm -f missing x??
: Find the appropriate value for a newline for tr
-echo " "
if test -n "$DJGPP"; then
trnl='\012'
fi
@@ -1063,8 +1063,6 @@ $me: Fatal Error: cannot figure out how to translate newlines with 'tr'.
EOM
exit 1
-else
- echo "We'll use '$trnl' to transliterate a newline."
fi
: compute the number of columns on the terminal for proper question formatting
@@ -2473,6 +2471,7 @@ while test "$type"; do
case "$ansexp" in
/*) value="$ansexp" ;;
[a-zA-Z]:/*) value="$ansexp" ;;
+ [a-zA-Z]:\\*) value="$ansexp" ;;
*)
redo=true
case "$already" in
@@ -2859,10 +2858,12 @@ echo exit 1 >os2
echo exit 1 >gnu
echo exit 1 >linux
echo exit 1 >dos
+echo exit 1 >windows
d_bsd="$undef"
d_linux="$undef"
d_dos="$undef"
d_os2="$undef"
+d_windows="$undef"
$cat /usr/include/signal.h /usr/include/sys/signal.h >foo 2>/dev/null
if test -f /osf_boot || $contains 'OSF/1' /usr/include/ctype.h >/dev/null 2>&1
then
@@ -2917,6 +2918,18 @@ EOI
d_eunice="$undef"
;;
esac
+if test -d c:/.; then
+ case "X${MACHTYPE:-nonesuchmach}" in
+ *cygwin) echo " "; echo "Hah!... you're running under Cygwin!";;
+ *msys) echo " "; echo "Hah!... you're running under MinGW!";;
+ esac
+ case "X${MACHTYPE:-nonesuchmach}" in
+ *cygwin|*msys)
+ echo exit 0 >windows
+ d_windows="$define"
+ ;;
+ esac
+fi
case "$p_" in
:) ;;
*)
@@ -2924,10 +2937,6 @@ case "$p_" in
I have the feeling something is not exactly right, however...don't tell me...
EOI
if test -n "$DJGPP"; then
- case "X${MACHTYPE:-nonesuchmach}" in
- cygwin) echo "hah!... you're running under Cygwin!";;
- *) echo "got it... you're running DOS with DJGPP!";;
- esac
echo exit 0 >dos
d_dos="$define"
else
@@ -2961,14 +2970,13 @@ else
echo "Nor is it Venix..."
fi
fi
-chmod +x bsd usg v7 osf1 eunice xenix venix dos os2 gnu linux
-$eunicefix bsd usg v7 osf1 eunice xenix venix dos os2 gnu linux
+chmod +x bsd usg v7 osf1 eunice xenix venix dos os2 gnu linux windows
+$eunicefix bsd usg v7 osf1 eunice xenix venix dos os2 gnu linux windows
$rm -f foo
: What should the include directory be ?
echo " "
$echo $n "Hmm... $c"
-dflt='/usr/include'
incpath=''
mips_type=''
if $test -f /bin/mips && /bin/mips; then
@@ -2987,29 +2995,25 @@ EOCP
fi
$rm -f usr.c usr.out
echo "and you're compiling with the $mips_type compiler and libraries."
- xxx_prompt=y
echo "exit 0" >mips
else
echo "Doesn't look like a MIPS system."
- xxx_prompt=n
echo "exit 1" >mips
fi
chmod +x mips
$eunicefix mips
+
+: What should the include directory be ?
+echo " "
+dflt='/usr/include'
case "$usrinc" in
-'') ;;
+'') dflt="$incpath/usr/include";;
*) dflt="$usrinc";;
esac
-case "$xxx_prompt" in
-y) fn=d/
- echo " "
- rp='Where are the include files you want to use?'
- . ./getfile
- usrinc="$ans"
- ;;
-*) usrinc="$dflt"
- ;;
-esac
+fn=d/
+rp='Where are the include files you want to use?'
+. ./getfile
+usrinc="$ans"
: see if we have to deal with yellow pages, now NIS.
if $test -d /usr/etc/yp || $test -d /etc/yp || $test -d /usr/lib/yp; then
@@ -4417,6 +4421,7 @@ d_os2='$d_os2'
d_passnames='$d_passnames'
d_portable='$d_portable'
d_usgnames='$d_usgnames'
+d_windows='$d_windows'
d_xenix='$d_xenix'
date='$date'
defeditor='$defeditor'
@@ -4549,7 +4554,7 @@ $test -f $src/patchlevel.h && \
awk '/^#define/ {printf "%s=%s\n",$2,$3}' $src/patchlevel.h >>config.sh
$test -f $src/revision.h && \
sed -ne 's/^#define \([A-Za-z0-9_]*\) ".*: \([0-9]*\).*"/\1=\2/p' \
- < revision.h >>config.sh
+ < $src/revision.h >>config.sh
echo "CONFIG=true" >>config.sh
: propagate old symbols