summaryrefslogtreecommitdiff
path: root/config_office
diff options
context:
space:
mode:
authorHans-Joachim Lankenau <hjs@openoffice.org>2002-03-01 18:08:55 +0000
committerHans-Joachim Lankenau <hjs@openoffice.org>2002-03-01 18:08:55 +0000
commite6f84b996bf7ab9824870e65d091868bac0f280f (patch)
tree86c7a0b14ada3bd865a4eba6e9224686f8ee7ee6 /config_office
parentac5e0aa981e23e065507bb4d090de6c12a441e48 (diff)
#65293# win32 without 4nt; several fixes...
Diffstat (limited to 'config_office')
-rwxr-xr-xconfig_office/configure398
-rw-r--r--config_office/configure.in43
2 files changed, 272 insertions, 169 deletions
diff --git a/config_office/configure b/config_office/configure
index 617d4154b539..50114b6c61ef 100755
--- a/config_office/configure
+++ b/config_office/configure
@@ -102,6 +102,18 @@ ac_help="$ac_help
Usage: --with-unzip-home=<path to unzip.exe directory>
"
ac_help="$ac_help
+ --with-mingwin For Windows users, use the mingwin32 compiler
+ within cygwin environment (this implies --with-no-4nt=yes)
+
+ Usage: --with-mingwin=yes
+"
+ac_help="$ac_help
+ --with-no-4nt For Windows users, don't use the 4NT shell
+ within new cygwin V1.3.x environment
+
+ Usage: --with-no-4nt=yes
+"
+ac_help="$ac_help
--enable-sgistl for IRIX users, use this option option to build OpenOffice
using SGI's STL.
@@ -697,6 +709,22 @@ if test "${with_unzip_home+set}" = set; then
:
fi
+# Check whether --with-mingwin or --without-mingwin was given.
+if test "${with_mingwin+set}" = set; then
+ withval="$with_mingwin"
+ WITH_MINGWIN=$withval
+else
+ WITH_MINGWIN=0
+fi
+
+# Check whether --with-no-4nt or --without-no-4nt was given.
+if test "${with_no_4nt+set}" = set; then
+ withval="$with_no_4nt"
+ with_no_4nt=$withval
+else
+ with_no_4nt=0
+fi
+
# Check whether --enable-sgistl or --disable-sgistl was given.
if test "${enable_sgistl+set}" = set; then
enableval="$enable_sgistl"
@@ -729,7 +757,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:733: checking for $ac_word" >&5
+echo "configure:761: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_AWK'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -772,7 +800,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:776: checking for $ac_word" >&5
+echo "configure:804: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -811,10 +839,24 @@ if test -z "$SED"; then
{ echo "configure: error: install sed to run this script" 1>&2; exit 1; }
fi
echo $ac_n "checking the operating system""... $ac_c" 1>&6
-echo "configure:815: checking the operating system" >&5
+echo "configure:843: checking the operating system" >&5
_os=`uname`
if test `echo $_os | $AWK -F_ '{ print $1 }'` = "CYGWIN"; then
_os="WINNT"
+ if test `uname -r | $AWK -F. '{ print $1"."$2 }'` = "1.3"; then
+ CygwinVer="1"
+ else
+ CygwinVer="b"
+ fi
+ if test "$with_no_4nt" != "yes" -a "$CygwinVer" != "1"; then
+ { echo "configure: error: install Cygwin V1.3.x and tcsh if you don't use 4NT" 1>&2; exit 1; }
+ fi
+ if test $WITH_MINGWIN = "yes"; then
+ with_no_4nt="yes"
+ fi
+else
+ CygwinVer="false"
+ with_no_4nt=0
fi
if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin" -o "$_os" = "FreeBSD" -o "$_os" = "OSF1" -o "$_os" = "NetBSD" -o "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
echo "$ac_t""checked ($_os)" 1>&6
@@ -824,7 +866,7 @@ fi
_machine_type=`uname -m`
if test "$_os" = "SunOS"; then
echo $ac_n "checking the solaris operating system release""... $ac_c" 1>&6
-echo "configure:828: checking the solaris operating system release" >&5
+echo "configure:870: checking the solaris operating system release" >&5
_os_release=`uname -r | $AWK -F. '{ print $2 }'`
if test "$_os_release" != "8" -a "$_os_release" != "7" -a "$_os_release" != "6"; then
{ echo "configure: error: use solaris 6, 7 or 8 to build OpenOffice" 1>&2; exit 1; }
@@ -835,7 +877,7 @@ fi
if test "$_os" = "SunOS"
then
echo $ac_n "checking the processor type""... $ac_c" 1>&6
-echo "configure:839: checking the processor type" >&5
+echo "configure:881: checking the processor type" >&5
_processor=`uname -p`
if test "$_processor" = "sparc" -o "$_processor" = "i386"
then
@@ -845,13 +887,20 @@ echo "configure:839: checking the processor type" >&5
fi
fi
if test "$_os" = "SunOS" -o "$_os" = "IRIX" -o "$_os" = "IRIX64" -o "$_os" = "OSF1"; then
- CC=cc; export CC;
+ if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
+ if test "$CC" != "gcc"; then
+ CC=cc; export CC;
+ CXX=CC; export CXX;
+ fi
+ else
+ CC=cc; export CC;
+ fi
fi
if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:855: checking for $ac_word" >&5
+echo "configure:904: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -881,7 +930,7 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:885: checking for $ac_word" >&5
+echo "configure:934: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -932,7 +981,7 @@ fi
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:936: checking for $ac_word" >&5
+echo "configure:985: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -964,7 +1013,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:968: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1017: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -975,12 +1024,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF
-#line 979 "configure"
+#line 1028 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -1006,12 +1055,12 @@ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1010: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1059: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1015: checking whether we are using GNU C" >&5
+echo "configure:1064: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1020,7 +1069,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1024: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -1039,7 +1088,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1043: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1092: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1071,13 +1120,13 @@ else
fi
fi
-if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
+if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$CC" = "gcc" \) ; then
if test -z "$with_gcc_home"; then
if test "$CC" = "gcc"; then
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1081: checking for $ac_word" >&5
+echo "configure:1130: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GCC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1127,7 +1176,7 @@ fi
if test $GCC; then
echo $ac_n "checking the GNU gcc compiler version""... $ac_c" 1>&6
-echo "configure:1131: checking the GNU gcc compiler version" >&5
+echo "configure:1180: checking the GNU gcc compiler version" >&5
_gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
if test "$_gcc_releasetype" = "egcs"; then
echo "configure: warning: found egcs- version, use (stable=gcc-) version of the compiler" 1>&2
@@ -1156,7 +1205,7 @@ echo "configure:1131: checking the GNU gcc compiler version" >&5
else
echo "$ac_t""checked (gcc $_gcc_version)" 1>&6
echo $ac_n "checking the GNU gcc include paths""... $ac_c" 1>&6
-echo "configure:1160: checking the GNU gcc include paths" >&5
+echo "configure:1209: checking the GNU gcc include paths" >&5
_gcc_include_path=`find $_gcc_include_start -name $_gcc_version -print 2> /dev/null`
if test "$_gcc_include_path"; then
_multiple=`echo $_gcc_include_path | $AWK '{ if ($2) print "true"; else print "false" }'`
@@ -1231,7 +1280,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1235: checking for $ac_word" >&5
+echo "configure:1284: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path__cc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1268,7 +1317,7 @@ done
COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
echo $ac_n "checking the SUN Workshop C compiler version""... $ac_c" 1>&6
-echo "configure:1272: checking the SUN Workshop C compiler version" >&5
+echo "configure:1321: checking the SUN Workshop C compiler version" >&5
_workshop_version=`$CC -V 2>&1 | $AWK '/^cc/ { print $7 }'`
if test "$_workshop_version" = "C"; then
_workshop_version=`$CC -V 2>&1 | $AWK '/^cc/ { print $8 }'`
@@ -1297,7 +1346,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1301: checking for $ac_word" >&5
+echo "configure:1350: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path__cc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1334,7 +1383,7 @@ done
COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
echo $ac_n "checking the gcc compiler version""... $ac_c" 1>&6
-echo "configure:1338: checking the gcc compiler version" >&5
+echo "configure:1387: checking the gcc compiler version" >&5
cc_version=`$CC -v 2>&1 | $AWK '/Apple Computer/ { print $15 }'`
cc_major=`echo $cc_version | $AWK -F. '{ print $1 }'`
if test "$cc_major" != "2"; then
@@ -1367,7 +1416,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1371: checking for $ac_word" >&5
+echo "configure:1420: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path__cc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1404,7 +1453,7 @@ done
COMPATH=`echo $_cc | $SED -n "s/\/usr\/bin\/cc//p"`
echo $ac_n "checking the SGI MIPSpro C compiler version""... $ac_c" 1>&6
-echo "configure:1408: checking the SGI MIPSpro C compiler version" >&5
+echo "configure:1457: checking the SGI MIPSpro C compiler version" >&5
_mipspro_version=`$CC -version 2>&1 | $AWK '{ print $4 }'`
_mipspro_major=`echo $_mipspro_version | $AWK -F. '{ print $1 }'`
if test "$_mipspro_major" != "7"; then
@@ -1431,7 +1480,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1435: checking for $ac_word" >&5
+echo "configure:1484: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path__cc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1469,7 +1518,7 @@ done
COMPATH=`echo $_cc | $SED -n "s/\/usr\/bin\/cc//p"`
echo "configure: warning: ******* $_cc , $COMPATH" 1>&2
echo $ac_n "checking the Compaq C compiler version""... $ac_c" 1>&6
-echo "configure:1473: checking the Compaq C compiler version" >&5
+echo "configure:1522: checking the Compaq C compiler version" >&5
_compaqc_version=`$CC -V 2>&1 | $AWK '{ print $3 }'`
_compaqc_major=`echo $_compaqc_version | $AWK -F. '{ print $1 }'`
if test "$_compaqc_major" != "T6"; then
@@ -1483,20 +1532,25 @@ echo "configure:1473: checking the Compaq C compiler version" >&5
fi
if test "$_os" = "WINNT"; then
- echo $ac_n "checking the Microsoft C/C++ Compiler""... $ac_c" 1>&6
-echo "configure:1488: checking the Microsoft C/C++ Compiler" >&5
- if test -x $with_cl_home/bin/cl; then
- COMPATH=$with_cl_home
- echo "$ac_t""found." 1>&6
- else
- COMPATH="NO_CL"
- echo "$ac_t""not found." 1>&6
- fi
+ if test "$WITH_MINGWIN" != "yes"; then
+ echo $ac_n "checking the Microsoft C/C++ Compiler""... $ac_c" 1>&6
+echo "configure:1538: checking the Microsoft C/C++ Compiler" >&5
+ if test -e $with_cl_home"/bin/cl.exe"; then
+ COMPATH=$with_cl_home
+ echo "$ac_t""found." 1>&6
+ else
+ COMPATH="NO_CL"
+ echo "$ac_t""not found." 1>&6
+ fi
+ else
+ echo $ac_n "checking the Mingwin32 C++ Compiler""... $ac_c" 1>&6
+echo "configure:1548: checking the Mingwin32 C++ Compiler" >&5
+ fi
fi
if test "$_os" != "WINNT"; then
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1500: checking how to run the C preprocessor" >&5
+echo "configure:1554: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1511,13 +1565,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1515 "configure"
+#line 1569 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1528,13 +1582,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1532 "configure"
+#line 1586 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1592: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1545,13 +1599,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1549 "configure"
+#line 1603 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1609: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1576,12 +1630,12 @@ fi
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1580: checking for ANSI C header files" >&5
+echo "configure:1634: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1585 "configure"
+#line 1639 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1589,7 +1643,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1593: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1647: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1606,7 +1660,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1610 "configure"
+#line 1664 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1624,7 +1678,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1628 "configure"
+#line 1682 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1645,7 +1699,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 1649 "configure"
+#line 1703 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1656,7 +1710,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:1660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -1683,7 +1737,7 @@ fi
if test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
echo $ac_n "checking pam_appl.h""... $ac_c" 1>&6
-echo "configure:1687: checking pam_appl.h" >&5
+echo "configure:1741: checking pam_appl.h" >&5
if test -f "/usr/include/security/pam_appl.h"; then
echo "$ac_t""yes" 1>&6
else
@@ -1697,7 +1751,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1701: checking for $ac_word" >&5
+echo "configure:1755: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1729,7 +1783,7 @@ test -n "$CXX" || CXX="gcc"
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1733: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:1787: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1740,12 +1794,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext << EOF
-#line 1744 "configure"
+#line 1798 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:1749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -1771,12 +1825,12 @@ if test $ac_cv_prog_cxx_works = no; then
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1775: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1829: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:1780: checking whether we are using GNU C++" >&5
+echo "configure:1834: checking whether we are using GNU C++" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1785,7 +1839,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1789: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes
else
ac_cv_prog_gxx=no
@@ -1804,7 +1858,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1808: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:1862: checking whether ${CXX-g++} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1835,10 +1889,10 @@ else
fi
fi
-if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
+if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o "$_os" = "IRIX" -o "$_os" = "IRIX64" ; then
if test "$CC" = "gcc"; then
echo $ac_n "checking g++ Compiler""... $ac_c" 1>&6
-echo "configure:1842: checking g++ Compiler" >&5
+echo "configure:1896: checking g++ Compiler" >&5
if test -z "$GXX"; then
echo "configure: warning: GNU g++/c++ was not found" 1>&2
echo "configure: warning: GNU g++/c++ was not found" 1>&2 >> warn
@@ -1851,7 +1905,7 @@ if test "$_os" = "SunOS"; then
CXX=CC; export CXX;
if test "$CC" = "cc"; then
echo $ac_n "checking Sun Workshop C++ Compiler""... $ac_c" 1>&6
-echo "configure:1855: checking Sun Workshop C++ Compiler" >&5
+echo "configure:1909: checking Sun Workshop C++ Compiler" >&5
if test "$CXX" != "CC"; then
echo "configure: warning: Sun Workshop C++ was not found" 1>&2
echo "configure: warning: Sun Worlshop C++ was not found" 1>&2 >> warn
@@ -1864,7 +1918,7 @@ if test "$_os" = "Darwin"; then
CXX=c++; export CXX;
if test "$CC" = "cc"; then
echo $ac_n "checking Macosx c++ Compiler""... $ac_c" 1>&6
-echo "configure:1868: checking Macosx c++ Compiler" >&5
+echo "configure:1922: checking Macosx c++ Compiler" >&5
if test "$CXX" != "c++"; then
echo "configure: warning: Macosx C++ was not found" 1>&2
echo "configure: warning: Macosx C++ was not found" 1>&2 >> warn
@@ -1874,10 +1928,10 @@ echo "configure:1868: checking Macosx c++ Compiler" >&5
fi
fi
if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
- CXX=CC; export CXX;
if test "$CC" = "cc"; then
- echo $ac_n "checking SGI MIPSpro C++ Compiler""... $ac_c" 1>&6
-echo "configure:1881: checking SGI MIPSpro C++ Compiler" >&5
+ CXX=CC; export CXX;
+ echo $ac_n "checking SGI MIPSpro C++ Compiler""... $ac_c" 1>&6
+echo "configure:1935: checking SGI MIPSpro C++ Compiler" >&5
if test "$CXX" != "CC"; then
echo "configure: warning: SGI MIPSpro C++ was not found" 1>&2
echo "configure: warning: SGI MIPSpro C++ was not found" 1>&2 >> warn
@@ -1889,7 +1943,7 @@ fi
if test "$_os" = "OSF1"; then
CXX="cxx"; export CXX;
echo $ac_n "checking Compaq C++ compiler version""... $ac_c" 1>&6
-echo "configure:1893: checking Compaq C++ compiler version" >&5
+echo "configure:1947: checking Compaq C++ compiler version" >&5
_compaqcxx_version=`$CXX -V 2>&1 | $AWK '{ print $3 }'`
_compaqcxx_major=`echo $_compaqcxx_version | $AWK -F. '{ print $1 }'`
if test "$_compaqcxx_major" != "V6"; then
@@ -1904,7 +1958,7 @@ if test "$_os" = "SunOS"; then
_temp=`showrev -p | $AWK -F" " '{ print $2 }'`
if test "$_os_release" = "7"; then
echo $ac_n "checking for patch 106327-06 or greater""... $ac_c" 1>&6
-echo "configure:1908: checking for patch 106327-06 or greater" >&5
+echo "configure:1962: checking for patch 106327-06 or greater" >&5
_patch=`echo $_temp | $AWK '/106327-06/ { print "found" }'`
_patch="false"
for i in $_temp
@@ -1924,7 +1978,7 @@ echo "configure:1908: checking for patch 106327-06 or greater" >&5
echo "configure: warning: patch 106327-06 not found, please install compiler patch 106327-06 or greater" 1>&2 >> warn
fi
echo $ac_n "checking for patch 106950-11 or greater""... $ac_c" 1>&6
-echo "configure:1928: checking for patch 106950-11 or greater" >&5
+echo "configure:1982: checking for patch 106950-11 or greater" >&5
_patch=`echo $_temp | $AWK '/106950-11/ { print "found" }'`
_patch="false"
for i in $_temp
@@ -1946,7 +2000,7 @@ echo "configure:1928: checking for patch 106950-11 or greater" >&5
else
if test "$_os_release" = "6"; then
echo $ac_n "checking for patch 105591-09 or greater""... $ac_c" 1>&6
-echo "configure:1950: checking for patch 105591-09 or greater" >&5
+echo "configure:2004: checking for patch 105591-09 or greater" >&5
_patch=`echo $_temp | $AWK '/105591-09/ { print "found" }'`
_patch="false"
for i in $_temp
@@ -1966,7 +2020,7 @@ echo "configure:1950: checking for patch 105591-09 or greater" >&5
echo "configure: warning: patch 105591-09 not found, please install compiler patch 105591-09 or greater" 1>&2 >> warn
fi
echo $ac_n "checking for patch 107733-08 or greater""... $ac_c" 1>&6
-echo "configure:1970: checking for patch 107733-08 or greater" >&5
+echo "configure:2024: checking for patch 107733-08 or greater" >&5
_patch=`echo $_temp | $AWK '/107733-08/ { print "found" }'`
_patch="false"
for i in $_temp
@@ -1998,7 +2052,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:2002: checking how to run the C++ preprocessor" >&5
+echo "configure:2056: checking how to run the C++ preprocessor" >&5
if test -z "$CXXCPP"; then
if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2011,12 +2065,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross
CXXCPP="${CXX-g++} -E"
cat > conftest.$ac_ext <<EOF
-#line 2015 "configure"
+#line 2069 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2074: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -2041,12 +2095,12 @@ CXXCPP="$ac_cv_prog_CXXCPP"
echo "$ac_t""$CXXCPP" 1>&6
cat > conftest.$ac_ext <<EOF
-#line 2045 "configure"
+#line 2099 "configure"
#include "confdefs.h"
""
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -2061,7 +2115,7 @@ fi
if test -n "$enable_sgistl"; then
if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
echo $ac_n "checking for SGI STL""... $ac_c" 1>&6
-echo "configure:2065: checking for SGI STL" >&5
+echo "configure:2119: checking for SGI STL" >&5
if test -d /usr/include/CC ; then
echo "$ac_t""yes." 1>&6
@@ -2074,17 +2128,17 @@ echo "configure:2065: checking for SGI STL" >&5
else
echo $ac_n "checking for STLport4 headers""... $ac_c" 1>&6
-echo "configure:2078: checking for STLport4 headers" >&5
+echo "configure:2132: checking for STLport4 headers" >&5
if test -d "$with_stlport4_home"; then
STLPORT4=$with_stlport4_home
if test "$_os" != "WINNT"; then
cat > conftest.$ac_ext <<EOF
-#line 2083 "configure"
+#line 2137 "configure"
#include "confdefs.h"
$STLPORT4/stlport/hash_map
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2106,7 +2160,7 @@ rm -f conftest*
fi
if test "$_os" != "WINNT"; then
echo $ac_n "checking for STLport4 libraries""... $ac_c" 1>&6
-echo "configure:2110: checking for STLport4 libraries" >&5
+echo "configure:2164: checking for STLport4 libraries" >&5
if test "$_os" = "SunOS"; then
if test -f "$STLPORT4/lib/libstlport_sunpro.so"; then
echo "$ac_t""checked" 1>&6
@@ -2123,7 +2177,11 @@ echo "configure:2110: checking for STLport4 libraries" >&5
if test -f "$STLPORT4/lib/libstlport_mipspro_41.so"; then
echo "$ac_t""checked" 1>&6
else
- { echo "configure: error: STLport4 libraries not found" 1>&2; exit 1; }
+ if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
+ echo "$ac_t""checked" 1>&6
+ else
+ { echo "configure: error: STLport4 libraries not found" 1>&2; exit 1; }
+ fi
fi
else
if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
@@ -2143,7 +2201,7 @@ if test -z "$with_jdk_home"; then
# Extract the first word of "javac", so it can be a program name with args.
set dummy javac; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2147: checking for $ac_word" >&5
+echo "configure:2205: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_JAVA'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2182,13 +2240,22 @@ else
fi
fi
echo $ac_n "checking the installed JDK""... $ac_c" 1>&6
-echo "configure:2186: checking the installed JDK" >&5
+echo "configure:2244: checking the installed JDK" >&5
if test "$JAVA"; then
_correct_jdk_exists="false"
_jdk=`$JAVA -J-version 2>&1 | $AWK -F'"' '{ print \$2 }'`
- if test "$_os" = "SunOS" -o "$_os" = "IRIX" -o "$_os" = "IRIX64" -o "$_os" = "OSF1"; then
+ if test "$_os" = "SunOS" -o "$_os" = "OSF1"; then
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
fi
+ if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
+ _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
+
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
+ _jdk_minor="true"
+ fi
+ fi
+
if test "$_os" = "Linux" -a "$_machine_type" = "i686"; then
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
_jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
@@ -2211,6 +2278,11 @@ if test "$JAVA"; then
fi
if test "$_os" = "WINNT"; then
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
+
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
+ _jdk_minor="true"
+ fi
fi
if test "$_os" = "Darwin"; then
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
@@ -2266,7 +2338,7 @@ if test "$_correct_jdk_exists" = "false"; then
fi
if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2270: checking how to run the C preprocessor" >&5
+echo "configure:2342: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -2281,13 +2353,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 2285 "configure"
+#line 2357 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2291: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -2298,13 +2370,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 2302 "configure"
+#line 2374 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2308: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2380: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -2315,13 +2387,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 2319 "configure"
+#line 2391 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2325: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2397: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -2348,7 +2420,7 @@ echo "$ac_t""$CPP" 1>&6
fi
if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:2352: checking how to run the C++ preprocessor" >&5
+echo "configure:2424: checking how to run the C++ preprocessor" >&5
if test -z "$CXXCPP"; then
if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2361,12 +2433,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross
CXXCPP="${CXX-g++} -E"
cat > conftest.$ac_ext <<EOF
-#line 2365 "configure"
+#line 2437 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2442: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -2395,7 +2467,7 @@ if test -z "$with_perl_home"; then
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2399: checking for $ac_word" >&5
+echo "configure:2471: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2435,7 +2507,7 @@ else
fi
if test "$PERL"; then
echo $ac_n "checking the Perl version""... $ac_c" 1>&6
-echo "configure:2439: checking the Perl version" >&5
+echo "configure:2511: checking the Perl version" >&5
_perl_temp=`$PERL -version 2> /dev/null | $AWK -F" " '/built for/ { print $4 }'`
if test "$_perl_temp" = "version"; then
_perl_version=`$PERL -version 2> /dev/null | $AWK -F" " '/built for/ { print $5 }'`
@@ -2457,11 +2529,11 @@ echo "#!$PERL/perl -w" > set_soenv
cat set_soenv.1 >> set_soenv
chmod +x set_soenv
-if test "$_os" != "WINNT"; then
+if test "$_os" != "WINNT" -o "$CygwinVer" = "1" ; then
# Extract the first word of "tcsh", so it can be a program name with args.
set dummy tcsh; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2465: checking for $ac_word" >&5
+echo "configure:2537: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_TCSH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2500,7 +2572,7 @@ fi
TCSH=`echo $TCSH | $SED -n "s/\/tcsh//p"`
fi
else
- echo "configure: warning: Windows does not have tcsh" 1>&2
+ echo "configure: warning: Windows / Cygwin b2x does not have tcsh" 1>&2
TCSH="NO_TCSH"
fi
if test "$_os" != "WINNT" -a "$_os" != "Darwin"; then
@@ -2509,7 +2581,7 @@ if test "$_os" != "WINNT" -a "$_os" != "Darwin"; then
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:2513: checking for X" >&5
+echo "configure:2585: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
@@ -2571,12 +2643,12 @@ if test "$ac_x_includes" = NO; then
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 2575 "configure"
+#line 2647 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2580: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2645,14 +2717,14 @@ if test "$ac_x_libraries" = NO; then
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2649 "configure"
+#line 2721 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:2656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
@@ -2758,17 +2830,17 @@ else
case "`(uname -sr) 2>/dev/null`" in
"SunOS 5"*)
echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:2762: checking whether -R must be followed by a space" >&5
+echo "configure:2834: checking whether -R must be followed by a space" >&5
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 2765 "configure"
+#line 2837 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:2772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
@@ -2784,14 +2856,14 @@ rm -f conftest*
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 2788 "configure"
+#line 2860 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:2795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
@@ -2823,7 +2895,7 @@ rm -f conftest*
# libraries were built with DECnet support. And karl@cs.umb.edu says
# the Alpha needs dnet_stub (dnet does not exist).
echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:2827: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:2899: checking for dnet_ntoa in -ldnet" >&5
ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2831,7 +2903,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldnet $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2835 "configure"
+#line 2907 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
@@ -2845,7 +2917,7 @@ int main() {
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:2849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2867,7 +2939,7 @@ fi
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:2871: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:2943: checking for dnet_ntoa in -ldnet_stub" >&5
ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2875,7 +2947,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldnet_stub $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2879 "configure"
+#line 2951 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
@@ -2889,7 +2961,7 @@ int main() {
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:2893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2918,12 +2990,12 @@ fi
# The nsl library prevents programs from opening the X display
# on Irix 5.2, according to dickey@clark.net.
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:2922: checking for gethostbyname" >&5
+echo "configure:2994: checking for gethostbyname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2927 "configure"
+#line 2999 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
@@ -2949,7 +3021,7 @@ gethostbyname();
; return 0; }
EOF
-if { (eval echo configure:2953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
@@ -2970,7 +3042,7 @@ fi
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:2974: checking for gethostbyname in -lnsl" >&5
+echo "configure:3046: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2978,7 +3050,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2982 "configure"
+#line 3054 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
@@ -2992,7 +3064,7 @@ int main() {
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:2996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3022,12 +3094,12 @@ fi
# -lsocket must be given before -lnsl if both are needed.
# We assume that if connect needs -lnsl, so does gethostbyname.
echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:3026: checking for connect" >&5
+echo "configure:3098: checking for connect" >&5
if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3031 "configure"
+#line 3103 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
@@ -3053,7 +3125,7 @@ connect();
; return 0; }
EOF
-if { (eval echo configure:3057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_connect=yes"
else
@@ -3074,7 +3146,7 @@ fi
if test $ac_cv_func_connect = no; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:3078: checking for connect in -lsocket" >&5
+echo "configure:3150: checking for connect in -lsocket" >&5
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3082,7 +3154,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3086 "configure"
+#line 3158 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
@@ -3096,7 +3168,7 @@ int main() {
connect()
; return 0; }
EOF
-if { (eval echo configure:3100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3120,12 +3192,12 @@ fi
# gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:3124: checking for remove" >&5
+echo "configure:3196: checking for remove" >&5
if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3129 "configure"
+#line 3201 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
@@ -3151,7 +3223,7 @@ remove();
; return 0; }
EOF
-if { (eval echo configure:3155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_remove=yes"
else
@@ -3172,7 +3244,7 @@ fi
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:3176: checking for remove in -lposix" >&5
+echo "configure:3248: checking for remove in -lposix" >&5
ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3180,7 +3252,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lposix $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3184 "configure"
+#line 3256 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
@@ -3194,7 +3266,7 @@ int main() {
remove()
; return 0; }
EOF
-if { (eval echo configure:3198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3218,12 +3290,12 @@ fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:3222: checking for shmat" >&5
+echo "configure:3294: checking for shmat" >&5
if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3227 "configure"
+#line 3299 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
@@ -3249,7 +3321,7 @@ shmat();
; return 0; }
EOF
-if { (eval echo configure:3253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shmat=yes"
else
@@ -3270,7 +3342,7 @@ fi
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:3274: checking for shmat in -lipc" >&5
+echo "configure:3346: checking for shmat in -lipc" >&5
ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3278,7 +3350,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3282 "configure"
+#line 3354 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
@@ -3292,7 +3364,7 @@ int main() {
shmat()
; return 0; }
EOF
-if { (eval echo configure:3296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3325,7 +3397,7 @@ fi
# libraries we check for below, so use a different variable.
# --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:3329: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:3401: checking for IceConnectionNumber in -lICE" >&5
ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3333,7 +3405,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3337 "configure"
+#line 3409 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
@@ -3347,7 +3419,7 @@ int main() {
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:3351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3386,7 +3458,7 @@ fi
CFLAGS=$X_CFLAGS
LDFLAGS="$X_LDFLAGS $X_LIBS"
echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:3390: checking for XOpenDisplay in -lX11" >&5
+echo "configure:3462: checking for XOpenDisplay in -lX11" >&5
ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3394,7 +3466,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lX11 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3398 "configure"
+#line 3470 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
@@ -3408,7 +3480,7 @@ int main() {
XOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:3412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3435,7 +3507,7 @@ else
fi
if test "$_os" = "Linux"; then
echo $ac_n "checking for gnu_get_libc_version in -lc""... $ac_c" 1>&6
-echo "configure:3439: checking for gnu_get_libc_version in -lc" >&5
+echo "configure:3511: checking for gnu_get_libc_version in -lc" >&5
ac_lib_var=`echo c'_'gnu_get_libc_version | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3443,7 +3515,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3447 "configure"
+#line 3519 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
@@ -3457,7 +3529,7 @@ int main() {
gnu_get_libc_version()
; return 0; }
EOF
-if { (eval echo configure:3461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3478,7 +3550,7 @@ else
fi
echo $ac_n "checking the installed libc is at least version 2.1.1""... $ac_c" 1>&6
-echo "configure:3482: checking the installed libc is at least version 2.1.1" >&5
+echo "configure:3554: checking the installed libc is at least version 2.1.1" >&5
if test "$HAVE_LIBC"; then
echo "$ac_t""checked" 1>&6
else
@@ -3488,7 +3560,7 @@ fi
# Extract the first word of "bison", so it can be a program name with args.
set dummy bison; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3492: checking for $ac_word" >&5
+echo "configure:3564: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_BISON'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3526,7 +3598,7 @@ fi
# Extract the first word of "flex", so it can be a program name with args.
set dummy flex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3530: checking for $ac_word" >&5
+echo "configure:3602: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_FLEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3564,7 +3636,7 @@ fi
# Extract the first word of "patch", so it can be a program name with args.
set dummy patch; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3568: checking for $ac_word" >&5
+echo "configure:3640: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PATCH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3603,7 +3675,7 @@ if test "$_os" = "WINNT"; then
# Extract the first word of "bash", so it can be a program name with args.
set dummy bash; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3607: checking for $ac_word" >&5
+echo "configure:3679: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_CYGWIN'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3642,7 +3714,7 @@ if test ! -x "$with_asm_home/ml.exe"; then
# Extract the first word of "ml.exe", so it can be a program name with args.
set dummy ml.exe; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3646: checking for $ac_word" >&5
+echo "configure:3718: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_ML_EXE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3688,7 +3760,7 @@ if test ! -x "$with_unzip_home/unzip.exe"; then
# Extract the first word of "unzip.exe", so it can be a program name with args.
set dummy unzip.exe; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3692: checking for $ac_word" >&5
+echo "configure:3764: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_UNZIP_EXE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3732,15 +3804,15 @@ fi
echo $ac_n "checking GPC files""... $ac_c" 1>&6
-echo "configure:3736: checking GPC files" >&5
-if test -e ../external/gpc/gpc.h; then
+echo "configure:3808: checking GPC files" >&5
+if test -f ../external/gpc/gpc.h; then
HAVE_GPC_H="yes"
fi
-if test -e ../external/gpc/gpc.c; then
+if test -f ../external/gpc/gpc.c; then
HAVE_GPC_C="yes"
fi
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
echo "$ac_t""GPC files found" 1>&6
else
{ echo "configure: error: GPC files not found" 1>&2; exit 1; }
@@ -3835,12 +3907,14 @@ echo "\$enable_xprint="$enable_xprint
echo "\$with_lang="$with_lang
echo "\$with_asm_home="$with_asm_home
echo "\$with_unzip_home="$with_unzip_home
+echo "\$MINGWIN32="$WITH_MINGWIN
+echo "\$with_no_4nt="$with_no_4nt
echo
fi
# Executing the set_soenv script to setup the environment variables.
if test -z "$enable_check_only"; then
- './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home
+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_no_4nt
else
echo
echo Test Complete
diff --git a/config_office/configure.in b/config_office/configure.in
index 9d04881ba4d8..dde6ce6d9e0d 100644
--- a/config_office/configure.in
+++ b/config_office/configure.in
@@ -106,10 +106,16 @@ AC_ARG_WITH(unzip-home,
],,)
AC_ARG_WITH(mingwin,
[ --with-mingwin For Windows users, use the mingwin32 compiler
- within cygwin environment
+ within cygwin environment (this implies --with-no-4nt=yes)
Usage: --with-mingwin=yes
],WITH_MINGWIN=$withval,WITH_MINGWIN=0)
+AC_ARG_WITH(no-4nt,
+[ --with-no-4nt For Windows users, don't use the 4NT shell
+ within new cygwin V1.3.x environment
+
+ Usage: --with-no-4nt=yes
+],with_no_4nt=$withval,with_no_4nt=0)
AC_ARG_ENABLE(sgistl,
[ --enable-sgistl for IRIX users, use this option option to build OpenOffice
using SGI's STL.
@@ -159,6 +165,23 @@ AC_MSG_CHECKING([the operating system])
_os=`uname`
if test `echo $_os | $AWK -F_ '{ print $1 }'` = "CYGWIN"; then
_os="WINNT"
+ if test `uname -r | $AWK -F. '{ print $1"."$2 }'` = "1.3"; then
+ CygwinVer="1"
+ else
+ CygwinVer="b"
+ fi
+ if test "$with_no_4nt" != "yes" -a "$CygwinVer" != "1"; then
+ AC_MSG_ERROR([install Cygwin V1.3.x and tcsh if you don't use 4NT])
+ fi
+ dnl ===================================================================
+ dnl IF using Mingwin32 then don't use 4NT
+ dnl ===================================================================
+ if test $WITH_MINGWIN = "yes"; then
+ with_no_4nt="yes"
+ fi
+else
+ CygwinVer="false"
+ with_no_4nt=0
fi
if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin" -o "$_os" = "FreeBSD" -o "$_os" = "OSF1" -o "$_os" = "NetBSD" -o "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
AC_MSG_RESULT([checked ($_os)])
@@ -438,7 +461,7 @@ dnl Check if there is a Microsoft C/C++ compiler.
if test "$_os" = "WINNT"; then
if test "$WITH_MINGWIN" != "yes"; then
AC_MSG_CHECKING([the Microsoft C/C++ Compiler])
- if test -x $with_cl_home/bin/cl; then
+ if test -e $with_cl_home"/bin/cl.exe"; then
COMPATH=$with_cl_home
AC_MSG_RESULT([found.])
else
@@ -771,6 +794,11 @@ if test "$JAVA"; then
fi
if test "$_os" = "WINNT"; then
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
+
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
+ _jdk_minor="true"
+ fi
fi
if test "$_os" = "Darwin"; then
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
@@ -880,7 +908,7 @@ cat set_soenv.1 >> set_soenv
chmod +x set_soenv
dnl Check whether the tcsh can be used.
-if test "$_os" != "WINNT"; then
+if test "$_os" != "WINNT" -o "$CygwinVer" = "1" ; then
AC_PATH_PROG(TCSH, tcsh)
if test -z "$TCSH"; then
AC_MSG_ERROR([tcsh not found in \$PATH])
@@ -889,7 +917,7 @@ if test "$_os" != "WINNT"; then
TCSH=`echo $TCSH | $SED -n "s/\/tcsh//p"`
fi
else
- AC_MSG_WARN([Windows does not have tcsh])
+ AC_MSG_WARN([Windows / Cygwin b2x does not have tcsh])
TCSH="NO_TCSH"
fi
dnl ===================================================================
@@ -994,10 +1022,10 @@ dnl Test for the presence of the required gpc.{c,h} files
dnl ===================================================================
AC_MSG_CHECKING([GPC files])
-if test -e ../external/gpc/gpc.h; then
+if test -f ../external/gpc/gpc.h; then
HAVE_GPC_H="yes"
fi
-if test -e ../external/gpc/gpc.c; then
+if test -f ../external/gpc/gpc.c; then
HAVE_GPC_C="yes"
fi
@@ -1104,12 +1132,13 @@ echo "\$with_lang="$with_lang
echo "\$with_asm_home="$with_asm_home
echo "\$with_unzip_home="$with_unzip_home
echo "\$MINGWIN32="$WITH_MINGWIN
+echo "\$with_no_4nt="$with_no_4nt
echo
fi
# Executing the set_soenv script to setup the environment variables.
if test -z "$enable_check_only"; then
- './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN
+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_no_4nt
else
echo
echo Test Complete
generated by cgit (git 2.34.1) at 2025-02-14 18:51:02 +0000