Index: src/gcc/Makefile.in =================================================================== RCS file: /gccos2/src/gcc/Makefile.in,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -w -u -r1.1.1.2 -r1.3 Index: src/gcc/configure =================================================================== RCS file: /gccos2/src/gcc/configure,v retrieving revision 1.1.1.3 retrieving revision 1.4 diff -w -u -r1.1.1.3 -r1.4 Index: src/gcc/configure.in =================================================================== RCS file: /gccos2/src/gcc/configure.in,v retrieving revision 1.1.1.2 retrieving revision 1.4 diff -w -u -r1.1.1.2 -r1.4 --- src/gcc/configure.in 27 Apr 2004 18:38:02 -0000 1.1.1.2 +++ src/gcc/configure.in 28 Apr 2004 04:57:38 -0000 1.4 @@ -99,6 +99,14 @@ # per-host: +if [ x${shared} = xyes ]; then + case "${host}" in + i[3456]86-*-os2-emx) + # We don't want -fPIC on OS/2 EMX. + esac +fi +# GCC-OS2 - end + # There is no longer anything interesting in the per-host section. # per-target: @@ -1060,6 +1068,9 @@ ;; i[3456]86-*-msdosdjgpp*) host_makefile_frag="config/mh-djgpp" + ;; + i[3456]86-*-os2*) + host_makefile_frag="config/mh-emx" ;; *-cygwin*) host_makefile_frag="config/mh-cygwin" Index: src/gcc/libtool.m4 =================================================================== RCS file: /gccos2/src/gcc/libtool.m4,v retrieving revision 1.1.1.3 retrieving revision 1.6 diff -w -u -r1.1.1.3 -r1.6 --- src/gcc/libtool.m4 7 Sep 2004 01:16:53 -0000 1.1.1.3 +++ src/gcc/libtool.m4 8 Sep 2004 00:03:17 -0000 1.6 @@ -701,6 +701,10 @@ lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; + osf3* | osf4* | osf5*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' Index: src/gcc/ltcf-c.sh =================================================================== RCS file: /gccos2/src/gcc/ltcf-c.sh,v retrieving revision 1.1.1.2 retrieving revision 1.7 diff -w -u -r1.1.1.2 -r1.7 --- src/gcc/ltcf-c.sh 27 Apr 2004 18:38:02 -0000 1.1.1.2 +++ src/gcc/ltcf-c.sh 28 Apr 2004 04:57:38 -0000 1.7 @@ -485,8 +485,10 @@ os2*) hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes - allow_undefined_flag=unsupported - archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + #allow_undefined_flag=unsupported + # HACK!!!! just need something here to link shared libs - at least for now. + allow_undefined_flag=no + archive_cmds='$echo "LIBRARY $soname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags ${LT_OS2_LDFLAGS} $output_objdir/$libname.def' old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; Index: src/gcc/ltcf-cxx.sh =================================================================== RCS file: /gccos2/src/gcc/ltcf-cxx.sh,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -w -u -r1.1.1.2 -r1.2 Index: src/gcc/ltcf-gcj.sh =================================================================== RCS file: /gccos2/src/gcc/ltcf-gcj.sh,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -w -u -r1.1.1.2 -r1.3 Index: src/gcc/ltconfig =================================================================== RCS file: /gccos2/src/gcc/ltconfig,v retrieving revision 1.1.1.3 retrieving revision 1.8 diff -w -u -r1.1.1.3 -r1.8 --- src/gcc/ltconfig 7 Sep 2004 01:17:02 -0000 1.1.1.3 +++ src/gcc/ltconfig 8 Sep 2004 00:03:17 -0000 1.8 @@ -1284,11 +1284,31 @@ ;; os2*) - libname_spec='$name' + version_type=linux + need_version=no need_lib_prefix=no - library_names_spec='$libname.dll $libname.a' + # embedd versionnumbers into the name as far as there is space for such. + # old: libname_spec='$name' + # old: library_names_spec='$libname.dll $libname.a' + # assumes no dots in the $name. + # Man, awk is cute! + soname_spec="\`echo \"\${release}...\" | name=\"\${name}\" gawk -- 'BEGIN { FS = \".\"} ; \ + { sNum=\"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ\"; sVer=\"\"; \ + if (\$1 != \"\" || \$2 != \"\") { if (\$1 < 0) \$1= -\$1; sVer=substr(sNum,\$1%length(sNum)+1, 1) } \ + if (\$2 != \"\") { if (\$2 >= length(sNum)) sVer=sVer\"\"substr(sNum,\$2/length(sNum)+1, 1); sVer=sVer\"\"substr(sNum, \$2%length(sNum)+1, 1); } \ + printf(\"%.*s%s\", 8-length(sVer), ENVIRON[\"name\"], sVer); \ + } ' \`" + libname_spec='lib$name' + library_names_spec="\`echo \"\${release}...\" | name=\"\${name}\" gawk -- 'BEGIN { FS = \".\"} ; \ + { sNum=\"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ\"; sVer=\"\"; \ + if (\$1 != \"\" || \$2 != \"\") { if (\$1 < 0) \$1= -\$1; sVer=substr(sNum,\$1%length(sNum)+1, 1) } \ + if (\$2 != \"\") { if (\$2 >= length(sNum)) sVer=sVer\"\"substr(sNum,\$2/length(sNum)+1, 1); sVer=sVer\"\"substr(sNum, \$2%length(sNum)+1, 1); } \ + printf(\"%.*s%s\", 8-length(sVer), ENVIRON[\"name\"], sVer); \ + } ' \`.dll lib\${name}.a" dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + # HACK + allow_undefined_flag=no ;; osf3* | osf4* | osf5*) @@ -1555,7 +1575,7 @@ # Only try to build win32 dlls if AC_LIBTOOL_WIN32_DLL was used in # configure.in, otherwise build static only libraries. case $host_os in -cygwin* | mingw* | pw32* | os2*) +cygwin* | mingw* | pw32*) if test x$can_build_shared = xyes; then test x$enable_win32_dll = xno && can_build_shared=no echo "checking if package supports dlls... $can_build_shared" 1>&6 Index: src/gcc/ltmain.sh =================================================================== RCS file: /gccos2/src/gcc/ltmain.sh,v retrieving revision 1.1.1.2 retrieving revision 1.4 diff -w -u -r1.1.1.2 -r1.4 --- src/gcc/ltmain.sh 27 Apr 2004 18:38:02 -0000 1.1.1.2 +++ src/gcc/ltmain.sh 28 Apr 2004 04:57:38 -0000 1.4 @@ -4410,8 +4410,16 @@ # Directory that this library needs to be installed in: libdir='$install_libdir'" if test "$installed" = no && test $need_relink = yes; then + # os/2 relinking hack. + case $host in + *os2*) + # do nothing, no relinking. + ;; + *) $echo >> $output "\ relink_command=\"$relink_command\"" + ;; + esac fi done fi Index: src/gcc/boehm-gc/Makefile.am =================================================================== RCS file: /gccos2/src/gcc/boehm-gc/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -w -u -r1.1.1.1 -r1.2 --- src/gcc/boehm-gc/Makefile.am 16 Apr 2003 10:10:10 -0000 1.1.1.1 +++ src/gcc/boehm-gc/Makefile.am 29 Apr 2003 20:10:36 -0000 1.2 @@ -135,7 +135,11 @@ maintainer-clean-am: maintainer-clean-multi all-multi: +ifeq "$(BUILD_PLATFORM)" "OS2" + $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do +else : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do +endif install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: Index: src/gcc/boehm-gc/Makefile.in =================================================================== RCS file: /gccos2/src/gcc/boehm-gc/Makefile.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -w -u -r1.1.1.1 -r1.2 --- src/gcc/boehm-gc/Makefile.in 16 Apr 2003 10:10:10 -0000 1.1.1.1 +++ src/gcc/boehm-gc/Makefile.in 29 Apr 2003 20:10:37 -0000 1.2 @@ -615,7 +615,11 @@ maintainer-clean-am: maintainer-clean-multi all-multi: +ifeq "$(BUILD_PLATFORM)" "OS2" + $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do +else : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do +endif install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: Index: src/gcc/boehm-gc/configure =================================================================== RCS file: /gccos2/src/gcc/boehm-gc/configure,v retrieving revision 1.1.1.3 retrieving revision 1.6 diff -w -u -r1.1.1.3 -r1.6 --- src/gcc/boehm-gc/configure 7 Sep 2004 01:17:40 -0000 1.1.1.3 +++ src/gcc/boehm-gc/configure 8 Sep 2004 00:03:17 -0000 1.6 @@ -553,6 +553,157 @@ ac_n= ac_c='\c' ac_t= fi +echo $ac_n "checking for path separator""... $ac_c" 1>&6 +echo "configure:558: checking for path separator" >&5 +# Filter path to get backslahes into forwardslashes +case "`uname -s 2> /dev/null`" in +OS/2) + PATH=`echo -E "$PATH" | sed 's+\\\\+/+g'` + PATH_IFS=';' + ;; +*) + PATH_IFS=':' + ;; +esac +echo "$ac_t""${PATH_IFS}" 1>&6 + +echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 +echo "configure:572: checking for Cygwin environment" >&5 +if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cygwin=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cygwin=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_cygwin" 1>&6 +CYGWIN= +test "$ac_cv_cygwin" = yes && CYGWIN=yes +echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 +echo "configure:605: checking for mingw32 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_mingw32=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_mingw32=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_mingw32" 1>&6 +MINGW32= +test "$ac_cv_mingw32" = yes && MINGW32=yes +echo $ac_n "checking for EMX/OS2 environment""... $ac_c" 1>&6 +echo "configure:634: checking for EMX/OS2 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_emxos2'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + : ${CC=gcc.exe} +cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_emxos2=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_emxos2=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_emxos2" 1>&6 +if eval "test \"`echo '$''{'ac_cv_libpre'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$ac_cv_emxos2" = yes ; then + ac_cv_libpre= +else + ac_cv_libpre=lib +fi + +fi + +EMXOS2= +test "$ac_cv_emxos2" = yes && EMXOS2=yes + + + +echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 +echo "configure:678: checking for executable suffix" >&5 +if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then + ac_cv_exeext=.exe +else + rm -f conftest* + echo 'int main () { return 0; }' > conftest.$ac_ext + ac_cv_exeext= + if { (eval echo configure:688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + for file in conftest.*; do + case $file in + *.c | *.o | *.obj) ;; + *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; + esac + done + else + { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } + fi + rm -f conftest* + test x"${ac_cv_exeext}" = x && ac_cv_exeext=no +fi +fi + +EXEEXT="" +test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} +echo "$ac_t""${ac_cv_exeext}" 1>&6 +ac_exeext=$EXEEXT + # This works around the fact that libtool configuration may change LD @@ -593,28 +744,30 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:597: checking for a BSD compatible install" >&5 +echo "configure:748: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="$PATH_IFS" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + # We reject the install program from OS/2 or W3.1 + */OS2|*/OS2/*|*/WINDOWS|*/WINDOWS/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. # Don't use installbsd from OSF since it installs stuff as root # by default. for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then + if test -f $ac_dir/$ac_prog$ac_exeext; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : else - ac_cv_path_install="$ac_dir/$ac_prog -c" + ac_cv_path_install="$ac_dir/$ac_prog$ac_exeext -c" break 2 fi fi @@ -646,7 +799,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:650: checking whether build environment is sane" >&5 +echo "configure:803: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -703,7 +856,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:707: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:860: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -735,68 +888,6 @@ ac_tool_prefix= fi -echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:740: checking for Cygwin environment" >&5 -if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cygwin=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_cygwin=no -fi -rm -f conftest* -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_cygwin" 1>&6 -CYGWIN= -test "$ac_cv_cygwin" = yes && CYGWIN=yes -echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:773: checking for mingw32 environment" >&5 -if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_mingw32=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_mingw32=no -fi -rm -f conftest* -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_mingw32" 1>&6 -MINGW32= -test "$ac_cv_mingw32" = yes && MINGW32=yes # Check whether --enable-multilib or --disable-multilib was given. if test "${enable_multilib+set}" = set; then @@ -892,7 +983,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:896: checking host system type" >&5 +echo "configure:987: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -913,7 +1004,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:917: checking target system type" >&5 +echo "configure:1008: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -931,7 +1022,7 @@ echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:935: checking build system type" >&5 +echo "configure:1026: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -971,7 +1062,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:975: checking for working aclocal" >&5 +echo "configure:1066: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -984,7 +1075,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:988: checking for working autoconf" >&5 +echo "configure:1079: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -997,7 +1088,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:1001: checking for working automake" >&5 +echo "configure:1092: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1010,7 +1101,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1014: checking for working autoheader" >&5 +echo "configure:1105: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1023,7 +1114,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1027: checking for working makeinfo" >&5 +echo "configure:1118: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1049,18 +1140,19 @@ # 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:1053: checking for $ac_word" >&5 +echo "configure:1144: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_CC="gcc" break fi @@ -1079,20 +1171,22 @@ # 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:1083: checking for $ac_word" >&5 +echo "configure:1175: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_prog_rejected=no ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc" -o \ + "$ac_dir/$ac_word$ac_exeext" = "/usr/ucb/cc" ; then ac_prog_rejected=yes continue fi @@ -1128,7 +1222,7 @@ fi echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1132: checking whether we are using GNU C" >&5 +echo "configure:1226: 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 @@ -1137,7 +1231,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1141: \"$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:1235: \"$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 @@ -1152,7 +1246,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1156: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1250: 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 @@ -1189,18 +1283,19 @@ # 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:1193: checking for $ac_word" >&5 +echo "configure:1287: 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 if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_CXX="$ac_prog" break fi @@ -1222,7 +1317,7 @@ test -z "$CXX" && { echo "configure: error: no acceptable c++ found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1226: checking whether we are using GNU C++" >&5 +echo "configure:1321: 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 @@ -1231,7 +1326,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1235: \"$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:1330: \"$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 @@ -1246,7 +1341,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1250: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1345: 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 @@ -1279,7 +1374,7 @@ # NEWLIB_CONFIGURE, which doesn't work because that means that it will # be run before AC_CANONICAL_HOST. echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1283: checking build system type" >&5 +echo "configure:1378: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1300,18 +1395,19 @@ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1304: checking for $ac_word" >&5 +echo "configure:1399: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AS"; then ac_cv_prog_AS="$AS" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_AS="${ac_tool_prefix}as" break fi @@ -1332,18 +1428,19 @@ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1336: checking for $ac_word" >&5 +echo "configure:1432: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_AR="${ac_tool_prefix}ar" break fi @@ -1364,18 +1461,19 @@ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1368: checking for $ac_word" >&5 +echo "configure:1465: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" break fi @@ -1396,18 +1494,19 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1400: checking for $ac_word" >&5 +echo "configure:1498: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="ranlib" break fi @@ -1441,28 +1540,30 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1445: checking for a BSD compatible install" >&5 +echo "configure:1544: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="$PATH_IFS" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + # We reject the install program from OS/2 or W3.1 + */OS2|*/OS2/*|*/WINDOWS|*/WINDOWS/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. # Don't use installbsd from OSF since it installs stuff as root # by default. for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then + if test -f $ac_dir/$ac_prog$ac_exeext; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : else - ac_cv_path_install="$ac_dir/$ac_prog -c" + ac_cv_path_install="$ac_dir/$ac_prog$ac_exeext -c" break 2 fi fi @@ -1495,7 +1596,7 @@ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1499: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1600: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1532,18 +1633,19 @@ : + echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1537: checking for executable suffix" >&5 +echo "configure:1639: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test "$CYGWIN" = yes || test "$MINGW32" = yes; then + if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then ac_cv_exeext=.exe else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1665,7 +1767,7 @@ if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1669: checking for ld used by GCC" >&5 +echo "configure:1771: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1695,10 +1797,10 @@ esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1699: checking for GNU ld" >&5 +echo "configure:1801: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1702: checking for non-GNU ld" >&5 +echo "configure:1804: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1733,7 +1835,7 @@ fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1737: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1839: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1750,7 +1852,7 @@ echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1754: checking for $LD option to reload object files" >&5 +echo "configure:1856: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1762,7 +1864,7 @@ test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1766: checking for BSD-compatible nm" >&5 +echo "configure:1868: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1800,7 +1902,7 @@ echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1804: checking whether ln -s works" >&5 +echo "configure:1906: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1810,8 +1912,14 @@ rm -f conftestdata ac_cv_prog_LN_S="ln -s" else + echo A > conftestdata; + if ln conftestdata conftestdata2 2>/dev/null; then ac_cv_prog_LN_S=ln + else + ac_cv_prog_LN_S=cp + fi fi +rm -f conftestdata* fi LN_S="$ac_cv_prog_LN_S" if test "$ac_cv_prog_LN_S" = "ln -s"; then @@ -1821,7 +1929,7 @@ fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:1825: checking how to recognise dependant libraries" >&5 +echo "configure:1933: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1954,6 +2062,10 @@ lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; + osf3* | osf4* | osf5*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' @@ -1994,13 +2106,13 @@ deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1998: checking for object suffix" >&5 +echo "configure:2110: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2004: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2024,7 +2136,7 @@ file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2028: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2140: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2086,7 +2198,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2090: checking for file" >&5 +echo "configure:2202: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2157,18 +2269,19 @@ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2161: checking for $ac_word" >&5 +echo "configure:2273: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" break fi @@ -2189,18 +2302,19 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2193: checking for $ac_word" >&5 +echo "configure:2306: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="ranlib" break fi @@ -2224,18 +2338,19 @@ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2228: checking for $ac_word" >&5 +echo "configure:2342: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" break fi @@ -2256,18 +2371,19 @@ # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2260: checking for $ac_word" >&5 +echo "configure:2375: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_STRIP="strip" break fi @@ -2323,8 +2439,8 @@ case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2327 "configure"' > conftest.$ac_ext - if { (eval echo configure:2328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2443 "configure"' > conftest.$ac_ext + if { (eval echo configure:2444: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) @@ -2357,7 +2473,7 @@ ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2373,7 +2489,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) case $host in @@ -2417,7 +2533,7 @@ SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2421: checking whether the C compiler needs -belf" >&5 +echo "configure:2537: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2430,14 +2546,14 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2467,7 +2583,7 @@ esac echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:2471: checking how to run the C++ preprocessor" >&5 +echo "configure:2587: 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 @@ -2480,12 +2596,13 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < +#line 2601 "configure" #include "confdefs.h" #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2489: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2606: \"$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 : @@ -2632,7 +2749,7 @@ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:2636: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:2753: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -2664,18 +2781,19 @@ : + echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:2669: checking for executable suffix" >&5 +echo "configure:2787: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test "$CYGWIN" = yes || test "$MINGW32" = yes; then + if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then ac_cv_exeext=.exe else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:2679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:2797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -2698,7 +2816,7 @@ fi echo $ac_n "checking for thread model used by GCC""... $ac_c" 1>&6 -echo "configure:2702: checking for thread model used by GCC" >&5 +echo "configure:2820: checking for thread model used by GCC" >&5 THREADS=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'` if test -z "$THREADS"; then THREADS=no @@ -2835,7 +2953,7 @@ echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:2839: checking for dlopen in -ldl" >&5 +echo "configure:2957: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2843,7 +2961,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2976: \"$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 @@ -3180,7 +3298,7 @@ s%\]%\\&%g s%\$%$$%g EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` +DEFS=`sed -f conftest.defs confdefs.h | tr '\012\015' ' '` rm -f conftest.defs @@ -3194,6 +3312,9 @@ # Generated automatically by configure. # Run this file to recreate the current configuration. # This directory was configured as follows, +EOF +echo ': ${CONFIG_SHELL='"${CONFIG_SHELL-/bin/sh}"'}' >> $CONFIG_STATUS +cat >> $CONFIG_STATUS </dev/null | sed 1q`: # # $0 $ac_configure_args @@ -3219,6 +3340,7 @@ ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" +PATHIFS="$PATH_IFS" trap 'rm -fr `echo "Makefile include/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF @@ -3229,6 +3351,7 @@ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub +s,\([^a-zA-Z0-9:]\)/bin/sh\(.exe\),\1${CONFIG_SHELL-/bin/sh}\2,g s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g @@ -3252,6 +3375,8 @@ s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g +s%@PATH_IFS@%$PATH_IFS%g +s%@EXEEXT@%$EXEEXT%g s%@gc_basedir@%$gc_basedir%g s%@host@%$host%g s%@host_alias@%$host_alias%g @@ -3288,7 +3413,6 @@ s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g s%@MAINT@%$MAINT%g -s%@EXEEXT@%$EXEEXT%g s%@GC_CFLAGS@%$GC_CFLAGS%g s%@LN_S@%$LN_S%g s%@OBJEXT@%$OBJEXT%g @@ -3374,14 +3498,15 @@ .) srcdir=. if test -z "$ac_dots"; then top_srcdir=. else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + [/\\]* | [a-zA-Z]:*) + srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; *) # Relative path. srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" top_srcdir="$ac_dots$ac_given_srcdir" ;; esac case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; + [/$\\]* | [A-Za-z]:*) INSTALL="$ac_given_INSTALL" ;; *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac @@ -3394,7 +3519,7 @@ *) ac_comsub= ;; esac - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%$PATHIFS% $ac_given_srcdir/%g"` sed -e "$ac_comsub s%@configure_input@%$configure_input%g s%@srcdir@%$srcdir%g Index: src/gcc/config/mh-emx =================================================================== RCS file: src/gcc/config/mh-emx diff -N src/gcc/config/mh-emx --- nul 1 Jan 1970 00:00:00 -0000 +++ src/gcc/config/mh-emx 8 May 2003 00:50:36 -0000 1.3 @@ -0,0 +1,21 @@ +# We don't want debugging info +# Accomplish this by overriding CFLAGS. +CFLAGS = -s -O2 +CXXFLAGS = -s -O2 +LDFLAGS = -s -Zcrtdll -Zexe + +# Override SHELL variable IF it's COMSPEC (OS/2 shell) +ifeq "$(SHELL)" "$(COMSPEC)" +ifdef UNIXROOT +SHELL=$(UNIXROOT)/bin/sh.exe +else +SHELL=sh +endif +endif + +# Skip installation +# bird: true isn't a good value. It will by default point to dummy rule, so leave it. +# INSTALL_DOSREL=true + +# No need for RANLIB +RANLIB=true Index: src/gcc/fastjar/configure =================================================================== RCS file: /gccos2/src/gcc/fastjar/configure,v retrieving revision 1.1.1.3 retrieving revision 1.5 diff -w -u -r1.1.1.3 -r1.5 --- src/gcc/fastjar/configure 3 Nov 2004 05:38:28 -0000 1.1.1.3 +++ src/gcc/fastjar/configure 28 Apr 2004 04:57:39 -0000 1.5 @@ -33,7 +33,6 @@ program_transform_name=s,x,x, silent= site= -sitefile= srcdir= target=NONE verbose= @@ -148,7 +147,6 @@ --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages - --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -319,11 +317,6 @@ -site=* | --site=* | --sit=*) site="$ac_optarg" ;; - -site-file | --site-file | --site-fil | --site-fi | --site-f) - ac_prev=sitefile ;; - -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) - sitefile="$ac_optarg" ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -489,7 +482,6 @@ srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -if test -z "$sitefile"; then if test -z "$CONFIG_SITE"; then if test "x$prefix" != xNONE; then CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" @@ -497,9 +489,6 @@ CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi fi -else - CONFIG_SITE="$sitefile" -fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then echo "loading site script $ac_site_file" @@ -536,6 +525,157 @@ ac_n= ac_c='\c' ac_t= fi +echo $ac_n "checking for path separator""... $ac_c" 1>&6 +echo "configure:530: checking for path separator" >&5 +# Filter path to get backslahes into forwardslashes +case "`uname -s 2> /dev/null`" in +OS/2) + PATH=`echo -E "$PATH" | sed 's+\\\\+/+g'` + PATH_IFS=';' + ;; +*) + PATH_IFS=':' + ;; +esac +echo "$ac_t""${PATH_IFS}" 1>&6 + +echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 +echo "configure:544: checking for Cygwin environment" >&5 +if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cygwin=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cygwin=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_cygwin" 1>&6 +CYGWIN= +test "$ac_cv_cygwin" = yes && CYGWIN=yes +echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 +echo "configure:577: checking for mingw32 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_mingw32=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_mingw32=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_mingw32" 1>&6 +MINGW32= +test "$ac_cv_mingw32" = yes && MINGW32=yes +echo $ac_n "checking for EMX/OS2 environment""... $ac_c" 1>&6 +echo "configure:606: checking for EMX/OS2 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_emxos2'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + : ${CC=gcc.exe} +cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_emxos2=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_emxos2=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_emxos2" 1>&6 +if eval "test \"`echo '$''{'ac_cv_libpre'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$ac_cv_emxos2" = yes ; then + ac_cv_libpre= +else + ac_cv_libpre=lib +fi + +fi + +EMXOS2= +test "$ac_cv_emxos2" = yes && EMXOS2=yes + + + +echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 +echo "configure:650: checking for executable suffix" >&5 +if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then + ac_cv_exeext=.exe +else + rm -f conftest* + echo 'int main () { return 0; }' > conftest.$ac_ext + ac_cv_exeext= + if { (eval echo configure:660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + for file in conftest.*; do + case $file in + *.c | *.o | *.obj) ;; + *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; + esac + done + else + { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } + fi + rm -f conftest* + test x"${ac_cv_exeext}" = x && ac_cv_exeext=no +fi +fi + +EXEEXT="" +test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} +echo "$ac_t""${ac_cv_exeext}" 1>&6 +ac_exeext=$EXEEXT + ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do @@ -568,28 +708,30 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:572: checking for a BSD compatible install" >&5 +echo "configure:712: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="$PATH_IFS" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + # We reject the install program from OS/2 or W3.1 + */OS2|*/OS2/*|*/WINDOWS|*/WINDOWS/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. # Don't use installbsd from OSF since it installs stuff as root # by default. for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then + if test -f $ac_dir/$ac_prog$ac_exeext; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : else - ac_cv_path_install="$ac_dir/$ac_prog -c" + ac_cv_path_install="$ac_dir/$ac_prog$ac_exeext -c" break 2 fi fi @@ -621,7 +763,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:625: checking whether build environment is sane" >&5 +echo "configure:767: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -678,7 +820,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:682: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:824: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -724,7 +866,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:728: checking for working aclocal" >&5 +echo "configure:870: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -737,7 +879,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:741: checking for working autoconf" >&5 +echo "configure:883: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -750,7 +892,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:754: checking for working automake" >&5 +echo "configure:896: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -763,7 +905,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:767: checking for working autoheader" >&5 +echo "configure:909: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -776,7 +918,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:780: checking for working makeinfo" >&5 +echo "configure:922: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -796,18 +938,19 @@ # 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:800: checking for $ac_word" >&5 +echo "configure:942: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_CC="gcc" break fi @@ -826,20 +969,22 @@ # 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:830: checking for $ac_word" >&5 +echo "configure:973: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_prog_rejected=no ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc" -o \ + "$ac_dir/$ac_word$ac_exeext" = "/usr/ucb/cc" ; then ac_prog_rejected=yes continue fi @@ -877,18 +1022,19 @@ # 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:881: checking for $ac_word" >&5 +echo "configure:1026: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_CC="cl" break fi @@ -909,7 +1055,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:913: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1059: 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. @@ -920,12 +1066,12 @@ cat > conftest.$ac_ext << EOF -#line 924 "configure" +#line 1070 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1075: \"$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 @@ -951,12 +1097,12 @@ { 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:955: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1101: 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:960: checking whether we are using GNU C" >&5 +echo "configure:1106: 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 @@ -965,7 +1111,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:969: \"$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:1115: \"$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 @@ -984,7 +1130,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:988: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1134: 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 @@ -1027,28 +1173,30 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1031: checking for a BSD compatible install" >&5 +echo "configure:1177: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="$PATH_IFS" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + # We reject the install program from OS/2 or W3.1 + */OS2|*/OS2/*|*/WINDOWS|*/WINDOWS/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. # Don't use installbsd from OSF since it installs stuff as root # by default. for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then + if test -f $ac_dir/$ac_prog$ac_exeext; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : else - ac_cv_path_install="$ac_dir/$ac_prog -c" + ac_cv_path_install="$ac_dir/$ac_prog$ac_exeext -c" break 2 fi fi @@ -1082,26 +1230,30 @@ # Extract the first word of "rm", so it can be a program name with args. set dummy rm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1086: checking for $ac_word" >&5 +echo "configure:1234: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else case "$RM" in - /*) + [/\\]* | [a-zA-Z]:*) ac_cv_path_RM="$RM" # Let the user override the test with a path. ;; ?:/*) ac_cv_path_RM="$RM" # Let the user override the test with a dos path. ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH:/bin:/usr/bin:/usr/local/bin" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" + ac_dummy="`echo -E "$PATH:/bin:/usr/bin:/usr/local/bin" | sed 's+\\\\+/+g'`" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_RM="$ac_dir/$ac_word" break fi + if test -f $ac_dir/$ac_word$ac_exeext; then + ac_cv_path_RM="$ac_dir/$ac_word$ac_exeext" + break + fi done IFS="$ac_save_ifs" test -z "$ac_cv_path_RM" && ac_cv_path_RM="/bin/rm" @@ -1118,26 +1270,30 @@ # Extract the first word of "cp", so it can be a program name with args. set dummy cp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1122: checking for $ac_word" >&5 +echo "configure:1274: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else case "$CP" in - /*) + [/\\]* | [a-zA-Z]:*) ac_cv_path_CP="$CP" # Let the user override the test with a path. ;; ?:/*) ac_cv_path_CP="$CP" # Let the user override the test with a dos path. ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH:/bin:/usr/bin:/usr/local/bin" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" + ac_dummy="`echo -E "$PATH:/bin:/usr/bin:/usr/local/bin" | sed 's+\\\\+/+g'`" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_CP="$ac_dir/$ac_word" break fi + if test -f $ac_dir/$ac_word$ac_exeext; then + ac_cv_path_CP="$ac_dir/$ac_word$ac_exeext" + break + fi done IFS="$ac_save_ifs" test -z "$ac_cv_path_CP" && ac_cv_path_CP="/bin/cp" @@ -1154,26 +1310,30 @@ # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1158: checking for $ac_word" >&5 +echo "configure:1314: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else case "$STRIP" in - /*) + [/\\]* | [a-zA-Z]:*) ac_cv_path_STRIP="$STRIP" # Let the user override the test with a path. ;; ?:/*) ac_cv_path_STRIP="$STRIP" # Let the user override the test with a dos path. ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH:/bin:/usr/bin:/usr/local/bin" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" + ac_dummy="`echo -E "$PATH:/bin:/usr/bin:/usr/local/bin" | sed 's+\\\\+/+g'`" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_STRIP="$ac_dir/$ac_word" break fi + if test -f $ac_dir/$ac_word$ac_exeext; then + ac_cv_path_STRIP="$ac_dir/$ac_word$ac_exeext" + break + fi done IFS="$ac_save_ifs" test -z "$ac_cv_path_STRIP" && ac_cv_path_STRIP="/usr/bin/strip" @@ -1190,26 +1350,30 @@ # Extract the first word of "chmod", so it can be a program name with args. set dummy chmod; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1194: checking for $ac_word" >&5 +echo "configure:1354: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CHMOD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else case "$CHMOD" in - /*) + [/\\]* | [a-zA-Z]:*) ac_cv_path_CHMOD="$CHMOD" # Let the user override the test with a path. ;; ?:/*) ac_cv_path_CHMOD="$CHMOD" # Let the user override the test with a dos path. ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH:/bin:/usr/bin:/usr/local/bin" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" + ac_dummy="`echo -E "$PATH:/bin:/usr/bin:/usr/local/bin" | sed 's+\\\\+/+g'`" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_CHMOD="$ac_dir/$ac_word" break fi + if test -f $ac_dir/$ac_word$ac_exeext; then + ac_cv_path_CHMOD="$ac_dir/$ac_word$ac_exeext" + break + fi done IFS="$ac_save_ifs" test -z "$ac_cv_path_CHMOD" && ac_cv_path_CHMOD="/bin/chmod" @@ -1223,85 +1387,24 @@ echo "$ac_t""no" 1>&6 fi -echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1228: checking for Cygwin environment" >&5 -if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cygwin=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_cygwin=no -fi -rm -f conftest* -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_cygwin" 1>&6 -CYGWIN= -test "$ac_cv_cygwin" = yes && CYGWIN=yes -echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1261: checking for mingw32 environment" >&5 -if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_mingw32=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_mingw32=no -fi -rm -f conftest* -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_mingw32" 1>&6 -MINGW32= -test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1292: checking for executable suffix" >&5 +echo "configure:1395: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test "$CYGWIN" = yes || test "$MINGW32" = yes; then + if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then ac_cv_exeext=.exe else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in - *.c | *.o | *.obj | *.ilk | *.pdb) ;; + *.c | *.o | *.obj) ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; esac done @@ -1320,7 +1423,7 @@ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1353,12 +1456,12 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:1357: checking for $ac_hdr that defines DIR" >&5 +echo "configure:1460: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -1366,7 +1469,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:1370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1473: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -1391,7 +1494,7 @@ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:1395: checking for opendir in -ldir" >&5 +echo "configure:1498: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1399,7 +1502,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1517: \"$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 @@ -1432,7 +1535,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:1436: checking for opendir in -lx" >&5 +echo "configure:1539: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1440,7 +1543,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1558: \"$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 @@ -1474,7 +1577,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1478: checking how to run the C preprocessor" >&5 +echo "configure:1581: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1489,13 +1592,14 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < +#line 1597 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1603: \"$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 : @@ -1506,13 +1610,14 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < +#line 1615 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1621: \"$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 : @@ -1523,13 +1628,14 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < +#line 1633 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1533: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1639: \"$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 : @@ -1554,12 +1660,13 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1558: checking for ANSI C header files" >&5 +echo "configure:1664: 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 < +#line 1670 "configure" #include "confdefs.h" #include #include @@ -1567,7 +1674,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1678: \"$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* @@ -1584,7 +1691,7 @@ 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 @@ -1602,7 +1709,7 @@ 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 @@ -1623,7 +1730,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1634,7 +1741,7 @@ exit (0); } EOF -if { (eval echo configure:1638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1658,12 +1765,12 @@ fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:1662: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:1769: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1671,7 +1778,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:1675: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -1695,17 +1802,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1699: checking for $ac_hdr" >&5 +echo "configure:1806: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 1812 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1709: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1817: \"$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* @@ -1733,12 +1841,12 @@ echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:1737: checking for off_t" >&5 +echo "configure:1845: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1766,12 +1874,12 @@ fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:1770: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:1878: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1779,7 +1887,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:1783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1891: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -1802,12 +1910,12 @@ # mkdir takes a single argument on some systems. echo $ac_n "checking if mkdir takes one argument""... $ac_c" 1>&6 -echo "configure:1806: checking if mkdir takes one argument" >&5 +echo "configure:1914: checking if mkdir takes one argument" >&5 if eval "test \"`echo '$''{'gcc_cv_mkdir_takes_one_arg'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -1824,7 +1932,7 @@ mkdir ("foo", 0); ; return 0; } EOF -if { (eval echo configure:1828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1936: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_mkdir_takes_one_arg=no else @@ -1846,13 +1954,13 @@ echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:1850: checking size of char" >&5 +echo "configure:1958: checking size of char" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -1862,7 +1970,7 @@ switch (0) case 0: case (sizeof (char) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:1866: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_char=$ac_size else @@ -1876,7 +1984,7 @@ fi if test x$ac_cv_sizeof_char = x ; then - ac_cv_sizeof_char=0 + { echo "configure: error: cannot determine a size for char" 1>&2; exit 1; } fi echo "$ac_t""$ac_cv_sizeof_char" 1>&6 cat >> confdefs.h <&6 -echo "configure:1889: checking size of short" >&5 +echo "configure:1997: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -1901,7 +2009,7 @@ switch (0) case 0: case (sizeof (short) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:1905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_short=$ac_size else @@ -1915,7 +2023,7 @@ fi if test x$ac_cv_sizeof_short = x ; then - ac_cv_sizeof_short=0 + { echo "configure: error: cannot determine a size for short" 1>&2; exit 1; } fi echo "$ac_t""$ac_cv_sizeof_short" 1>&6 cat >> confdefs.h <&6 -echo "configure:1928: checking size of int" >&5 +echo "configure:2036: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -1940,7 +2048,7 @@ switch (0) case 0: case (sizeof (int) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:1944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2052: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_int=$ac_size else @@ -1954,7 +2062,7 @@ fi if test x$ac_cv_sizeof_int = x ; then - ac_cv_sizeof_int=0 + { echo "configure: error: cannot determine a size for int" 1>&2; exit 1; } fi echo "$ac_t""$ac_cv_sizeof_int" 1>&6 cat >> confdefs.h <&6 -echo "configure:1967: checking size of long" >&5 +echo "configure:2075: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -1979,7 +2087,7 @@ switch (0) case 0: case (sizeof (long) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:1983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2091: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_long=$ac_size else @@ -1993,7 +2101,7 @@ fi if test x$ac_cv_sizeof_long = x ; then - ac_cv_sizeof_long=0 + { echo "configure: error: cannot determine a size for long" 1>&2; exit 1; } fi echo "$ac_t""$ac_cv_sizeof_long" 1>&6 cat >> confdefs.h <&6 -echo "configure:2006: checking size of long long" >&5 +echo "configure:2114: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -2018,7 +2126,7 @@ switch (0) case 0: case (sizeof (long long) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:2022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_long_long=$ac_size else @@ -2032,7 +2140,7 @@ fi if test x$ac_cv_sizeof_long_long = x ; then - ac_cv_sizeof_long_long=0 + { echo "configure: error: cannot determine a size for long long" 1>&2; exit 1; } fi echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6 cat >> confdefs.h <&6 -echo "configure:2046: checking byte ordering" >&5 +echo "configure:2154: checking byte ordering" >&5 if eval "test \"`echo '$''{'ac_cv_c_compile_endian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2056,7 +2164,7 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then od -c conftest.o | sed 's/^[0-7]*[ ]*/ / s/\*/./g @@ -2128,7 +2236,7 @@ use_zlib=maybe if test "$with_system_zlib" = yes; then echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 -echo "configure:2132: checking for deflate in -lz" >&5 +echo "configure:2240: checking for deflate in -lz" >&5 ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2136,7 +2244,7 @@ ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2259: \"$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 @@ -2267,6 +2375,9 @@ # Generated automatically by configure. # Run this file to recreate the current configuration. # This directory was configured as follows, +EOF +echo ': ${CONFIG_SHELL='"${CONFIG_SHELL-/bin/sh}"'}' >> $CONFIG_STATUS +cat >> $CONFIG_STATUS </dev/null | sed 1q`: # # $0 $ac_configure_args @@ -2292,6 +2403,7 @@ ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" +PATHIFS="$PATH_IFS" trap 'rm -fr `echo "Makefile install-defs.sh config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF @@ -2302,6 +2414,7 @@ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub +s,\([^a-zA-Z0-9:]\)/bin/sh\(.exe\),\1${CONFIG_SHELL-/bin/sh}\2,g s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g @@ -2325,6 +2438,8 @@ s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g +s%@PATH_IFS@%$PATH_IFS%g +s%@EXEEXT@%$EXEEXT%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g @@ -2341,7 +2456,6 @@ s%@CP@%$CP%g s%@STRIP@%$STRIP%g s%@CHMOD@%$CHMOD%g -s%@EXEEXT@%$EXEEXT%g s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g s%@MAINT@%$MAINT%g @@ -2359,7 +2473,7 @@ # Split the substitutions into bite-sized pieces for seds with # small command number limits, like on Digital OSF/1 and HP-UX. -ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script. +ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. ac_file=1 # Number of current file. ac_beg=1 # First line for current file. ac_end=$ac_max_sed_cmds # Line after last line for current file. @@ -2421,14 +2535,15 @@ .) srcdir=. if test -z "$ac_dots"; then top_srcdir=. else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + [/\\]* | [a-zA-Z]:*) + srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; *) # Relative path. srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" top_srcdir="$ac_dots$ac_given_srcdir" ;; esac case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; + [/$\\]* | [A-Za-z]:*) INSTALL="$ac_given_INSTALL" ;; *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac @@ -2441,7 +2556,7 @@ *) ac_comsub= ;; esac - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%$PATHIFS% $ac_given_srcdir/%g"` sed -e "$ac_comsub s%@configure_input@%$configure_input%g s%@srcdir@%$srcdir%g @@ -2488,7 +2603,9 @@ echo creating $ac_file rm -f conftest.frag conftest.in conftest.out - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` +# kso the other way around might work better with drive letters and such. +# ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + ac_file_inputs=`echo $ac_file_in|sed -e "s%:% $ac_given_srcdir/%g" -e "s%^%$ac_given_srcdir/%" ` cat $ac_file_inputs > conftest.in EOF Index: src/gcc/fastjar/jargrep.c =================================================================== RCS file: /gccos2/src/gcc/fastjar/jargrep.c,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -w -u -r1.1.1.2 -r1.3 Index: src/gcc/gcc/Makefile.in =================================================================== RCS file: /gccos2/src/gcc/gcc/Makefile.in,v retrieving revision 1.1.1.3 retrieving revision 1.10 diff -w -u -r1.1.1.3 -r1.10 --- src/gcc/gcc/Makefile.in 7 Sep 2004 01:30:02 -0000 1.1.1.3 +++ src/gcc/gcc/Makefile.in 8 Sep 2004 00:03:17 -0000 1.10 @@ -128,6 +128,9 @@ DLLTOOL = dlltool RANLIB = @RANLIB@ SHELL = @SHELL@ +# "mkdir cp; cp something cp" doesn't work ash on OS/2. +CP = cp@host_exeext@ + # pwd command to use. Allow user to override default by setting PWDCMD in # the environment to account for automounters. The make variable must not # be called PWDCMD, otherwise the value set here is passed to make @@ -616,7 +619,7 @@ # If you change this line, you probably also need to change the definition # of HOST_CFLAGS in build-make to match. ALL_CFLAGS = $(X_CFLAGS) $(T_CFLAGS) \ - $(CFLAGS) $(INTERNAL_CFLAGS) $(COVERAGE_FLAGS) $(WARN_CFLAGS) $(XCFLAGS) @DEFS@ + $(CFLAGS) $(INTERNAL_CFLAGS) $(COVERAGE_FLAGS) $(WARN_CFLAGS) $(XCFLAGS) $(CLH_CFLAGS) @DEFS@ # Likewise. ALL_CPPFLAGS = $(CPPFLAGS) $(X_CPPFLAGS) $(T_CPPFLAGS) @@ -656,6 +659,16 @@ HOST_ERRORS = $(BUILD_PREFIX)errors.o HOST_VARRAY = $(BUILD_PREFIX)varray.o +# GCC-OS2: help +# This gets linked into gcc if command-line help was enabled +CLH_LIBS = @gcc_clh_libs@ +# These definitions enables --help for gcc +CLH_CFLAGS = @gcc_clh_cflags@ +CLH_GCC = @gcc_clh_gcc@ +CLH_CPP = @gcc_clh_cpp@ +CLH_G77 = @gcc_clh_g77@ +CLH_GCJ = @gcc_clh_gcj@ + # Specify the directories to be searched for header files. # Both . and srcdir are used, in that order, # so that *config.h will be found in the compilation @@ -722,12 +735,24 @@ "localedir=$(localedir)" FLAGS_TO_PASS = $(ORDINARY_FLAGS_TO_PASS) "CC=@cc_set_by_configure@" \ "STAGE_PREFIX=@stage_prefix_set_by_configure@" + +# OS/2 have some trouble here. +ifeq "$(BUILD_PLATFORM)" "OS2" +PREPEND_DOTDOT_TO_RELATIVE_PATHS = sed \ + -e 's|^ *[\\]||' \ + -e 's|^ *[^ /][^ /]*/|%&|' \ + -e 's| -B| -B%|g' \ + -e 's|% *[^- /]|%&|g' \ + -e 's|%% *|../|g' \ + -e 's|%||g' +else PREPEND_DOTDOT_TO_RELATIVE_PATHS = sed \ -e 's|^ *[^ /][^ /]*/|%&|' \ -e 's| -B| -B%|g' \ -e 's|% *[^- /]|%&|g' \ -e 's|%% *|../|g' \ -e 's|%||g' +endif SUBDIR_FLAGS_TO_PASS = $(ORDINARY_FLAGS_TO_PASS) \ "CC=`echo @quoted_cc_set_by_configure@ | $(PREPEND_DOTDOT_TO_RELATIVE_PATHS)`" \ "STAGE_PREFIX=`echo @quoted_stage_prefix_set_by_configure@ | $(PREPEND_DOTDOT_TO_RELATIVE_PATHS)`" @@ -864,7 +889,7 @@ $(xmake_file) $(tmake_file) $(LANG_MAKEFILES) $(SHELL) $(srcdir)/configure.frag $(srcdir) "$(SUBDIRS)" \ "$(xmake_file)" "$(tmake_file)" - cp config.status config.run + $(CP) config.status config.run LANGUAGES="$(CONFIG_LANGUAGES)" $(SHELL) config.run rm -f config.run @@ -984,17 +1009,17 @@ # to avoid confusion if the current directory is in the path # and CC is `gcc'. It is renamed to `gcc' when it is installed. xgcc$(exeext): gcc.o gccspec.o version.o intl.o prefix.o \ - version.o $(LIBDEPS) $(EXTRA_GCC_OBJS) + version.o $(LIBDEPS) $(EXTRA_GCC_OBJS) $(CLH_GCC) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ gcc.o gccspec.o intl.o \ - prefix.o version.o $(EXTRA_GCC_OBJS) $(LIBS) + prefix.o version.o $(EXTRA_GCC_OBJS) $(CLH_GCC) $(LIBS) # cpp is to cpp0 as gcc is to cc1. # The only difference from xgcc is that it's linked with cppspec.o # instead of gccspec.o. cpp$(exeext): gcc.o cppspec.o version.o intl.o prefix.o \ - version.o $(LIBDEPS) $(EXTRA_GCC_OBJS) + version.o $(LIBDEPS) $(EXTRA_GCC_OBJS) $(CLH_CPP) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ gcc.o cppspec.o intl.o \ - prefix.o version.o $(EXTRA_GCC_OBJS) $(LIBS) + prefix.o version.o $(EXTRA_GCC_OBJS) $(CLH_CPP) $(LIBS) # Dump a specs file to make -B./ read these specs over installed ones. specs: xgcc$(exeext) @@ -1005,7 +1030,7 @@ # compile libgcc2.a. # Also create gcc-cross, so that install-common will install properly. gcc-cross: xgcc$(exeext) - cp xgcc$(exeext) gcc-cross$(exeext) + $(CP) xgcc$(exeext) gcc-cross$(exeext) cc1$(exeext): $(C_OBJS) $(BACKEND) $(LIBDEPS) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o cc1$(exeext) \ @@ -1079,7 +1104,7 @@ INCLUDES="$(INCLUDES)" \ CONFIG_H="$(TCONFIG_H)" MACHMODE_H="$(MACHMODE_H)" \ LIB1ASMSRC='$(LIB1ASMSRC)' \ - MAKEOVERRIDES= \ + MAKEOVERRIDES= SHELL=$(SHELL) \ -f libgcc.mk all # Use the genmultilib shell script to generate the information the gcc @@ -1121,7 +1146,7 @@ INCLUDES="$(INCLUDES)" \ CONFIG_H="$(CONFIG_H)" MACHMODE_H="$(MACHMODE_H)" \ LIB1ASMSRC='$(LIB1ASMSRC)' \ - MAKEOVERRIDES= \ + MAKEOVERRIDES= SHELL=$(SHELL) \ -f libgcc.mk all $(STAMP) stmp-multilib @@ -1690,6 +1715,16 @@ mips-tdump.o : mips-tdump.c $(CONFIG_H) $(RTL_H) $(SYSTEM_H) +# GCC-OS2: help. +clh.o: clh.c $(CONFIG_H) + $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -c $(srcdir)/clh.c + +clh_gcc.c: $(srcdir)/doc/invoke.texi $(srcdir)/mkoptdesc.sh + $(srcdir)/mkoptdesc.sh $(srcdir)/doc/invoke.texi gcc > clh_gcc.c + +clh_cpp.c: $(srcdir)/doc/invoke.texi $(srcdir)/mkoptdesc.sh + $(srcdir)/mkoptdesc.sh $(srcdir)/doc/invoke.texi cpp > clh_cpp.c + # # Generate header and source files from the machine description, # and compile them. @@ -2282,7 +2317,7 @@ test-protoize-simple: ./protoize ./unprotoize $(GCC_PASSES) -rm -f tmp-proto.[cso] - cp $(srcdir)/protoize.c tmp-proto.c + $(CP) $(srcdir)/protoize.c tmp-proto.c chmod u+w tmp-proto.c ./protoize -N -B ./ -x getopt.h -c "-B./ -Wall -Wwrite-strings \ $(GCC_CFLAGS) $(INCLUDES) \ @@ -2334,16 +2369,16 @@ realfile=`echo $$file | sed -e 's|.*/\([^/]*\)$$|\1|'`; \ $(STAMP) include/$$realfile; \ rm -f include/$$realfile; \ - cp $$file include; \ + $(CP) $$file include; \ chmod a+r include/$$realfile; \ fi; \ done rm -f include/limits.h - cp xlimits.h include/limits.h + $(CP) xlimits.h include/limits.h chmod a+r include/limits.h # Install the README rm -f include/README - cp $(srcdir)/README-fixinc include/README + $(CP) $(srcdir)/README-fixinc include/README chmod a+r include/README $(STAMP) $@ @@ -2391,7 +2426,7 @@ if [ -f include/limits.h ]; then \ mv include/limits.h include/syslimits.h; \ else \ - cp $(srcdir)/gsyslimits.h include/syslimits.h; \ + $(CP) $(srcdir)/gsyslimits.h include/syslimits.h; \ fi; \ chmod a+r include/syslimits.h) $(STAMP) stmp-fixinc @@ -2943,7 +2978,7 @@ RANLIB_FOR_TARGET="$$r_f_t" \ DESTDIR="$(DESTDIR)" \ libsubdir="$(libsubdir)" \ - slibdir="$(slibdir)" \ + slibdir="$(slibdir)" SHELL=$(SHELL) \ -f libgcc.mk install # Install multiple versions of libgcc.a. @@ -2970,7 +3005,7 @@ RANLIB_FOR_TARGET="$$r_f_t" \ DESTDIR="$(DESTDIR)" \ libsubdir="$(libsubdir)" \ - slibdir="$(slibdir)" \ + slibdir="$(slibdir)" SHELL=$(SHELL) \ -f libgcc.mk install # Install all the header files built in the include subdirectory. @@ -3016,7 +3051,7 @@ # Install the include directory using cp. install-headers-cp: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir - cp -p -r include $(DESTDIR)$(libsubdir) + $(CP) -p -r include $(DESTDIR)$(libsubdir) itoolsdir = $(libsubdir)/install-tools # Don't install the headers. Instead, install appropriate scripts @@ -3548,7 +3583,7 @@ # Copy the object files from a particular stage into a subdirectory. stage1-start: -if [ -d stage1 ] ; then true ; else mkdir stage1 ; fi - $(MAKE) -f libgcc.mk libgcc-stage-start stage=stage1 + $(MAKE) SHELL=$(SHELL) -f libgcc.mk libgcc-stage-start stage=stage1 -for dir in intl $(SUBDIRS) ; \ do \ if [ -d stage1/$$dir ] ; then true ; else mkdir stage1/$$dir ; fi ; \ @@ -3561,24 +3596,24 @@ -if [ -f ld$(exeext) ] ; then (cd stage1 && $(LN_S) ../ld$(exeext) .) ; else true ; fi -if [ -f collect-ld$(exeext) ] ; then (cd stage1 && $(LN_S) ../collect-ld$(exeext) .) ; else true ; fi -rm -f stage1/libgcc.a stage1/libgcc_eh.a stage1/libgcc_s*$(SHLIB_EXT) - -cp libgcc.a stage1 + -$(CP) libgcc.a stage1 -if $(RANLIB_TEST_FOR_TARGET) ; then \ $(RANLIB_FOR_TARGET) stage1/libgcc.a; \ else true; fi - -if [ -f libgcc_eh.a ] ; then cp libgcc_eh.a stage1; \ + -if [ -f libgcc_eh.a ] ; then $(CP) libgcc_eh.a stage1; \ if $(RANLIB_TEST_FOR_TARGET) ; then \ $(RANLIB_FOR_TARGET) stage1/libgcc_eh.a; \ else true; fi; fi - -cp libgcc_s*$(SHLIB_EXT) stage1/ + -$(CP) libgcc_s*$(SHLIB_EXT) stage1/ -for f in .. $(EXTRA_MULTILIB_PARTS); do if [ x$${f} != x.. ]; then \ - cp stage1/$${f} . ; \ + $(CP) stage1/$${f} . ; \ else true; \ fi; done stage1: force stage1-start lang.stage1 stage2-start: -if [ -d stage2 ] ; then true ; else mkdir stage2 ; fi - $(MAKE) -f libgcc.mk libgcc-stage-start stage=stage2 + $(MAKE) SHELL=$(SHELL) -f libgcc.mk libgcc-stage-start stage=stage2 -for dir in intl $(SUBDIRS) ; \ do \ if [ -d stage2/$$dir ] ; then true ; else mkdir stage2/$$dir ; fi ; \ @@ -3591,24 +3626,24 @@ -if [ -f ld$(exeext) ] ; then (cd stage2 && $(LN_S) ../ld$(exeext) .) ; else true ; fi -if [ -f collect-ld$(exeext) ] ; then (cd stage2 && $(LN_S) ../collect-ld$(exeext) .) ; else true ; fi -rm -f stage2/libgcc.a stage2/libgcc_eh.a stage2/libgcc_s*$(SHLIB_EXT) - -cp libgcc.a stage2 + -$(CP) libgcc.a stage2 -if $(RANLIB_TEST_FOR_TARGET) ; then \ $(RANLIB_FOR_TARGET) stage2/libgcc.a; \ else true; fi - -if [ -f libgcc_eh.a ] ; then cp libgcc_eh.a stage2; \ + -if [ -f libgcc_eh.a ] ; then $(CP) libgcc_eh.a stage2; \ if $(RANLIB_TEST_FOR_TARGET) ; then \ $(RANLIB_FOR_TARGET) stage2/libgcc_eh.a; \ else true; fi; fi - -cp libgcc_s*$(SHLIB_EXT) stage2/ + -$(CP) libgcc_s*$(SHLIB_EXT) stage2/ -for f in .. $(EXTRA_MULTILIB_PARTS); do if [ x$${f} != x.. ]; then \ - cp stage2/$${f} . ; \ + $(CP) stage2/$${f} . ; \ else true; \ fi; done stage2: force stage2-start lang.stage2 stage3-start: -if [ -d stage3 ] ; then true ; else mkdir stage3 ; fi - $(MAKE) -f libgcc.mk libgcc-stage-start stage=stage3 + $(MAKE) SHELL=$(SHELL) -f libgcc.mk libgcc-stage-start stage=stage3 -for dir in intl $(SUBDIRS) ; \ do \ if [ -d stage3/$$dir ] ; then true ; else mkdir stage3/$$dir ; fi ; \ @@ -3621,24 +3656,24 @@ -if [ -f ld$(exeext) ] ; then (cd stage3 && $(LN_S) ../ld$(exeext) .) ; else true ; fi -if [ -f collect-ld$(exeext) ] ; then (cd stage3 && $(LN_S) ../collect-ld$(exeext) .) ; else true ; fi -rm -f stage3/libgcc.a stage3/libgcc_eh.a stage3/libgcc_s*$(SHLIB_EXT) - -cp libgcc.a stage3 + -$(CP) libgcc.a stage3 -if $(RANLIB_TEST_FOR_TARGET) ; then \ $(RANLIB_FOR_TARGET) stage3/libgcc.a; \ else true; fi - -if [ -f libgcc_eh.a ] ; then cp libgcc_eh.a stage3; \ + -if [ -f libgcc_eh.a ] ; then $(CP) libgcc_eh.a stage3; \ if $(RANLIB_TEST_FOR_TARGET) ; then \ $(RANLIB_FOR_TARGET) stage3/libgcc_eh.a; \ else true; fi; fi - -cp libgcc_s*$(SHLIB_EXT) stage3/ + -$(CP) libgcc_s*$(SHLIB_EXT) stage3/ -for f in .. $(EXTRA_MULTILIB_PARTS); do if [ x$${f} != x.. ]; then \ - cp stage3/$${f} . ; \ + $(CP) stage3/$${f} . ; \ else true; \ fi; done stage3: force stage3-start lang.stage3 stage4-start: -if [ -d stage4 ] ; then true ; else mkdir stage4 ; fi - $(MAKE) -f libgcc.mk libgcc-stage-start stage=stage4 + $(MAKE) SHELL=$(SHELL) -f libgcc.mk libgcc-stage-start stage=stage4 -for dir in intl $(SUBDIRS) ; \ do \ if [ -d stage4/$$dir ] ; then true ; else mkdir stage4/$$dir ; fi ; \ @@ -3651,17 +3686,17 @@ -if [ -f ld$(exeext) ] ; then (cd stage4 && $(LN_S) ../ld$(exeext) .) ; else true ; fi -if [ -f collect-ld$(exeext) ] ; then (cd stage4 && $(LN_S) ../collect-ld$(exeext) .) ; else true ; fi -rm -f stage4/libgcc.a stage4/libgcc_eh.a stage4/libgcc_s*$(SHLIB_EXT) - -cp libgcc.a stage4 + -$(CP) libgcc.a stage4 -if $(RANLIB_TEST_FOR_TARGET) ; then \ $(RANLIB_FOR_TARGET) stage4/libgcc.a; \ else true; fi - -if [ -f libgcc_eh.a ] ; then cp libgcc_eh.a stage4; \ + -if [ -f libgcc_eh.a ] ; then $(CP) libgcc_eh.a stage4; \ if $(RANLIB_TEST_FOR_TARGET) ; then \ $(RANLIB_FOR_TARGET) stage4/libgcc_eh.a; \ else true; fi; fi - -cp libgcc_s*$(SHLIB_EXT) stage4/ + -$(CP) libgcc_s*$(SHLIB_EXT) stage4/ -for f in .. $(EXTRA_MULTILIB_PARTS); do if [ x$${f} != x.. ]; then \ - cp stage4/$${f} . ; \ + $(CP) stage4/$${f} . ; \ else true; \ fi; done stage4: force stage4-start lang.stage4 Index: src/gcc/gcc/calls.c =================================================================== RCS file: /gccos2/src/gcc/gcc/calls.c,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -w -u -r1.1.1.2 -r1.3 --- src/gcc/gcc/calls.c 27 Apr 2004 18:38:04 -0000 1.1.1.2 +++ src/gcc/gcc/calls.c 28 Apr 2004 04:57:39 -0000 1.3 @@ -2302,7 +2302,7 @@ /* Set up a place to return a structure. */ /* Cater to broken compilers. */ - if (aggregate_value_p (exp)) + if (aggregate_value_p2 (exp, fndecl)) /* bird: #631: return struct */ { /* This call returns a big structure. */ flags &= ~(ECF_CONST | ECF_PURE | ECF_LIBCALL_BLOCK); Index: src/gcc/gcc/cfg.sh =================================================================== RCS file: src/gcc/gcc/cfg.sh diff -N src/gcc/gcc/cfg.sh --- nul 1 Jan 1970 00:00:00 -0000 +++ src/gcc/gcc/cfg.sh 7 Aug 2003 18:35:44 -0000 1.2 @@ -0,0 +1,34 @@ +#!/bin/sh + +# for some strange reason this fails when run from makefile +#CONFIG_HEADERS=auto-host.h:config.in \ +#LANGUAGES="c++ f77 java objc" \ +#./config.status +#exit + +# Pre-patch configure script +if grep -q "tr -s '\*'" configure; then + echo "Patching configure ..." + sed -e "s/ ' | tr -s '\*'/ \\\\r' | tr -s '\\\\\\\\*'/" \ + -e "/for gcc_WS in 4 8; do/,/done/d" \ + configure >configure.patched + mv -f configure.patched configure +fi + +export CC="gcc -pipe" +export CXX="g++ -pipe" +export LDFLAGS="-s -Zexe -Zcrtdll" + +# Many tests will fail if we'll include toolkit's types.h instead of emx's +unset C_INCLUDE_PATH +export C_INCLUDE_PATH + +export TOPLEVEL_CONFIGURE_ARGUMENTS="--enable-clh --enable-threads --enable-shared --enable-nls --without-included-gettext --prefix=/gcc --srcdir=`pwd`" + +rm -f configargs.h +./configure $TOPLEVEL_CONFIGURE_ARGUMENTS + +# for some strange reason this fails when run from makefile +#CONFIG_HEADERS=auto-host.h:config.in \ +#LANGUAGES="c++ f77 java objc" \ +#./config.status Index: src/gcc/gcc/clh.c =================================================================== RCS file: src/gcc/gcc/clh.c diff -N src/gcc/gcc/clh.c --- nul 1 Jan 1970 00:00:00 -0000 +++ src/gcc/gcc/clh.c 16 Apr 2003 14:03:37 -0000 1.1 @@ -0,0 +1,1004 @@ +/* + Compiler Driver Command-line Help facility + Copyright (C) 1997 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. + + In other words, you are welcome to use, share and improve this program. + You are forbidden to forbid anyone else to use, share and improve + what you give them. Help stamp out software-hoarding! + */ + +#include +#include +#include +#include + +#ifndef HAVE_CONFIG_H +#include +#endif + +/* External variables */ + +/* Help text displayed when user specified no selector */ +extern char *clh_default_text; +/* argv[0] */ +extern char *programname; + +/****************************************************************************** + + Terminal control routines + + Since terminal control is highly system dependent, clh library allows almost + everything to be overriden from a host-dependent config file. The following + macros can be redefined: + + CLH_GET_WIDTH + CLH_GET_FILE_WIDTH + CLH_SET_ATTR(flags, flagmask) + CLH_FINISH + + A detailed description of each is below. + +******************************************************************************/ + + +#define CLH_ATTR_HEAD 0x0001 /* Header text */ +#define CLH_ATTR_OPTN 0x0002 /* Option text */ +#define CLH_ATTR_BOLD 0x0004 /* Bold text */ +#define CLH_ATTR_ITAL 0x0008 /* Italic text */ +#define CLH_ATTR_UNDL 0x0010 /* Underlined text */ + +/* Host configuration file can query the following definition */ +/* to place additional code into the source code */ +#define IN_CLH + +#define CLH_DEFAULT_GET_WIDTH term_getwidth () +#define CLH_DEFAULT_GET_FILE_WIDTH CLH_GET_WIDTH +#define CLH_DEFAULT_SET_ATTR(flags, flagmask) \ + term_setattr (flags, flagmask) +#define CLH_DEFAULT_FINISH term_finish () + +/* Forward declaration of functions that use termcap */ +/* so that host configuration file can use CLH_DEFAULT_XXX */ +int term_getwidth (void); +int term_out (char *name); +int term_setattr (int flags, int flagmask); +void term_finish (void); + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +/* + This macro should return the width of the terminal (or window if windowed) + and maybe perform other initialization. This macro is called only if + isatty (1) returned >0. + */ +#ifndef CLH_GET_WIDTH +#define CLH_USE_TERMCAP +#define CLH_GET_WIDTH CLH_DEFAULT_GET_WIDTH +#endif + +/* + This macro can be overriden to return the width of the text which will + be output when stdout is redirected to something other than a terminal. + Default value is CLH_GET_WIDTH + */ +#ifndef CLH_GET_FILE_WIDTH +#define CLH_USE_TERMCAP +#define CLH_GET_FILE_WIDTH CLH_DEFAULT_GET_FILE_WIDTH +#endif + +/* + This should set the terminal into such mode that the following output will + have appearance specified by CLH_ATTR_XXXX flags. flagmask contains a '1' in + those positions that have been changed since last call to CLH_SET_ATTR. + You can use it to reduce the volume of output to terminal. If a particular + terminal cannot produce somewhat-looking characters (for example, most + terminals cannot do italic characters) it can approximate the appearance + mode with something other, for example with color. It can as well completely + ignore some appearance modes. It should return the number of positions that + cursor has been moved horizontally. Usually this is zero. + */ +#ifndef CLH_SET_ATTR +#define CLH_USE_TERMCAP +#define CLH_SET_ATTR(flags, flagmask) CLH_DEFAULT_SET_ATTR(flags, flagmask) +#endif + +/* + This macro should reset terminal to its original state and free any + previously-allocated memory. + */ +#ifndef CLH_FINISH +#define CLH_USE_TERMCAP +#define CLH_FINISH CLH_DEFAULT_FINISH +#endif + +#ifdef CLH_USE_TERMCAP + +/*******************************************************************\ + * Generic terminal control routines using TERMCAP library. * + * * + * There should be no difference which TERMCAP library is used -- * + * there are no specific features used. * +\*******************************************************************/ + +static char termbuf[2048]; + +extern int tgetent (char *buffer, char *termtype); +extern int tgetnum (char *name); +extern int tgetflag (char *name); +extern char *tgetstr (char *name, char **area); + +static int +term_getwidth () +{ + int ret; + char *term = getenv ("CLH_TERM"); + if (!term || (strcmp (term, "-") == 0)) + term = getenv ("TERM"); + + if ((ret = tgetent (termbuf, term)) < 0) + { + if (term) + fprintf (stderr, "\n\nIncorrect CLH_TERM or TERM environment variable\n\n"); + else + fprintf (stderr, "\n\nThe CLH_TERM or TERM environment variable is not set\n\n"); + return 80; + } + if (ret == 0) + termbuf[0] = 0; + + ret = tgetnum ("co"); + if (ret < 1) + return 80; + else + return ret; +} + +static int +term_out (char *name) +{ + char *buff = (char *) malloc (64); + char *tmp = buff, *cap; + int rc = 0; + + cap = tgetstr (name, &buff); + if (cap) + { + write (1, cap, strlen (cap)); + rc = 1; + } + free (tmp); + return rc; +} + +static int +term_setattr (int flags, int flagmask) +{ + int fromscratch = 0; /* Reset all attributes and restart from scratch */ + int width = 0; + int cookiewidth = tgetnum ("sg"); + + if (cookiewidth < 0) + cookiewidth = 0; + + /* Attributes should come in reverse order by they importance, */ + /* since later attributes can overwrite previous */ + + if (flagmask & CLH_ATTR_UNDL) + if (flags & CLH_ATTR_UNDL) + { + if (term_out ("us")) + width += cookiewidth; + } + else + { + if (term_out ("ue")) + width += cookiewidth; + } + + if (flagmask & CLH_ATTR_ITAL) + if (flags & CLH_ATTR_ITAL) + { + if (term_out ("mb")) + width += cookiewidth; + } + else + fromscratch = 1; + + if (flagmask & CLH_ATTR_BOLD) + if (flags & CLH_ATTR_BOLD) + { + if (term_out ("md")) + width += cookiewidth; + } + else + fromscratch = 1; + + if (flagmask & CLH_ATTR_OPTN) + if (flags & CLH_ATTR_OPTN) + { + if (term_out ("mr")) + width += cookiewidth; + } + else + fromscratch = 1; + + if (flagmask & CLH_ATTR_HEAD) + if (flags & CLH_ATTR_HEAD) + { + if (term_out ("so")) + width += cookiewidth; + } + else + { + if (term_out ("se")) + width += cookiewidth; + } + + if (fromscratch) + { + term_out ("me"); + if (flags) + width += term_setattr (flags, flags); + } + return (width); +} + +static void +term_finish () +{ + term_out ("me"); +} + +#endif /* CLH_USE_TERMCAP */ + +/****************************************************************************** + + A simple parser for .txh files + + To produce command-line help you should provide a text in a simplified + texi-like language. The following commands are accepted: + + @0, @1, @2 ... @9 {section name text} + + This identifies a section. The number after @ identifies its position within + help tree. For example, a help tree can look like this: + + @0 + @1 + @1 + @2 + @1 + @2 + @3 + @3 <- + @3 + @1 + @1 + @0 + + Each one-level-deeper subsection within a given section is given an ordinal + number which will be displayed at run time, and you can choose the path + within command-line help tree by specifying a list of numbers separated by + dots, for example --help=3,1,2 will show text from section number 3 at + level 1, subsection 1 at level 2 and sub-subsection 2 at level 3. In the + above example this section is marked with an arrow. + For a more complex example, look at the end of this comment. + + @t{text} + + This defines a topic. The characters between curly brackets will + (hopefully) be highlighted in some way, so the eye will easily find them. + Help Topics can be selected directly with --help switch, for example + program --help=--version will bring the help text on the "--version" + topic. Text in brackets is prefixed and postfixed by newlines. + + @x{text} + + The text in brackets is a topic with same properties as @t + except that it will not be selectable by --help=topic command. + + @y{text} + + Same as @x but the {text} will not be preceeded and followed by newlines. + + @b{text} + + The text in brackets will be (maybe) displayed in boldface. + + @i{text} + + The text in brackets will be (maybe) displayed italicised. + + @u{text} + + The text in brackets will be (maybe) displayed underlined. + + @n + + Produces a new line. By default, all words are re-formatted to terminal + width, a new-line is automatically placed only between @0-@9, @o and @x + commands. + + @z + + Inserts "programname" into text + + @@ + + A literal `@' + + ---------------------------------------------------------------------------- + A simple example of a help tree: + ---------------------------------------------------------------------------- + + @0{Default help text} + This text will be displayed when no parameters are given at all (for + example, when user entered @b{program --help} or @b{program -h}). It + should contain some general directions how to use the command-line help + system, for example: Please look below and choose the number of the + section you are interested in, then enter @b{program --help=?} where ? + is the number of that section. + + @1{The section A of @b{command-line switches}} + This section is so big, so big, that it has been split into subsections. + Please look below and choose the ID of the subsection you like, then + re-run the program with @b{--help=1?} switch, where ? is the ID of + the subsection you like. + + @2{The section A-1} + blah-blah-blah + @2{The section A-2} + blah-blah-blah + @2{The section A-3} + blah-blah-blah + + @1{The section B} + @2{Section B-1} + blah-blah-blah + this section can be selected with --help=2,1 + @0 + This text will be displayed at the end of the level-zero text. + For example, it can contain the copyright, distribution license and so on. + +******************************************************************************/ + +#define TOKEN_EOF -1 +#define TOKEN_SPACE 0 +#define TOKEN_WORD 1 +#define TOKEN_COMMAND 32 +#define TOKEN_END 128 + +/* The following structure encapsulates a command-line help class */ +struct clhStat +{ +/* The following is used for text input stream */ + const char *inp; /* Input text pointer */ + int level; /* Current level inside help tree */ + int path[10]; /* Help tree path selector */ + int pathlen; /* Path length; if zero selector is used */ + const char *selector; /* Option selector */ + int levcount[10]; /* Count sublevels here */ + int indent; /* Left column to start at */ + int visible; /* Display text? */ + int visiblesection; /* Override 'visible' */ + char success; /* Success indicator */ + +/* This stack is used for placing command arguments (i.e. @i{argument}) */ +/* This provides support for up to TOKEN_STACK_SIZE nested commands */ +#define TOKEN_STACK_SIZE 16 + const char *stack[TOKEN_STACK_SIZE]; + char *orgstack[TOKEN_STACK_SIZE]; + char stackcmd[TOKEN_STACK_SIZE]; /* Command that has this argument */ + int stackp; /* Stack top pointer */ + +/* The following is used for output */ + int attrsup; /* Has support for attributes? */ + int column; /* Current cursor column */ + int width; /* Terminal width */ + int curattr; /* Text attributes terminal is set to */ +}; + +/* Fetch a token from input stream and return: + * ? -- if next token is @? + * TOKEN_END + ? -- if argument for command ? finished + * TOKEN_SPACE -- if next word consists of spaces + * TOKEN_WORD -- next word consists of non-spaces + * TOKEN_EOF -- when input stream exhausted + */ +static int +gettoken (struct clhStat *stat, char *word, int wordlen) +{ + const char *in; /* input pointer */ + char c; /* next character read */ + int ret = TOKEN_EOF; /* return value */ + int wordpos = 0; /* next position in "word" */ + + if (stat->stackp) + in = stat->stack[stat->stackp - 1]; + else + in = stat->inp; + + /* If next token is a command, process it */ + if (in [0] == '@') + { + in++; + c = *in; + in++; + + /* Command has arguments? */ + if (*in == '{') + { + const char *tmp = in + sizeof (char); + int deep = 1; + + /* Eat its argument */ + while (deep && *tmp) + { + if (*tmp == '{') + deep++; + if (*tmp == '}') + deep--; + tmp++; + } + /* Adjust input pointer past end of argument */ + if (stat->stackp) + stat->stack[stat->stackp - 1] = tmp; + else + stat->inp = tmp; + if (stat->stackp >= TOKEN_STACK_SIZE) + { + fprintf (stderr, "\nCLH FATAL ERROR: too many embedded tokens; token stack exceeded!\n"); + abort (); /* Avoid assert () */ + } + + /* Now allocate a new slot in stack and put the argument there */ + stat->orgstack[stat->stackp] = malloc (tmp - in - 1); + memcpy (stat->orgstack[stat->stackp], in + 1, tmp - in - 2); + stat->orgstack[stat->stackp][tmp - in - 2] = 0; + /* Adjust input pointer */ + in = stat->orgstack[stat->stackp]; + /* Remember the command which has the argument */ + stat->stackcmd[stat->stackp] = c; + stat->stackp++; + } + ret = c; + goto tokexit; + } + + /* If this is the end of a particular input stream, */ + /* but this is not the last one */ + if ((*in == 0) && (stat->stackp)) + { + /* Return TOKEN_END+command */ + ret = TOKEN_END + stat->stackcmd[--stat->stackp]; + /* Delete the argument */ + free (stat->orgstack[stat->stackp]); + /* Adjust input pointer */ + if (stat->stackp) + in = stat->stack[stat->stackp - 1]; + else + in = stat->inp; + goto tokexit; + } + + /* If next word begins with a space, eat all */ + /* successive spaces and spit them out in one go */ + if ((*in == ' ') || (*in == '\n')) + { + do + { + c = *in; + if (c == '\n') + c = ' '; + word[wordpos++] = c; + in++; + } + while ((*in == ' ') || (*in == '\n')); + ret = TOKEN_SPACE; + goto tokexit; + } + + /* While we can fetch characters, put them into "word" */ + while ((*in) && (wordpos < wordlen)) + { + ret = TOKEN_WORD; + if (*in == '\n') + c = ' '; + else + c = *in; + /* If the word finished, get out */ + if ((c == ' ') || (c == '@')) + goto tokexit; + /* Go forth */ + in++; + word[wordpos++] = c; + } + +tokexit: + /* Keep the input pointer */ + if (stat->stackp) + stat->stack[stat->stackp - 1] = in; + else + stat->inp = in; + /* Finish the "word" with a zero */ + word[wordpos] = 0; + return ret; +} + +/* This text will be displayed in case of insuccess */ +static const char *clh_notfound = +{ + "@0{--[ @i{help topic missing} ]--}" + "Sorry, the help database does not contain more information on topic " + "you selected" +}; + +/* Output a word taking care to output a newline */ +/* if it doesnt fit in the current line */ +/* If current path does is not along the path user wants, exit */ +/* Return 1 if the word has been output */ +static int +clh_output (struct clhStat *stat, const char *word) +{ + int i, spaces; + int wordlen = strlen (word); + int curattr = 0; + + if (!stat->visiblesection) /* Section should be displayed? */ + if (!stat->visible) /* Topic should be displayed? */ + return (0); + + /* Compute attributes for the text we are about to output */ + for (i = 0; i < stat->stackp; i++) + switch (stat->stackcmd[i]) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + curattr |= CLH_ATTR_HEAD; + break; + case 't': + case 'x': + case 'y': + curattr |= CLH_ATTR_OPTN; + break; + case 'b': + curattr |= CLH_ATTR_BOLD; + break; + case 'i': + curattr |= CLH_ATTR_ITAL; + break; + case 'u': + curattr |= CLH_ATTR_UNDL; + break; + } + + /* Compute indentation (spaces skipped from left margin) + for the text we should output */ + if (stat->level == 0) + stat->indent = 1; + else + stat->indent = stat->level + ((curattr & CLH_ATTR_HEAD) ? 0 : + ((curattr & CLH_ATTR_OPTN) ? 1 : 2)); + + /* If user selected a path (i.e. 1.2.3.x), check it */ + if (stat->pathlen) + { + /* If we are more than one level deeper than user requested, + or we are simply deeper and we're not displaying a heading, + exit */ + if ((stat->pathlen <= stat->level) + && (((curattr & CLH_ATTR_HEAD) == 0) || (stat->pathlen < stat->level))) + return (0); + + /* If this is the section user wants, signal success */ + stat->success |= (stat->level + 1 >= stat->pathlen); + } + + /* If we should output a newline or next word + crosses the right margin, output a newline */ + if ((*word == '\n') || (stat->column + wordlen >= stat->width)) + { + /* Reset attributes to nothing before newline */ + if (stat->attrsup && stat->curattr) + { + CLH_SET_ATTR (0, stat->curattr); + stat->curattr = 0; + } + write (1, "\n", 1); + stat->column = 1; + /* If we're required to output a newline, we're done */ + if (*word == '\n') + return (0); + } + + /* If current column is less than needed indentation, fill with spaces */ + if (stat->column < stat->indent) + { + /* Check first if we`re requested to output a bunch of spaces */ + for (i = 0, spaces = 1; i < wordlen; i++) + if (word[i] != ' ') + { + spaces--; + break; + } + + /* If so, exit (skip spaces at the left margin) */ + if (spaces) + return (0); + + /* Reset attributes to nothing before newline */ + if (stat->attrsup && stat->curattr) + { + stat->column += CLH_SET_ATTR (0, stat->curattr); + stat->curattr = 0; + } + /* If we're still unaligned, align */ + if (stat->indent - stat->column > 0) + { + /* Since no more than 10 (0..9) nested levels are allowed, we'll + never have a indentation greater than 10 spaces (see + indentation computing formula above) */ + write (1, " ", stat->indent - stat->column); + stat->column = stat->indent; + } + } + + /* If the attributes for the text we should output differs from */ + /* current attributes, set new attributes */ + if ((i = curattr ^ stat->curattr)) + { + if (stat->attrsup) + stat->column += CLH_SET_ATTR (curattr, i); + stat->curattr = curattr; + } + + /* And finally, output the word */ + write (1, word, wordlen); + stat->column += wordlen; + return (1); +} + +/* Compare regions of strings, ignoring case if str2 does not start */ +/* with a '-', and return 0 if are equal, != 0 otherwise */ +static int +clh_memcmp (const char *str1, const char *str2, int len) +{ + int i; + + if (*str2 == '-') + return memcmp (str1, str2, len); + else + for (i = 0; i < len; i++) + if (tolower (str1[i]) != tolower (str2[i])) + return 1; + return 0; +} + +/* This routine is called when section changes + to determine whenever the section should be displayed or not */ +static int +clh_calcvisible (struct clhStat *stat, const char *section) +{ + /* User specified a help path? */ + if (stat->pathlen) + { + int i, pl; + + /* Do not display level zero when at least + one-step step was specified */ + if ((stat->pathlen > 1) && (stat->level == 0)) + return 0; + + /* Check if we're on the right path */ + pl = stat->level + 1; + if (pl > stat->pathlen) + pl = stat->pathlen; + for (i = 0; i < pl; i++) + if (stat->path[i] != stat->levcount[i]) + return 0; + } + else + /* User specified a help topic */ + { + int len = strlen (section); + int sellen = strlen (stat->selector); + + /* Check if selector is a substring of section name */ + if ((stat->level == 0) + || (len < sellen) + || (clh_memcmp (section, stat->selector, sellen))) + return 0; + + /* Signal success */ + stat->success = 1; + } + + /* Display it */ + return 1; +} + +/* This is the main (and the only) interface routine for CLH library + * It accepts a pointer to help text database, and a pointer to + * topic selector. Topic selector can be either of the form + * "x.y.z{...}" where x,y,z etc are numbers, otherwise selector + * is considered to be the starting portion of a help topic. + * If topic does not begin with a '-', string are compared + * case-insensitive, otherwise the comparison is case-sensitive. + * Function returns 0 if topic has been found and -1 if topic + * has not been found in database. + */ +int +clh_display (const char *text, const char *selector) +{ + char word[256]; + int token; + struct clhStat stat; + char *term; + int emptytopic = 0; + + /* If no selector given, select default help text */ + if (!selector || !*selector) + text = clh_default_text; + + /* If selector is equal to '*', user wants to see help index */ + if (selector && (selector[0] == '*') && (selector[1] == 0)) + selector = ""; + + /* Construct a clhStat object */ + memset (&stat, 0, sizeof (stat)); + stat.attrsup = isatty (1); + if (stat.attrsup < 0) /* No attributes if error */ + stat.attrsup = 0; + if (stat.attrsup) + stat.width = CLH_GET_WIDTH; + else + stat.width = CLH_GET_FILE_WIDTH; + stat.column = 1; + stat.inp = text; + stat.stackp = 0; + stat.level = 0; + stat.curattr = 0; + stat.pathlen = 1; /* Assume we have to display only 'default' section */ + stat.path[0] = 1; /* Level zero always has only one section */ + stat.indent = 1; /* Indent to 1st column */ + stat.visible = 0; /* Topic is invisible */ + stat.visiblesection = 0; /* Section is invisible */ + + /* Check CLH_TERM variable, and if it is "-", disable attributes */ + term = getenv ("CLH_TERM"); + if (term) + { + if (strcmp (term, "-") == 0) + stat.attrsup = 0; + } + + if (stat.attrsup) /* Set text attributes to nothing */ + stat.column += CLH_SET_ATTR (stat.curattr, 0); + + if (selector) + { + int i; + const char *tmp = selector; + + /* See if selector is a series of numbers separated by dots */ + for (i = 1; (i <= 9) && (*tmp); i++) + { + int val = 0; + while ((*tmp >= '0') && (*tmp <= '9')) + { + val = val * 10 + (*tmp - '0'); + tmp++; + } + stat.pathlen = i + 1; + stat.path[i] = val; + while (*tmp == '.') + tmp++; + } + if (*tmp) /* If there are non-numbers, consider selector a topic */ + stat.pathlen = 0; + } + + if (stat.pathlen) + stat.selector = NULL; + else + stat.selector = selector; + + /* Loop through all tokens in input text */ + while ((token = gettoken (&stat, word, sizeof (word))) != TOKEN_EOF) + { + if (token >= TOKEN_COMMAND) /* Got a command? */ + { + char finished = token > TOKEN_END; + if (finished) + token -= TOKEN_END; + + /* Which one? */ + switch (token) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + /* Section separator - start or end of argument */ + { + int i; + + stat.level = token - '0'; + stat.levcount[stat.level + 1] = 0; + + /* If token started, see if section is visible */ + if (!finished) + { + stat.levcount[stat.level]++; + stat.visible = 0; /* Topic is invisible */ + stat.visiblesection = clh_calcvisible (&stat, + (stat.stackp && (stat.stackcmd[stat.stackp - 1] == token)) + ? stat.stack[stat.stackp - 1] + : ""); + } + /* If cursor is past indention column, newline */ + if (stat.column > stat.indent) + clh_output (&stat, "\n"); + + /* If argument started and level is greater than zero, + print section number */ + if (!finished && stat.level) + { + for (i = 1; i <= stat.level; i++) + { + snprintf (word, sizeof (word), "%d.", stat.levcount[i]); + clh_output (&stat, word); + } + clh_output (&stat, " "); + } + break; + } + case 't': /* Help topic - argument started or finished */ + if (!finished && (stat.pathlen == 0) && (!emptytopic || !stat.visible)) + { + /* Check if topic is visible */ + stat.visible = clh_calcvisible (&stat, + (stat.stackp && (stat.stackcmd[stat.stackp - 1] == token)) + ? stat.stack[stat.stackp - 1] + : ""); + } + emptytopic = 1; + /* continue on next case */ + case 'x': /* Unselectable help topic */ + /* If cursor is past indention column, newline */ + if (stat.column > stat.indent) + clh_output (&stat, "\n"); + break; + case 'y': /* Unselectable help topic not followed by \n */ + break; + case 'n': /* Newline */ + clh_output (&stat, "\n"); + break; + case 'b': /* Bold */ + break; + case 'i': /* Italic */ + break; + case 'u': /* Underline */ + break; + case 'z': + clh_output (&stat, programname); + break; + case '@': + clh_output (&stat, "@"); + break; + default: + { + fprintf (stderr, "\nCLH FATAL ERROR: Unexpected token @%c\n", token); + abort (); /* Incorrect help text */ + } + } + } + else + { + /* Display next word of text if it's worth it */ + if (clh_output (&stat, word)) + emptytopic = 0; + } + } + + /* Finish terminal if it supports attributes :-) */ + if (isatty (1)) + CLH_FINISH; + + /* Output a newline */ + if (stat.column > 1) + write (1, "\n", 1); + + /* If we didn't succeeded to find the topic user asked for, + display 'not found' message and return -1 */ + if ((!stat.success) && ((stat.pathlen > 1) || (stat.selector))) + { + clh_display (clh_notfound, "*"); + return -1; + } + return 0; +} + +#ifdef MAIN + +/* The following is used only for stand-alone testing */ + +#include "getopt.h" + +static char *program_name; +static char *program_version = "0.0"; + +/* Command-line help text */ +char *gcc_clh_text = +{ + "@0" + "@u{Welcome to the GNU Compiler Suite Command-Line Help System!}@n" + "The following sections are available:@n" +#include "clh.txh" +}; + +static struct option long_options[] = +{ + {"help", optional_argument, 0, 'h'}, + {"version", no_argument, 0, 'v'}, + {0, no_argument, 0, 0} +}; + +int +main (int argc, char *argv[]) +{ + int c; + +#if defined (__EMX__) + program_name = _getname (argv[0]); +#else + program_name = argv[0]; +#endif /* __EMX__ */ + + while ((c = getopt_long (argc, argv, "h::v", long_options, (int *) 0)) != EOF) + switch (c) + { + case '?': + break; + case 'h': + exit (clh_display (gcc_clh_text, optarg)); + case 'v': + printf ("%s version %s\n", program_name, program_version); + exit (0); + } + + return (0); +} + +#endif /* MAIN */ Index: src/gcc/gcc/config.gcc =================================================================== RCS file: /gccos2/src/gcc/gcc/config.gcc,v retrieving revision 1.1.1.3 retrieving revision 1.6 diff -w -u -r1.1.1.3 -r1.6 --- src/gcc/gcc/config.gcc 7 Sep 2004 01:26:07 -0000 1.1.1.3 +++ src/gcc/gcc/config.gcc 8 Sep 2004 00:03:17 -0000 1.6 @@ -1388,6 +1388,25 @@ tm_file="${tm_file} dbxcoff.h" fi ;; +i*86-pc-*emx) # i?86 running OS/2 + xm_file=i386/xm-emx.h + tm_file=i386/emx.h + extra_objs=emx.o + xm_defines="USG BSTRING NO_SYS_SIGLIST" + exeext=.exe + tmake_file=i386/t-emx + fixincludes=Makefile.in + # r=bird: why do we do this?? + target_alias=${host} + # r=bird: and this?? + CFLAGS="-Zstack 1024 -Zcrtdll" + if test x$enable_threads = xyes; then + thread_file=os2 + fi + gas=yes + gnu_ld=yes + float_format=none + ;; i[34567]86-*-interix*) tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/i386-interix.h interix.h" xm_file="i386/xm-i386-interix.h" Index: src/gcc/gcc/configure =================================================================== RCS file: /gccos2/src/gcc/gcc/configure,v retrieving revision 1.1.1.3 retrieving revision 1.7 diff -w -u -r1.1.1.3 -r1.7 --- src/gcc/gcc/configure 7 Sep 2004 01:26:13 -0000 1.1.1.3 +++ src/gcc/gcc/configure 8 Sep 2004 00:03:17 -0000 1.7 @@ -64,6 +64,8 @@ ac_help="$ac_help --disable-shared don't provide a shared libgcc" ac_help="$ac_help + --enable-clh enable GCC command-line help (+~90K executable!)" +ac_help="$ac_help --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib" ac_help="$ac_help --enable-initfini-array use .init_array/.fini_array sections" @@ -612,6 +614,157 @@ ac_n= ac_c='\c' ac_t= fi +echo $ac_n "checking for path separator""... $ac_c" 1>&6 +echo "configure:619: checking for path separator" >&5 +# Filter path to get backslahes into forwardslashes +case "`uname -s 2> /dev/null`" in +OS/2) + PATH=`echo -E "$PATH" | sed 's+\\\\+/+g'` + PATH_IFS=';' + ;; +*) + PATH_IFS=':' + ;; +esac +echo "$ac_t""${PATH_IFS}" 1>&6 + +echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 +echo "configure:633: checking for Cygwin environment" >&5 +if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cygwin=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cygwin=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_cygwin" 1>&6 +CYGWIN= +test "$ac_cv_cygwin" = yes && CYGWIN=yes +echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 +echo "configure:666: checking for mingw32 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_mingw32=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_mingw32=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_mingw32" 1>&6 +MINGW32= +test "$ac_cv_mingw32" = yes && MINGW32=yes +echo $ac_n "checking for EMX/OS2 environment""... $ac_c" 1>&6 +echo "configure:695: checking for EMX/OS2 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_emxos2'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + : ${CC=gcc.exe} +cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_emxos2=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_emxos2=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_emxos2" 1>&6 +if eval "test \"`echo '$''{'ac_cv_libpre'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$ac_cv_emxos2" = yes ; then + ac_cv_libpre= +else + ac_cv_libpre=lib +fi + +fi + +EMXOS2= +test "$ac_cv_emxos2" = yes && EMXOS2=yes + + + +echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 +echo "configure:739: checking for executable suffix" >&5 +if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then + ac_cv_exeext=.exe +else + rm -f conftest* + echo 'int main () { return 0; }' > conftest.$ac_ext + ac_cv_exeext= + if { (eval echo configure:749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + for file in conftest.*; do + case $file in + *.c | *.o | *.obj) ;; + *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; + esac + done + else + { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } + fi + rm -f conftest* + test x"${ac_cv_exeext}" = x && ac_cv_exeext=no +fi +fi + +EXEEXT="" +test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} +echo "$ac_t""${ac_cv_exeext}" 1>&6 +ac_exeext=$EXEEXT + @@ -629,7 +782,7 @@ # - two terminals occur directly after each other # - the path contains an element with a dot in it echo $ac_n "checking LIBRARY_PATH variable""... $ac_c" 1>&6 -echo "configure:633: checking LIBRARY_PATH variable" >&5 +echo "configure:786: checking LIBRARY_PATH variable" >&5 case ${LIBRARY_PATH} in [:\;]* | *[:\;] | *[:\;][:\;]* | *[:\;]. | .[:\;]*| . | *[:\;].[:\;]* ) library_path_setting="contains current directory" @@ -654,7 +807,7 @@ # - two terminals occur directly after each other # - the path contains an element with a dot in it echo $ac_n "checking GCC_EXEC_PREFIX variable""... $ac_c" 1>&6 -echo "configure:658: checking GCC_EXEC_PREFIX variable" >&5 +echo "configure:811: checking GCC_EXEC_PREFIX variable" >&5 case ${GCC_EXEC_PREFIX} in [:\;]* | *[:\;] | *[:\;][:\;]* | *[:\;]. | .[:\;]*| . | *[:\;].[:\;]* ) gcc_exec_prefix_setting="contains current directory" @@ -882,7 +1035,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:886: checking host system type" >&5 +echo "configure:1039: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -903,7 +1056,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:907: checking target system type" >&5 +echo "configure:1060: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -921,7 +1074,7 @@ echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:925: checking build system type" >&5 +echo "configure:1078: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -969,18 +1122,19 @@ # 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:973: checking for $ac_word" >&5 +echo "configure:1126: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_CC="gcc" break fi @@ -999,20 +1153,22 @@ # 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:1003: checking for $ac_word" >&5 +echo "configure:1157: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_prog_rejected=no ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc" -o \ + "$ac_dir/$ac_word$ac_exeext" = "/usr/ucb/cc" ; then ac_prog_rejected=yes continue fi @@ -1050,18 +1206,19 @@ # 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:1054: checking for $ac_word" >&5 +echo "configure:1210: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_CC="cl" break fi @@ -1082,7 +1239,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1086: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1243: 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. @@ -1093,12 +1250,12 @@ cat > conftest.$ac_ext << EOF -#line 1097 "configure" +#line 1254 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1259: \"$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 @@ -1124,12 +1281,12 @@ { 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:1128: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1285: 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:1133: checking whether we are using GNU C" >&5 +echo "configure:1290: 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 @@ -1138,7 +1295,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1142: \"$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:1299: \"$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 @@ -1157,7 +1314,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1161: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1318: 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 @@ -1190,10 +1347,10 @@ if test "x$CC" != xcc; then echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6 -echo "configure:1194: checking whether $CC and cc understand -c and -o together" >&5 +echo "configure:1351: checking whether $CC and cc understand -c and -o together" >&5 else echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6 -echo "configure:1197: checking whether cc understands -c and -o together" >&5 +echo "configure:1354: checking whether cc understands -c and -o together" >&5 fi set dummy $CC; ac_cc="`echo $2 | sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" @@ -1205,16 +1362,16 @@ # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5' -if { (eval echo configure:1209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:1210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; +if { (eval echo configure:1366: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:1367: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then eval ac_cv_prog_cc_${ac_cc}_c_o=yes if test "x$CC" != xcc; then # Test first that cc exists at all. - if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:1215: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:1372: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then ac_try='cc -c conftest.c -o conftest.o 1>&5' - if { (eval echo configure:1217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:1218: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + if { (eval echo configure:1374: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:1375: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then # cc works too. : @@ -1260,18 +1417,19 @@ # Extract the first word of "${ac_tool_prefix}gnatbind", so it can be a program name with args. set dummy ${ac_tool_prefix}gnatbind; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1264: checking for $ac_word" >&5 +echo "configure:1421: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$GNATBIND"; then ac_cv_prog_GNATBIND="$GNATBIND" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_GNATBIND="${ac_tool_prefix}gnatbind" break fi @@ -1292,18 +1450,19 @@ # Extract the first word of "gnatbind", so it can be a program name with args. set dummy gnatbind; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1296: checking for $ac_word" >&5 +echo "configure:1454: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$GNATBIND"; then ac_cv_prog_GNATBIND="$GNATBIND" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_GNATBIND="gnatbind" break fi @@ -1325,7 +1484,7 @@ fi echo $ac_n "checking for compiler driver that understands Ada""... $ac_c" 1>&6 -echo "configure:1329: checking for compiler driver that understands Ada" >&5 +echo "configure:1488: checking for compiler driver that understands Ada" >&5 if eval "test \"`echo '$''{'gcc_cv_prog_adac'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1367,21 +1526,21 @@ echo $ac_n "checking whether ${CC-cc} accepts -Wno-long-long""... $ac_c" 1>&6 -echo "configure:1371: checking whether ${CC-cc} accepts -Wno-long-long" >&5 +echo "configure:1530: checking whether ${CC-cc} accepts -Wno-long-long" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_no_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else save_CFLAGS="$CFLAGS" CFLAGS="-Wno-long-long" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_prog_cc_no_long_long=yes else @@ -1398,7 +1557,7 @@ if test x$have_gnat != xno ; then echo $ac_n "checking whether ${ADAC} accepts -Wno-long-long""... $ac_c" 1>&6 -echo "configure:1402: checking whether ${ADAC} accepts -Wno-long-long" >&5 +echo "configure:1561: checking whether ${ADAC} accepts -Wno-long-long" >&5 if eval "test \"`echo '$''{'ac_cv_prog_adac_no_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1426,7 +1585,7 @@ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1430: checking how to run the C preprocessor" >&5 +echo "configure:1589: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1441,13 +1600,14 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < +#line 1605 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1611: \"$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 : @@ -1458,13 +1618,14 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < +#line 1623 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1468: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1629: \"$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 : @@ -1475,13 +1636,14 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < +#line 1641 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1485: \"$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 : @@ -1506,21 +1668,21 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1510: checking for inline" >&5 +echo "configure:1672: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1686: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1546,19 +1708,19 @@ esac echo $ac_n "checking for volatile""... $ac_c" 1>&6 -echo "configure:1550: checking for volatile" >&5 +echo "configure:1712: checking for volatile" >&5 if eval "test \"`echo '$''{'gcc_cv_c_volatile'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_c_volatile=yes else @@ -1580,7 +1742,7 @@ echo $ac_n "checking for long double""... $ac_c" 1>&6 -echo "configure:1584: checking for long double" >&5 +echo "configure:1746: checking for long double" >&5 if eval "test \"`echo '$''{'gcc_cv_c_long_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1588,7 +1750,7 @@ gcc_cv_c_long_double=yes else cat > conftest.$ac_ext <= sizeof(double)):; ; return 0; } EOF -if { (eval echo configure:1602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1764: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_c_long_double=yes else @@ -1620,19 +1782,19 @@ fi echo $ac_n "checking for long long int""... $ac_c" 1>&6 -echo "configure:1624: checking for long long int" >&5 +echo "configure:1786: checking for long long int" >&5 if eval "test \"`echo '$''{'ac_cv_c_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1798: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_long_long=yes else @@ -1652,19 +1814,19 @@ fi echo $ac_n "checking for __int64""... $ac_c" 1>&6 -echo "configure:1656: checking for __int64" >&5 +echo "configure:1818: checking for __int64" >&5 if eval "test \"`echo '$''{'ac_cv_c___int64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c___int64=yes else @@ -1685,19 +1847,19 @@ fi echo $ac_n "checking for built-in _Bool""... $ac_c" 1>&6 -echo "configure:1689: checking for built-in _Bool" >&5 +echo "configure:1851: checking for built-in _Bool" >&5 if eval "test \"`echo '$''{'gcc_cv_c__bool'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_c__bool=yes else @@ -1721,13 +1883,13 @@ # sizeof(char) is 1 by definition. echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:1725: checking size of short" >&5 +echo "configure:1887: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -1737,7 +1899,7 @@ switch (0) case 0: case (sizeof (short) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:1741: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_short=$ac_size else @@ -1760,13 +1922,13 @@ echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:1764: checking size of int" >&5 +echo "configure:1926: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -1776,7 +1938,7 @@ switch (0) case 0: case (sizeof (int) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:1780: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_int=$ac_size else @@ -1799,13 +1961,13 @@ echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:1803: checking size of long" >&5 +echo "configure:1965: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -1815,7 +1977,7 @@ switch (0) case 0: case (sizeof (long) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:1819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1981: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_long=$ac_size else @@ -1839,13 +2001,13 @@ if test $ac_cv_c_long_long = yes; then echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:1843: checking size of long long" >&5 +echo "configure:2005: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -1855,7 +2017,7 @@ switch (0) case 0: case (sizeof (long long) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:1859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_long_long=$ac_size else @@ -1880,13 +2042,13 @@ fi if test $ac_cv_c___int64 = yes; then echo $ac_n "checking size of __int64""... $ac_c" 1>&6 -echo "configure:1884: checking size of __int64" >&5 +echo "configure:2046: checking size of __int64" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof___int64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -1896,7 +2058,7 @@ switch (0) case 0: case (sizeof (__int64) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:1900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof___int64=$ac_size else @@ -1921,12 +2083,12 @@ fi echo $ac_n "checking execution character set""... $ac_c" 1>&6 -echo "configure:1925: checking execution character set" >&5 +echo "configure:2087: checking execution character set" >&5 if eval "test \"`echo '$''{'ac_cv_c_charset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < conftest.$ac_ext <&6 -echo "configure:2077: checking for valgrind.h" >&5 +echo "configure:2239: checking for valgrind.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 2245 "configure" #include "confdefs.h" #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2087: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2250: \"$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* @@ -2108,7 +2271,7 @@ # Extract the first word of "valgrind", so it can be a program name with args. set dummy valgrind; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2112: checking for $ac_word" >&5 +echo "configure:2275: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_valgrind_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2117,7 +2280,7 @@ ac_cv_path_valgrind_path="$valgrind_path" # Let the user override the test with a path. ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${PATH_IFS}" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then @@ -2289,6 +2452,14 @@ +# Enable command-line help +# Check whether --enable-clh or --disable-clh was given. +if test "${enable_clh+set}" = set; then + enableval="$enable_clh" + : +fi + + # Stage specific cflags for build. stage1_cflags= case $build in @@ -2311,7 +2482,7 @@ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:2315: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:2486: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2339,7 +2510,7 @@ echo $ac_n "checking whether a default assembler was specified""... $ac_c" 1>&6 -echo "configure:2343: checking whether a default assembler was specified" >&5 +echo "configure:2514: checking whether a default assembler was specified" >&5 if test x"${DEFAULT_ASSEMBLER+set}" = x"set"; then if test x"$gas_flag" = x"no"; then echo "$ac_t""yes ($DEFAULT_ASSEMBLER)" 1>&6 @@ -2351,7 +2522,7 @@ fi echo $ac_n "checking whether a default linker was specified""... $ac_c" 1>&6 -echo "configure:2355: checking whether a default linker was specified" >&5 +echo "configure:2526: checking whether a default linker was specified" >&5 if test x"${DEFAULT_LINKER+set}" = x"set"; then if test x"$gnu_ld_flag" = x"no"; then echo "$ac_t""yes ($DEFAULT_LINKER)" 1>&6 @@ -2363,12 +2534,12 @@ fi echo $ac_n "checking for GNU C library""... $ac_c" 1>&6 -echo "configure:2367: checking for GNU C library" >&5 +echo "configure:2538: checking for GNU C library" >&5 if eval "test \"`echo '$''{'gcc_cv_glibc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -2378,7 +2549,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:2382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2553: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_glibc=yes else @@ -2399,23 +2570,24 @@ fi # Find some useful tools -for ac_prog in gawk mawk nawk awk +for ac_prog in mawk gawk nawk awk 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:2408: checking for $ac_word" >&5 +echo "configure:2579: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_AWK="$ac_prog" break fi @@ -2434,7 +2606,7 @@ done echo $ac_n "checking whether ln works""... $ac_c" 1>&6 -echo "configure:2438: checking whether ln works" >&5 +echo "configure:2610: checking whether ln works" >&5 if eval "test \"`echo '$''{'gcc_cv_prog_LN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2466,7 +2638,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2470: checking whether ln -s works" >&5 +echo "configure:2642: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'gcc_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2500,18 +2672,19 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2504: checking for $ac_word" >&5 +echo "configure:2676: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="ranlib" break fi @@ -2538,12 +2711,12 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:2542: checking for a BSD compatible install" >&5 +echo "configure:2715: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${PATH_IFS}" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in @@ -2589,12 +2762,13 @@ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2593: checking for ANSI C header files" >&5 +echo "configure:2766: 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 < +#line 2772 "configure" #include "confdefs.h" #include #include @@ -2602,7 +2776,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2780: \"$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* @@ -2619,7 +2793,7 @@ 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 @@ -2637,7 +2811,7 @@ 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 @@ -2658,7 +2832,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2669,7 +2843,7 @@ exit (0); } EOF -if { (eval echo configure:2673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2693,12 +2867,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2697: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:2871: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2707,7 +2881,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2728,19 +2902,19 @@ fi echo $ac_n "checking for working stdbool.h""... $ac_c" 1>&6 -echo "configure:2732: checking for working stdbool.h" >&5 +echo "configure:2906: checking for working stdbool.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdbool_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { bool foo = false; ; return 0; } EOF -if { (eval echo configure:2744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2918: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_stdbool_h=yes else @@ -2761,12 +2935,12 @@ fi echo $ac_n "checking whether string.h and strings.h may both be included""... $ac_c" 1>&6 -echo "configure:2765: checking whether string.h and strings.h may both be included" >&5 +echo "configure:2939: checking whether string.h and strings.h may both be included" >&5 if eval "test \"`echo '$''{'gcc_cv_header_string'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2774,7 +2948,7 @@ ; return 0; } EOF -if { (eval echo configure:2778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_header_string=yes else @@ -2795,12 +2969,12 @@ fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:2799: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:2973: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2816,7 +2990,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:2820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -2843,17 +3017,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2847: checking for $ac_hdr" >&5 +echo "configure:3021: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 3027 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2857: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3032: \"$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* @@ -2883,17 +3058,18 @@ # Check for thread headers. ac_safe=`echo "thread.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for thread.h""... $ac_c" 1>&6 -echo "configure:2887: checking for thread.h" >&5 +echo "configure:3062: checking for thread.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 3068 "configure" #include "confdefs.h" #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3073: \"$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* @@ -2917,17 +3093,18 @@ ac_safe=`echo "pthread.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for pthread.h""... $ac_c" 1>&6 -echo "configure:2921: checking for pthread.h" >&5 +echo "configure:3097: checking for pthread.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 3103 "configure" #include "confdefs.h" #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2931: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3108: \"$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* @@ -2952,12 +3129,12 @@ # These tests can't be done till we know if we have limits.h. echo $ac_n "checking for CHAR_BIT""... $ac_c" 1>&6 -echo "configure:2956: checking for CHAR_BIT" >&5 +echo "configure:3133: checking for CHAR_BIT" >&5 if eval "test \"`echo '$''{'gcc_cv_decl_char_bit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2982,7 +3159,7 @@ echo "$ac_t""$gcc_cv_decl_char_bit" 1>&6 if test $gcc_cv_decl_char_bit = no; then echo $ac_n "checking number of bits in a byte""... $ac_c" 1>&6 -echo "configure:2986: checking number of bits in a byte" >&5 +echo "configure:3163: checking number of bits in a byte" >&5 if eval "test \"`echo '$''{'gcc_cv_c_nbby'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2990,7 +3167,7 @@ gcc_cv_c_nbby= while test $i -lt 65; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_c_nbby=$i; break else @@ -3025,7 +3202,7 @@ fi fi echo $ac_n "checking byte ordering""... $ac_c" 1>&6 -echo "configure:3029: checking byte ordering" >&5 +echo "configure:3206: checking byte ordering" >&5 if eval "test \"`echo '$''{'ac_cv_c_compile_endian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3039,7 +3216,7 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then od -c conftest.o | sed 's/^[0-7]*[ ]*/ / s/\*/./g @@ -3098,7 +3275,7 @@ fi echo $ac_n "checking floating point format""... $ac_c" 1>&6 -echo "configure:3102: checking floating point format" >&5 +echo "configure:3279: checking floating point format" >&5 if eval "test \"`echo '$''{'ac_cv_c_float_format'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3111,7 +3288,7 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3314: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then od -c conftest.o | sed 's/^[0-7]*[ ]*/ / s/\*/./g @@ -3222,18 +3399,19 @@ # Extract the first word of "mktemp", so it can be a program name with args. set dummy mktemp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3226: checking for $ac_word" >&5 +echo "configure:3403: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_have_mktemp_command'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$have_mktemp_command"; then ac_cv_prog_have_mktemp_command="$have_mktemp_command" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_have_mktemp_command="yes" break fi @@ -3261,18 +3439,19 @@ # Extract the first word of "makeinfo", so it can be a program name with args. set dummy makeinfo; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3265: checking for $ac_word" >&5 +echo "configure:3443: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$MAKEINFO"; then ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_MAKEINFO="makeinfo" break fi @@ -3290,13 +3469,13 @@ if test -n "$MAKEINFO"; then # Found it, now check the version. echo $ac_n "checking for modern makeinfo""... $ac_c" 1>&6 -echo "configure:3294: checking for modern makeinfo" >&5 +echo "configure:3473: checking for modern makeinfo" >&5 if eval "test \"`echo '$''{'gcc_cv_prog_makeinfo_modern'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_prog_version=`$MAKEINFO --version 2>&1 | sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'` - echo "configure:3300: version of makeinfo is $ac_prog_version" >&5 + echo "configure:3479: version of makeinfo is $ac_prog_version" >&5 case $ac_prog_version in '') gcc_cv_prog_makeinfo_modern=no;; 4.[2-9]*) @@ -3324,7 +3503,7 @@ # Is pod2man recent enough to regenerate manpages? echo $ac_n "checking for recent Pod::Man""... $ac_c" 1>&6 -echo "configure:3328: checking for recent Pod::Man" >&5 +echo "configure:3507: checking for recent Pod::Man" >&5 if (perl -e 'use 1.10 Pod::Man') >/dev/null 2>&1; then echo "$ac_t""yes" 1>&6 GENERATED_MANPAGES=generated-manpages @@ -3340,18 +3519,19 @@ # 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:3344: checking for $ac_word" >&5 +echo "configure:3523: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$FLEX"; then ac_cv_prog_FLEX="$FLEX" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_FLEX="flex" break fi @@ -3377,18 +3557,19 @@ # 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:3381: checking for $ac_word" >&5 +echo "configure:3561: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$BISON"; then ac_cv_prog_BISON="$BISON" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_BISON="bison" break fi @@ -3409,7 +3590,7 @@ # These libraries may be used by collect2. # We may need a special search path to get them linked. echo $ac_n "checking for collect2 libraries""... $ac_c" 1>&6 -echo "configure:3413: checking for collect2 libraries" >&5 +echo "configure:3594: checking for collect2 libraries" >&5 if eval "test \"`echo '$''{'gcc_cv_collect2_libs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3420,7 +3601,7 @@ do LIBS="$libs" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gcc_cv_collect2_libs="$libs"; break else @@ -3457,14 +3638,14 @@ LIBS= echo $ac_n "checking for library containing exc_resume""... $ac_c" 1>&6 -echo "configure:3461: checking for library containing exc_resume" >&5 +echo "configure:3642: checking for library containing exc_resume" >&5 if eval "test \"`echo '$''{'ac_cv_search_exc_resume'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_exc_resume="no" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_exc_resume="none required" else @@ -3486,7 +3667,7 @@ test "$ac_cv_search_exc_resume" = "no" && for i in exc; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_exc_resume="-l$i" break @@ -3527,14 +3708,14 @@ LIBS= echo $ac_n "checking for library containing ldexp""... $ac_c" 1>&6 -echo "configure:3531: checking for library containing ldexp" >&5 +echo "configure:3712: checking for library containing ldexp" >&5 if eval "test \"`echo '$''{'ac_cv_search_ldexp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_ldexp="no" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_ldexp="none required" else @@ -3556,7 +3737,7 @@ test "$ac_cv_search_ldexp" = "no" && for i in m; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_ldexp="-l$i" break @@ -3596,12 +3777,12 @@ echo $ac_n "checking for preprocessor stringizing operator""... $ac_c" 1>&6 -echo "configure:3600: checking for preprocessor stringizing operator" >&5 +echo "configure:3781: checking for preprocessor stringizing operator" >&5 if eval "test \"`echo '$''{'ac_cv_c_stringize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < only if it exists, # doesn't clash with , and declares intmax_t. echo $ac_n "checking for inttypes.h""... $ac_c" 1>&6 -echo "configure:3638: checking for inttypes.h" >&5 +echo "configure:3819: checking for inttypes.h" >&5 if eval "test \"`echo '$''{'gcc_cv_header_inttypes_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3647,7 +3828,7 @@ intmax_t i = -1; ; return 0; } EOF -if { (eval echo configure:3651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3832: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_header_inttypes_h=yes else @@ -3674,12 +3855,12 @@ scandir alphasort gettimeofday mmap do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3678: checking for $ac_func" >&5 +echo "configure:3859: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3728,12 +3909,12 @@ echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:3732: checking for ssize_t" >&5 +echo "configure:3913: checking for ssize_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3764,12 +3945,12 @@ # Try to determine the array type of the second argument of getgroups # for the target system (int or gid_t). echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:3768: checking for uid_t in sys/types.h" >&5 +echo "configure:3949: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -3798,7 +3979,7 @@ fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 -echo "configure:3802: checking type of array argument to getgroups" >&5 +echo "configure:3983: checking type of array argument to getgroups" >&5 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3806,7 +3987,7 @@ ac_cv_type_getgroups=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_type_getgroups=gid_t else @@ -3845,7 +4026,7 @@ if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext < EOF @@ -3886,7 +4067,7 @@ echo $ac_n "checking whether the printf functions support %p""... $ac_c" 1>&6 -echo "configure:3890: checking whether the printf functions support %p" >&5 +echo "configure:4071: checking whether the printf functions support %p" >&5 if eval "test \"`echo '$''{'gcc_cv_func_printf_ptr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3894,7 +4075,7 @@ gcc_cv_func_printf_ptr=no else cat > conftest.$ac_ext < @@ -3907,7 +4088,7 @@ return (p != q); } EOF -if { (eval echo configure:3911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then gcc_cv_func_printf_ptr=yes else @@ -3937,7 +4118,7 @@ gcc_cv_func_mmap_anon=no else echo $ac_n "checking whether read-only mmap of a plain file works""... $ac_c" 1>&6 -echo "configure:3941: checking whether read-only mmap of a plain file works" >&5 +echo "configure:4122: checking whether read-only mmap of a plain file works" >&5 if eval "test \"`echo '$''{'gcc_cv_func_mmap_file'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3956,7 +4137,7 @@ echo "$ac_t""$gcc_cv_func_mmap_file" 1>&6 echo $ac_n "checking whether mmap from /dev/zero works""... $ac_c" 1>&6 -echo "configure:3960: checking whether mmap from /dev/zero works" >&5 +echo "configure:4141: checking whether mmap from /dev/zero works" >&5 if eval "test \"`echo '$''{'gcc_cv_func_mmap_dev_zero'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3982,12 +4163,12 @@ # Unlike /dev/zero, the MAP_ANON(YMOUS) defines can be probed for. echo $ac_n "checking for MAP_ANON(YMOUS)""... $ac_c" 1>&6 -echo "configure:3986: checking for MAP_ANON(YMOUS)" >&5 +echo "configure:4167: checking for MAP_ANON(YMOUS)" >&5 if eval "test \"`echo '$''{'gcc_cv_decl_map_anon'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4001,7 +4182,7 @@ int n = MAP_ANONYMOUS; ; return 0; } EOF -if { (eval echo configure:4005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4186: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_decl_map_anon=yes else @@ -4019,7 +4200,7 @@ gcc_cv_func_mmap_anon=no else echo $ac_n "checking whether mmap with MAP_ANON(YMOUS) works""... $ac_c" 1>&6 -echo "configure:4023: checking whether mmap with MAP_ANON(YMOUS) works" >&5 +echo "configure:4204: checking whether mmap with MAP_ANON(YMOUS) works" >&5 if eval "test \"`echo '$''{'gcc_cv_func_mmap_anon'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4074,12 +4255,12 @@ ;; esac echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:4078: checking for pid_t" >&5 +echo "configure:4259: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4108,17 +4289,18 @@ ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:4112: checking for vfork.h" >&5 +echo "configure:4293: checking for vfork.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 4299 "configure" #include "confdefs.h" #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4122: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4304: \"$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* @@ -4143,18 +4325,18 @@ fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:4147: checking for working vfork" >&5 +echo "configure:4329: checking for working vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then echo $ac_n "checking for vfork""... $ac_c" 1>&6 -echo "configure:4153: checking for vfork" >&5 +echo "configure:4335: checking for vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vfork=yes" else @@ -4199,7 +4381,7 @@ ac_cv_func_vfork_works=$ac_cv_func_vfork else cat > conftest.$ac_ext < @@ -4294,7 +4476,7 @@ } } EOF -if { (eval echo configure:4298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_vfork_works=yes else @@ -4333,7 +4515,7 @@ echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:4337: checking for iconv" >&5 +echo "configure:4519: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4341,7 +4523,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext < #include @@ -4351,7 +4533,7 @@ iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:4355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -4363,7 +4545,7 @@ am_save_LIBS="$LIBS" LIBS="$LIBS $am_cv_libiconv_ldpath -liconv" cat > conftest.$ac_ext < #include @@ -4373,7 +4555,7 @@ iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:4377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_lib_iconv=yes am_cv_func_iconv=yes @@ -4394,13 +4576,13 @@ EOF echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:4398: checking for iconv declaration" >&5 +echo "configure:4580: checking for iconv declaration" >&5 if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -4419,7 +4601,7 @@ ; return 0; } EOF -if { (eval echo configure:4423: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_arg1="" else @@ -4457,12 +4639,12 @@ do ac_tr_decl=HAVE_DECL_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` echo $ac_n "checking whether $ac_func is declared""... $ac_c" 1>&6 -echo "configure:4461: checking whether $ac_func is declared" >&5 +echo "configure:4643: checking whether $ac_func is declared" >&5 if eval "test \"`echo '$''{'gcc_cv_have_decl_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "gcc_cv_have_decl_$ac_func=yes" else @@ -4578,12 +4760,12 @@ do ac_tr_decl=HAVE_DECL_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` echo $ac_n "checking whether $ac_func is declared""... $ac_c" 1>&6 -echo "configure:4582: checking whether $ac_func is declared" >&5 +echo "configure:4764: checking whether $ac_func is declared" >&5 if eval "test \"`echo '$''{'gcc_cv_have_decl_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "gcc_cv_have_decl_$ac_func=yes" else @@ -4640,7 +4822,7 @@ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4839: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -4670,12 +4852,12 @@ do ac_tr_decl=HAVE_DECL_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` echo $ac_n "checking whether $ac_func is declared""... $ac_c" 1>&6 -echo "configure:4674: checking whether $ac_func is declared" >&5 +echo "configure:4856: checking whether $ac_func is declared" >&5 if eval "test \"`echo '$''{'gcc_cv_have_decl_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "gcc_cv_have_decl_$ac_func=yes" else @@ -4727,13 +4909,13 @@ # More time-related stuff. echo $ac_n "checking for struct tms""... $ac_c" 1>&6 -echo "configure:4731: checking for struct tms" >&5 +echo "configure:4913: checking for struct tms" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tms'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tms=yes else @@ -4769,13 +4951,13 @@ # use gcc_cv_* here because this doesn't match the behavior of AC_CHECK_TYPE. # revisit after autoconf 2.50. echo $ac_n "checking for clock_t""... $ac_c" 1>&6 -echo "configure:4773: checking for clock_t" >&5 +echo "configure:4955: checking for clock_t" >&5 if eval "test \"`echo '$''{'gcc_cv_type_clock_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_type_clock_t=yes else @@ -4806,12 +4988,12 @@ fi echo $ac_n "checking for uchar""... $ac_c" 1>&6 -echo "configure:4810: checking for uchar" >&5 +echo "configure:4992: checking for uchar" >&5 if eval "test \"`echo '$''{'gcc_cv_type_uchar'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_uchar=yes else @@ -4848,7 +5030,7 @@ gcc_cv_initfinit_array=$enableval else echo $ac_n "checking for .preinit_array/.init_array/.fini_array support""... $ac_c" 1>&6 -echo "configure:4852: checking for .preinit_array/.init_array/.fini_array support" >&5 +echo "configure:5034: checking for .preinit_array/.init_array/.fini_array support" >&5 if eval "test \"`echo '$''{'gcc_cv_initfinit_array'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4858,7 +5040,7 @@ int foo (void) { x = 0; } int (*fp) (void) __attribute__ ((section (".init_array"))) = foo; EOF - if { ac_try='${CC-cc} -o conftest conftest.c 1>&AS_MESSAGE_LOG_FD'; { (eval echo configure:4862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='${CC-cc} -o conftest conftest.c 1>&AS_MESSAGE_LOG_FD'; { (eval echo configure:5044: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then if ./conftest; then gcc_cv_initfinit_array=yes @@ -4887,12 +5069,12 @@ # mkdir takes a single argument on some systems. echo $ac_n "checking if mkdir takes one argument""... $ac_c" 1>&6 -echo "configure:4891: checking if mkdir takes one argument" >&5 +echo "configure:5073: checking if mkdir takes one argument" >&5 if eval "test \"`echo '$''{'gcc_cv_mkdir_takes_one_arg'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -4909,7 +5091,7 @@ mkdir ("foo", 0); ; return 0; } EOF -if { (eval echo configure:4913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5095: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_mkdir_takes_one_arg=no else @@ -4949,7 +5131,7 @@ echo $ac_n "checking for main in -lunwind""... $ac_c" 1>&6 -echo "configure:4953: checking for main in -lunwind" >&5 +echo "configure:5135: checking for main in -lunwind" >&5 ac_lib_var=`echo unwind'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4957,14 +5139,14 @@ ac_save_LIBS="$LIBS" LIBS="-lunwind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5150: \"$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 @@ -5242,14 +5424,14 @@ echo $ac_n "checking for library containing strerror""... $ac_c" 1>&6 -echo "configure:5246: checking for library containing strerror" >&5 +echo "configure:5428: checking for library containing strerror" >&5 if eval "test \"`echo '$''{'ac_cv_search_strerror'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_strerror="no" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_strerror="none required" else @@ -5271,7 +5453,7 @@ test "$ac_cv_search_strerror" = "no" && for i in cposix; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_strerror="-l$i" break @@ -5305,12 +5487,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:5309: checking for working const" >&5 +echo "configure:5491: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -5380,12 +5562,12 @@ fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:5384: checking for off_t" >&5 +echo "configure:5566: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5413,12 +5595,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:5417: checking for size_t" >&5 +echo "configure:5599: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5448,19 +5630,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:5452: checking for working alloca.h" >&5 +echo "configure:5634: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:5464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -5481,12 +5663,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:5485: checking for alloca" >&5 +echo "configure:5667: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -5546,12 +5728,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:5550: checking whether alloca needs Cray hooks" >&5 +echo "configure:5732: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:5580: checking for $ac_func" >&5 +echo "configure:5762: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5631,7 +5813,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:5635: checking stack direction for C alloca" >&5 +echo "configure:5817: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5639,7 +5821,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -5681,12 +5863,12 @@ echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 -echo "configure:5685: checking whether we are using the GNU C Library 2.1 or newer" >&5 +echo "configure:5867: checking whether we are using the GNU C Library 2.1 or newer" >&5 if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5722,17 +5904,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5726: checking for $ac_hdr" >&5 +echo "configure:5908: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 5914 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5736: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5919: \"$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* @@ -5763,12 +5946,12 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5767: checking for $ac_func" >&5 +echo "configure:5950: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5832,7 +6015,7 @@ echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:5836: checking for iconv" >&5 +echo "configure:6019: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5840,7 +6023,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext < #include @@ -5850,7 +6033,7 @@ iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:5854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -5862,7 +6045,7 @@ am_save_LIBS="$LIBS" LIBS="$LIBS $am_cv_libiconv_ldpath -liconv" cat > conftest.$ac_ext < #include @@ -5872,7 +6055,7 @@ iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:5876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_lib_iconv=yes am_cv_func_iconv=yes @@ -5893,13 +6076,13 @@ EOF echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:5897: checking for iconv declaration" >&5 +echo "configure:6080: checking for iconv declaration" >&5 if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5918,7 +6101,7 @@ ; return 0; } EOF -if { (eval echo configure:5922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_arg1="" else @@ -5947,19 +6130,19 @@ echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:5951: checking for nl_langinfo and CODESET" >&5 +echo "configure:6134: checking for nl_langinfo and CODESET" >&5 if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char* cs = nl_langinfo(CODESET); ; return 0; } EOF -if { (eval echo configure:5963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_langinfo_codeset=yes else @@ -5982,19 +6165,19 @@ if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:5986: checking for LC_MESSAGES" >&5 +echo "configure:6169: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:5998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -6015,7 +6198,7 @@ fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:6019: checking whether NLS is requested" >&5 +echo "configure:6202: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -6038,7 +6221,7 @@ EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:6042: checking whether included gettext is requested" >&5 +echo "configure:6225: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -6058,17 +6241,18 @@ ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:6062: checking for libintl.h" >&5 +echo "configure:6245: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 6251 "configure" #include "confdefs.h" #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6256: \"$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* @@ -6089,12 +6273,12 @@ EOF echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6 -echo "configure:6093: checking for GNU gettext in libc" >&5 +echo "configure:6277: checking for GNU gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < extern int _nl_msg_cat_cntr; @@ -6103,7 +6287,7 @@ return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:6107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gnugettext1_libc=yes else @@ -6119,14 +6303,14 @@ if test "$gt_cv_func_gnugettext1_libc" != "yes"; then echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6 -echo "configure:6123: checking for GNU gettext in libintl" >&5 +echo "configure:6307: checking for GNU gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else gt_save_LIBS="$LIBS" LIBS="$LIBS -lintl $LIBICONV" cat > conftest.$ac_ext < extern int _nl_msg_cat_cntr; @@ -6135,7 +6319,7 @@ return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:6139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gnugettext1_libintl=yes else @@ -6168,12 +6352,12 @@ for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6172: checking for $ac_func" >&5 +echo "configure:6356: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6225,7 +6409,7 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6229: checking for $ac_word" >&5 +echo "configure:6413: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6234,7 +6418,7 @@ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${PATH_IFS}" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then @@ -6259,19 +6443,19 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6263: checking for $ac_word" >&5 +echo "configure:6447: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else case "$GMSGFMT" in - /*) + [/\\]* | [a-zA-Z]:*) ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ;; ?:/*) ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path. ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. @@ -6279,6 +6463,10 @@ ac_cv_path_GMSGFMT="$ac_dir/$ac_word" break fi + if test -f $ac_dir/$ac_word$ac_exeext; then + ac_cv_path_GMSGFMT="$ac_dir/$ac_word$ac_exeext" + break + fi done IFS="$ac_save_ifs" test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" @@ -6296,7 +6484,7 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6300: checking for $ac_word" >&5 +echo "configure:6488: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6305,7 +6493,7 @@ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${PATH_IFS}" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then @@ -6346,7 +6534,7 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6350: checking for $ac_word" >&5 +echo "configure:6538: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6355,7 +6543,7 @@ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${PATH_IFS}" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then @@ -6380,19 +6568,19 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6384: checking for $ac_word" >&5 +echo "configure:6572: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else case "$GMSGFMT" in - /*) + [/\\]* | [a-zA-Z]:*) ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ;; ?:/*) ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path. ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. @@ -6400,6 +6588,10 @@ ac_cv_path_GMSGFMT="$ac_dir/$ac_word" break fi + if test -f $ac_dir/$ac_word$ac_exeext; then + ac_cv_path_GMSGFMT="$ac_dir/$ac_word$ac_exeext" + break + fi done IFS="$ac_save_ifs" test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" @@ -6416,7 +6608,7 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6420: checking for $ac_word" >&5 +echo "configure:6612: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6425,7 +6617,7 @@ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${PATH_IFS}" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then @@ -6488,18 +6680,19 @@ # 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:6492: checking for $ac_word" >&5 +echo "configure:6684: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$INTLBISON"; then ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_INTLBISON="$ac_prog" break fi @@ -6521,7 +6714,7 @@ ac_verc_fail=yes else echo $ac_n "checking version of bison""... $ac_c" 1>&6 -echo "configure:6525: checking version of bison" >&5 +echo "configure:6718: checking version of bison" >&5 ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; @@ -6566,7 +6759,7 @@ if test "x$CATOBJEXT" != x; then echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:6570: checking for catalogs to be installed" >&5 +echo "configure:6763: checking for catalogs to be installed" >&5 # Look for .po and .gmo files in the source directory. CATALOGS= XLINGUAS= @@ -6624,7 +6817,7 @@ case $host_os in win32 | pe | cygwin* | mingw32* | uwin*) echo $ac_n "checking whether windows registry support is requested""... $ac_c" 1>&6 -echo "configure:6628: checking whether windows registry support is requested" >&5 +echo "configure:6821: checking whether windows registry support is requested" >&5 if test "x$enable_win32_registry" != xno; then cat >> confdefs.h <<\EOF #define ENABLE_WIN32_REGISTRY 1 @@ -6633,14 +6826,14 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for library containing RegOpenKeyExA""... $ac_c" 1>&6 -echo "configure:6637: checking for library containing RegOpenKeyExA" >&5 +echo "configure:6830: checking for library containing RegOpenKeyExA" >&5 if eval "test \"`echo '$''{'ac_cv_search_RegOpenKeyExA'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_RegOpenKeyExA="no" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_RegOpenKeyExA="none required" else @@ -6662,7 +6855,7 @@ test "$ac_cv_search_RegOpenKeyExA" = "no" && for i in advapi32; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_RegOpenKeyExA="-l$i" break @@ -6715,7 +6908,7 @@ if test "x$enable_win32_registry" != xno; then echo $ac_n "checking registry key on windows hosts""... $ac_c" 1>&6 -echo "configure:6719: checking registry key on windows hosts" >&5 +echo "configure:6912: checking registry key on windows hosts" >&5 cat >> confdefs.h <&6 -echo "configure:6935: checking what assembler to use" >&5 +echo "configure:7128: checking what assembler to use" >&5 gcc_cv_as= gcc_cv_gas_major_version= gcc_cv_gas_minor_version= @@ -7025,7 +7218,7 @@ # Figure out what linker we will be using. echo $ac_n "checking what linker to use""... $ac_c" 1>&6 -echo "configure:7029: checking what linker to use" >&5 +echo "configure:7222: checking what linker to use" >&5 gcc_cv_ld= gcc_cv_gld_major_version= gcc_cv_gld_minor_version= @@ -7118,7 +7311,7 @@ # Figure out what nm we will be using. echo $ac_n "checking what nm to use""... $ac_c" 1>&6 -echo "configure:7122: checking what nm to use" >&5 +echo "configure:7315: checking what nm to use" >&5 if test -x nm$host_exeext; then gcc_cv_nm=./nm$host_exeext elif test "x$program_prefix" != xNONE; then @@ -7130,7 +7323,7 @@ # Figure out what objdump we will be using. echo $ac_n "checking what objdump to use""... $ac_c" 1>&6 -echo "configure:7134: checking what objdump to use" >&5 +echo "configure:7327: checking what objdump to use" >&5 if test -x objdump$host_exeext; then gcc_cv_objdump=./objdump$host_exeext elif test "x$program_prefix" != xNONE; then @@ -7142,7 +7335,7 @@ # Figure out what assembler alignment features are present. echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6 -echo "configure:7146: checking assembler alignment features" >&5 +echo "configure:7339: checking assembler alignment features" >&5 gcc_cv_as_alignment_features=none if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then # Gas version 2.6 and later support for .balign and .p2align. @@ -7190,7 +7383,7 @@ echo "$ac_t""$gcc_cv_as_alignment_features" 1>&6 echo $ac_n "checking assembler subsection support""... $ac_c" 1>&6 -echo "configure:7194: checking assembler subsection support" >&5 +echo "configure:7387: checking assembler subsection support" >&5 gcc_cv_as_subsections=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 9 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then @@ -7230,7 +7423,7 @@ echo "$ac_t""$gcc_cv_as_subsections" 1>&6 echo $ac_n "checking assembler weak support""... $ac_c" 1>&6 -echo "configure:7234: checking assembler weak support" >&5 +echo "configure:7427: checking assembler weak support" >&5 gcc_cv_as_weak=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 2 -o "$gcc_cv_gas_major_version" -gt 2; then @@ -7253,7 +7446,7 @@ echo "$ac_t""$gcc_cv_as_weak" 1>&6 echo $ac_n "checking assembler hidden support""... $ac_c" 1>&6 -echo "configure:7257: checking assembler hidden support" >&5 +echo "configure:7450: checking assembler hidden support" >&5 gcc_cv_as_hidden=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 \ @@ -7319,7 +7512,7 @@ echo $ac_n "checking assembler leb128 support""... $ac_c" 1>&6 -echo "configure:7323: checking assembler leb128 support" >&5 +echo "configure:7516: checking assembler leb128 support" >&5 gcc_cv_as_leb128=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 11 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then @@ -7364,7 +7557,7 @@ echo "$ac_t""$gcc_cv_as_leb128" 1>&6 echo $ac_n "checking assembler eh_frame optimization""... $ac_c" 1>&6 -echo "configure:7368: checking assembler eh_frame optimization" >&5 +echo "configure:7561: checking assembler eh_frame optimization" >&5 gcc_cv_as_eh_frame=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 12 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then @@ -7445,7 +7638,7 @@ echo "$ac_t""$gcc_cv_as_eh_frame" 1>&6 echo $ac_n "checking assembler section merging support""... $ac_c" 1>&6 -echo "configure:7449: checking assembler section merging support" >&5 +echo "configure:7642: checking assembler section merging support" >&5 gcc_cv_as_shf_merge=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 12 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then @@ -7468,7 +7661,7 @@ echo "$ac_t""$gcc_cv_as_shf_merge" 1>&6 echo $ac_n "checking assembler thread-local storage support""... $ac_c" 1>&6 -echo "configure:7472: checking assembler thread-local storage support" >&5 +echo "configure:7665: checking assembler thread-local storage support" >&5 gcc_cv_as_tls=no conftest_s= tls_first_major= @@ -7611,7 +7804,7 @@ # All TARGET_ABI_OSF targets. alpha*-*-osf* | alpha*-*-linux* | alpha*-*-*bsd*) echo $ac_n "checking assembler supports explicit relocations""... $ac_c" 1>&6 -echo "configure:7615: checking assembler supports explicit relocations" >&5 +echo "configure:7808: checking assembler supports explicit relocations" >&5 if eval "test \"`echo '$''{'gcc_cv_as_explicit_relocs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7661,7 +7854,7 @@ ;; sparc*-*-*) echo $ac_n "checking assembler .register pseudo-op support""... $ac_c" 1>&6 -echo "configure:7665: checking assembler .register pseudo-op support" >&5 +echo "configure:7858: checking assembler .register pseudo-op support" >&5 if eval "test \"`echo '$''{'gcc_cv_as_register_pseudo_op'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7689,7 +7882,7 @@ fi echo $ac_n "checking assembler supports -relax""... $ac_c" 1>&6 -echo "configure:7693: checking assembler supports -relax" >&5 +echo "configure:7886: checking assembler supports -relax" >&5 if eval "test \"`echo '$''{'gcc_cv_as_relax_opt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7717,7 +7910,7 @@ fi echo $ac_n "checking assembler and linker support unaligned pc related relocs""... $ac_c" 1>&6 -echo "configure:7721: checking assembler and linker support unaligned pc related relocs" >&5 +echo "configure:7914: checking assembler and linker support unaligned pc related relocs" >&5 if eval "test \"`echo '$''{'gcc_cv_as_sparc_ua_pcrel'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7744,7 +7937,7 @@ fi echo $ac_n "checking assembler and linker support unaligned pc related relocs against hidden symbols""... $ac_c" 1>&6 -echo "configure:7748: checking assembler and linker support unaligned pc related relocs against hidden symbols" >&5 +echo "configure:7941: checking assembler and linker support unaligned pc related relocs against hidden symbols" >&5 if eval "test \"`echo '$''{'gcc_cv_as_sparc_ua_pcrel_hidden'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7784,7 +7977,7 @@ fi echo $ac_n "checking for assembler offsetable %lo() support""... $ac_c" 1>&6 -echo "configure:7788: checking for assembler offsetable %lo() support" >&5 +echo "configure:7981: checking for assembler offsetable %lo() support" >&5 if eval "test \"`echo '$''{'gcc_cv_as_offsetable_lo10'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7823,7 +8016,7 @@ i[34567]86-*-* | x86_64-*-*) echo $ac_n "checking assembler instructions""... $ac_c" 1>&6 -echo "configure:7827: checking assembler instructions" >&5 +echo "configure:8020: checking assembler instructions" >&5 gcc_cv_as_instructions= if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 9 -o "$gcc_cv_gas_major_version" -gt 2; then @@ -7850,7 +8043,7 @@ echo "$ac_t""$gcc_cv_as_instructions" 1>&6 echo $ac_n "checking cmov syntax""... $ac_c" 1>&6 -echo "configure:7854: checking cmov syntax" >&5 +echo "configure:8047: checking cmov syntax" >&5 gcc_cv_as_ix86_cmov_sun_syntax=no if test x$gcc_cv_as != x; then echo 'cmovl.l %edx, %eax' > conftest.s @@ -7868,7 +8061,7 @@ echo "$ac_t""$gcc_cv_as_ix86_cmov_sun_syntax" 1>&6 echo $ac_n "checking assembler GOTOFF in data directives""... $ac_c" 1>&6 -echo "configure:7872: checking assembler GOTOFF in data directives" >&5 +echo "configure:8065: checking assembler GOTOFF in data directives" >&5 gcc_cv_as_gotoff_in_data=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x then @@ -7898,7 +8091,7 @@ ia64*-*-*) echo $ac_n "checking assembler supports ltoffx and ldxmov""... $ac_c" 1>&6 -echo "configure:7902: checking assembler supports ltoffx and ldxmov" >&5 +echo "configure:8095: checking assembler supports ltoffx and ldxmov" >&5 if eval "test \"`echo '$''{'gcc_cv_as_ltoffx_ldxmov_relocs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7940,7 +8133,7 @@ esac echo $ac_n "checking assembler dwarf2 debug_line support""... $ac_c" 1>&6 -echo "configure:7944: checking assembler dwarf2 debug_line support" >&5 +echo "configure:8137: checking assembler dwarf2 debug_line support" >&5 gcc_cv_as_dwarf2_debug_line=no # ??? Not all targets support dwarf2 debug_line, even within a version # of gas. Moreover, we need to emit a valid instruction to trigger any @@ -7997,7 +8190,7 @@ echo "$ac_t""$gcc_cv_as_dwarf2_debug_line" 1>&6 echo $ac_n "checking assembler --gdwarf2 support""... $ac_c" 1>&6 -echo "configure:8001: checking assembler --gdwarf2 support" >&5 +echo "configure:8194: checking assembler --gdwarf2 support" >&5 gcc_cv_as_gdwarf2_flag=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then @@ -8026,7 +8219,7 @@ echo "$ac_t""$gcc_cv_as_gdwarf2_flag" 1>&6 echo $ac_n "checking assembler --gstabs support""... $ac_c" 1>&6 -echo "configure:8030: checking assembler --gstabs support" >&5 +echo "configure:8223: checking assembler --gstabs support" >&5 gcc_cv_as_gstabs_flag=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then @@ -8061,7 +8254,7 @@ echo "$ac_t""$gcc_cv_as_gstabs_flag" 1>&6 echo $ac_n "checking linker read-only and read-write section mixing""... $ac_c" 1>&6 -echo "configure:8065: checking linker read-only and read-write section mixing" >&5 +echo "configure:8258: checking linker read-only and read-write section mixing" >&5 gcc_cv_ld_ro_rw_mix=unknown if test x$gcc_cv_gld_major_version != x -a x$gcc_cv_gld_minor_version != x; then if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 10 -o "$gcc_cv_gld_major_version" -gt 2 && grep 'EMUL = elf' ../ld/Makefile > /dev/null; then @@ -8099,7 +8292,7 @@ echo "$ac_t""$gcc_cv_ld_ro_rw_mix" 1>&6 echo $ac_n "checking linker PT_GNU_EH_FRAME support""... $ac_c" 1>&6 -echo "configure:8103: checking linker PT_GNU_EH_FRAME support" >&5 +echo "configure:8296: checking linker PT_GNU_EH_FRAME support" >&5 gcc_cv_ld_eh_frame_hdr=no if test x$gcc_cv_gld_major_version != x -a x$gcc_cv_gld_minor_version != x; then if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 12 -o "$gcc_cv_gld_major_version" -gt 2 && grep 'EMUL = elf' ../ld/Makefile > /dev/null; then @@ -8144,7 +8337,7 @@ case "$target" in mips*-*-*) echo $ac_n "checking whether libgloss uses STARTUP directives consistently""... $ac_c" 1>&6 -echo "configure:8127: checking whether libgloss uses STARTUP directives consistently" >&5 +echo "configure:8320: checking whether libgloss uses STARTUP directives consistently" >&5 gcc_cv_mips_libgloss_startup=no gcc_cv_libgloss_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/libgloss if test "x$exec_prefix" = xNONE; then @@ -8349,7 +8542,7 @@ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:8332: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:8525: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -8590,6 +8783,18 @@ objdir=`${PWDCMD-pwd}` +# Test if command-line help was enabled +if [ "x${enable_clh}" = xyes ]; then + echo "Including GCC Command-Line Help" + host_extra_gcc_objs="$host_extra_gcc_objs clh${objext}" + gcc_clh_libs=-ltermcap + gcc_clh_cflags=-DCLH + gcc_clh_gcc="clh_gcc"${objext} + gcc_clh_cpp="clh_cpp"${objext} + gcc_clh_g77="clh_g77"${objext} + gcc_clh_gcj="clh_gcj"${objext} +fi + # Process the language and host/target makefile fragments. ${CONFIG_SHELL-/bin/sh} $srcdir/configure.frag $srcdir "$subdirs" "$dep_host_xmake_file" "$dep_tmake_file" @@ -8662,6 +8867,12 @@ + + + + + + # Echo that links are built if test x$host = x$target then @@ -8773,6 +8984,9 @@ # Generated automatically by configure. # Run this file to recreate the current configuration. # This directory was configured as follows, +EOF +echo ': ${CONFIG_SHELL='"${CONFIG_SHELL-/bin/sh}"'}' >> $CONFIG_STATUS +cat >> $CONFIG_STATUS </dev/null | sed 1q`: # # $0 $ac_configure_args @@ -8797,6 +9011,7 @@ done ac_given_srcdir=$srcdir +PATHIFS="$PATH_IFS" trap 'rm -fr `echo "$all_outputs auto-host.h:config.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF @@ -8807,6 +9022,7 @@ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub +s,\([^a-zA-Z0-9:]\)/bin/sh\(.exe\),\1${CONFIG_SHELL-/bin/sh}\2,g s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g @@ -8830,6 +9046,8 @@ s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g +s%@PATH_IFS@%$PATH_IFS%g +s%@EXEEXT@%$EXEEXT%g s%@TARGET_SYSTEM_ROOT@%$TARGET_SYSTEM_ROOT%g s%@TARGET_SYSTEM_ROOT_DEFINE@%$TARGET_SYSTEM_ROOT_DEFINE%g s%@CROSS_SYSTEM_HEADER_DIR@%$CROSS_SYSTEM_HEADER_DIR%g @@ -8966,6 +9184,12 @@ s%@gcc_version@%$gcc_version%g s%@gcc_version_full@%$gcc_version_full%g s%@gcc_version_trigger@%$gcc_version_trigger%g +s%@gcc_clh_libs@%$gcc_clh_libs%g +s%@gcc_clh_cflags@%$gcc_clh_cflags%g +s%@gcc_clh_gcc@%$gcc_clh_gcc%g +s%@gcc_clh_cpp@%$gcc_clh_cpp%g +s%@gcc_clh_g77@%$gcc_clh_g77%g +s%@gcc_clh_gcj@%$gcc_clh_gcj%g s%@host_exeext@%$host_exeext%g s%@host_extra_gcc_objs@%$host_extra_gcc_objs%g s%@host_xm_file_list@%$host_xm_file_list%g @@ -9072,7 +9296,8 @@ .) srcdir=. if test -z "$ac_dots"; then top_srcdir=. else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + [/\\]* | [a-zA-Z]:*) + srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; *) # Relative path. srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" top_srcdir="$ac_dots$ac_given_srcdir" ;; @@ -9088,7 +9313,7 @@ *) ac_comsub= ;; esac - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%$PATHIFS% $ac_given_srcdir/%g"` sed -e "$ac_comsub s%@configure_input@%$configure_input%g s%@srcdir@%$srcdir%g @@ -9134,7 +9359,9 @@ echo creating $ac_file rm -f conftest.frag conftest.in conftest.out - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` +# kso the other way around might work better with drive letters and such. +# ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + ac_file_inputs=`echo $ac_file_in|sed -e "s%:% $ac_given_srcdir/%g" -e "s%^%$ac_given_srcdir/%" ` cat $ac_file_inputs > conftest.in EOF Index: src/gcc/gcc/configure.in =================================================================== RCS file: /gccos2/src/gcc/gcc/configure.in,v retrieving revision 1.1.1.3 retrieving revision 1.6 diff -w -u -r1.1.1.3 -r1.6 --- src/gcc/gcc/configure.in 7 Sep 2004 01:26:15 -0000 1.1.1.3 +++ src/gcc/gcc/configure.in 8 Sep 2004 00:03:17 -0000 1.6 @@ -511,6 +511,10 @@ ], [enable_shared=yes]) AC_SUBST(enable_shared) +# Enable command-line help +AC_ARG_ENABLE(clh, +[ --enable-clh enable GCC command-line help (+~90K executable!)]) + # Stage specific cflags for build. stage1_cflags= case $build in @@ -2894,6 +2898,18 @@ objdir=`${PWDCMD-pwd}` AC_SUBST(objdir) +# Test if command-line help was enabled +if [[ "x${enable_clh}" = xyes ]]; then + echo "Including GCC Command-Line Help" + host_extra_gcc_objs="$host_extra_gcc_objs clh${objext}" + gcc_clh_libs=-ltermcap + gcc_clh_cflags=-DCLH + gcc_clh_gcc="clh_gcc"${objext} + gcc_clh_cpp="clh_cpp"${objext} + gcc_clh_g77="clh_g77"${objext} + gcc_clh_gcj="clh_gcj"${objext} +fi + # Process the language and host/target makefile fragments. ${CONFIG_SHELL-/bin/sh} $srcdir/configure.frag $srcdir "$subdirs" "$dep_host_xmake_file" "$dep_tmake_file" @@ -2931,6 +2947,12 @@ AC_SUBST(gcc_version) AC_SUBST(gcc_version_full) AC_SUBST(gcc_version_trigger) +AC_SUBST(gcc_clh_libs) +AC_SUBST(gcc_clh_cflags) +AC_SUBST(gcc_clh_gcc) +AC_SUBST(gcc_clh_cpp) +AC_SUBST(gcc_clh_g77) +AC_SUBST(gcc_clh_gcj) AC_SUBST(host_exeext) AC_SUBST(host_extra_gcc_objs) AC_SUBST(host_xm_file_list) Index: src/gcc/gcc/cppdefault.c =================================================================== RCS file: /gccos2/src/gcc/gcc/cppdefault.c,v retrieving revision 1.1.1.2 retrieving revision 1.4 diff -w -u -r1.1.1.2 -r1.4 --- src/gcc/gcc/cppdefault.c 27 Apr 2004 18:38:05 -0000 1.1.1.2 +++ src/gcc/gcc/cppdefault.c 2 May 2004 06:57:33 -0000 1.4 @@ -26,6 +26,8 @@ #include "system.h" #include "cppdefault.h" +/* GCC-OS2: Added a few more configuration options so we can automagically + rewrite /gcc/ to whereever we're installed for all of the dirs we use. */ const struct default_include cpp_include_defaults[] #ifdef INCLUDE_DEFAULTS = INCLUDE_DEFAULTS; @@ -45,10 +47,10 @@ #endif #ifdef LOCAL_INCLUDE_DIR /* /usr/local/include comes before the fixincluded header files. */ - { LOCAL_INCLUDE_DIR, 0, 0, 1, 1 }, + { LOCAL_INCLUDE_DIR, LOCAL_INCLUDE_COMPONENT, 0, 1, 1 }, #endif #ifdef PREFIX_INCLUDE_DIR - { PREFIX_INCLUDE_DIR, 0, 0, 1, 0 }, + { PREFIX_INCLUDE_DIR, PREFIX_INCLUDE_COMPONENT, 0, 1, 0 }, #endif #ifdef GCC_INCLUDE_DIR /* This is the dir for fixincludes and for gcc's private headers. */ @@ -64,11 +66,11 @@ #endif #ifdef SYSTEM_INCLUDE_DIR /* Some systems have an extra dir of include files. */ - { SYSTEM_INCLUDE_DIR, 0, 0, 0, 1 }, + { SYSTEM_INCLUDE_DIR, SYSTEM_INCLUDE_COMPONENT, 0, 0, SYSTEM_INCLUDE_SYSROOT }, #endif #ifdef STANDARD_INCLUDE_DIR /* /usr/include comes dead last. */ - { STANDARD_INCLUDE_DIR, STANDARD_INCLUDE_COMPONENT, 0, 0, 1 }, + { STANDARD_INCLUDE_DIR, STANDARD_INCLUDE_COMPONENT, 0, 0, STANDARD_INCLUDE_SYSROOT }, #endif { 0, 0, 0, 0, 0 } }; Index: src/gcc/gcc/cppdefault.h =================================================================== RCS file: /gccos2/src/gcc/gcc/cppdefault.h,v retrieving revision 1.1.1.2 retrieving revision 1.4 diff -w -u -r1.1.1.2 -r1.4 --- src/gcc/gcc/cppdefault.h 27 Apr 2004 18:38:05 -0000 1.1.1.2 +++ src/gcc/gcc/cppdefault.h 2 May 2004 06:57:26 -0000 1.4 @@ -34,6 +34,28 @@ #define STANDARD_INCLUDE_COMPONENT 0 #endif +/* GCC-OS2: Additional configuration options. */ +#ifndef STANDARD_INCLUDE_SYSROOT +#define STANDARD_INCLUDE_SYSROOT 1 +#endif + +#ifndef SYSTEM_INCLUDE_COMPONENT +#define SYSTEM_INCLUDE_COMPONENT 0 +#endif + +#ifndef SYSTEM_INCLUDE_SYSROOT +#define SYSTEM_INCLUDE_SYSROOT 1 +#endif + +#ifndef LOCAL_INCLUDE_COMPONENT +#define LOCAL_INCLUDE_COMPONENT 0 +#endif + +#ifndef PREFIX_INCLUDE_COMPONENT +#define PREFIX_INCLUDE_COMPONENT 0 +#endif +/* GCC-OS2: end */ + #if defined (CROSS_COMPILE) && !defined (TARGET_SYSTEM_ROOT) # undef LOCAL_INCLUDE_DIR # undef SYSTEM_INCLUDE_DIR Index: src/gcc/gcc/cppinit.c =================================================================== RCS file: /gccos2/src/gcc/gcc/cppinit.c,v retrieving revision 1.1.1.3 retrieving revision 1.5 diff -w -u -r1.1.1.3 -r1.5 --- src/gcc/gcc/cppinit.c 7 Sep 2004 01:26:20 -0000 1.1.1.3 +++ src/gcc/gcc/cppinit.c 8 Sep 2004 00:03:17 -0000 1.5 @@ -35,7 +35,7 @@ # define INO_T_EQ(A, B) (!memcmp (&(A), &(B), sizeof (A))) # define INO_T_COPY(DEST, SRC) memcpy(&(DEST), &(SRC), sizeof (SRC)) #else -# if (defined _WIN32 && ! defined (_UWIN)) || defined __MSDOS__ +# if (defined _WIN32 && ! defined (_UWIN)) || defined __MSDOS__ || defined __EMX__ # define INO_T_EQ(A, B) 0 # else # define INO_T_EQ(A, B) ((A) == (B)) Index: src/gcc/gcc/cppmain.c =================================================================== RCS file: /gccos2/src/gcc/gcc/cppmain.c,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -w -u -r1.1.1.2 -r1.3 Index: src/gcc/gcc/dbxout.c =================================================================== RCS file: /gccos2/src/gcc/gcc/dbxout.c,v retrieving revision 1.1.1.3 retrieving revision 1.8 diff -w -u -r1.1.1.3 -r1.8 --- src/gcc/gcc/dbxout.c 7 Sep 2004 01:26:45 -0000 1.1.1.3 +++ src/gcc/gcc/dbxout.c 8 Sep 2004 00:03:17 -0000 1.8 @@ -672,7 +672,13 @@ tree decl; { if (TREE_CODE (decl) == VAR_DECL +#ifdef EMX /* bird: debug info for all referenced global vars. */ + && ( !DECL_EXTERNAL (decl) + || ( use_gnu_debug_info_extensions + && TREE_SYMBOL_REFERENCED (DECL_NAME (decl)))) +#else && ! DECL_EXTERNAL (decl) +#endif && DECL_RTL_SET_P (decl)) /* Not necessary? */ dbxout_symbol (decl, 0); } @@ -1676,6 +1682,13 @@ /* We must use the same test here as we use in the DBX_NO_XREFS case above. We simplify it a bit since an enum will never have a variable size. */ +#ifdef EMX + /* bird: I believe this test is wrong. The test above checks if we + already used gnu extenstions and gathers that it's ok to continue + do non-standard stuff then. + Anyway, we can't cope with crossreferences to enums. */ + if (!use_gnu_debug_info_extensions) +#endif if ((TYPE_NAME (type) != 0 && ! (TREE_CODE (TYPE_NAME (type)) == TYPE_DECL && DECL_IGNORED_P (TYPE_NAME (type))) @@ -2163,10 +2176,19 @@ case VAR_DECL: if (! DECL_RTL_SET_P (decl)) return 0; +#ifdef EMX + /* Don't mention a variable that is external and unreferenced.. + bird: Referenced variables must be mentioned for OMF support. */ + if (DECL_EXTERNAL (decl) + && ( !use_gnu_debug_info_extensions + || !TREE_SYMBOL_REFERENCED (DECL_NAME (decl)))) + break; +#else /* Don't mention a variable that is external. Let the file that defines it describe it. */ if (DECL_EXTERNAL (decl)) break; +#endif /* If the variable is really a constant and not written in memory, inform the debugger. */ @@ -2281,6 +2303,34 @@ { letter = 'G'; current_sym_code = N_GSYM; +#ifdef EMX + /* bird: Two hacks. + 1) Get right address for globals. We're using the value field of + the entry for this. This makes the following code work: + class foo { foo() {static const char *psz= "foo";} }; + 2) Hack 1 doesn't work for external or communal data. They would + both require a fixup of the stabs value to work - which a.out + naturally doesn't support (ELF does though). + So, what we'll do is to make an extra entry before the 'G' + entry which tells us the symbol name. + In this case the value of the 'G' entry is -12357. */ + if (use_gnu_debug_info_extensions) + { + current_sym_addr = XEXP (home, 0); + if (DECL_EXTERNAL (decl) || DECL_COMMON (decl)) + { + fprintf (asmfile, "\t.stabs\t\""); + output_addr_const (asmfile, current_sym_addr); +#if 0 + fprintf (asmfile, "\",%d,0,0,0\n", /*N_EXT | N_UNDF*/1); +#else + fprintf (asmfile, "\",%d,0,0,0\n", /*extension*/ 0xfe); +#endif + current_sym_addr = 0; + current_sym_value = -12357; + } + } +#endif } else { Index: src/gcc/gcc/dwarf2out.c =================================================================== RCS file: /gccos2/src/gcc/gcc/dwarf2out.c,v retrieving revision 1.1.1.3 retrieving revision 1.4 diff -w -u -r1.1.1.3 -r1.4 Index: src/gcc/gcc/emx-nextstage =================================================================== RCS file: src/gcc/gcc/emx-nextstage diff -N src/gcc/gcc/emx-nextstage --- nul 1 Jan 1970 00:00:00 -0000 +++ src/gcc/gcc/emx-nextstage 11 Sep 2003 19:33:14 -0000 1.4 @@ -0,0 +1,90 @@ +#!/bin/sh +#======================================================== +# This script will build a next stage GCC for EMX target +# If run first time, it will produce a stage1 compiler, +# second time - a stage2 compiler and so on. +#======================================================== + +# NOTE: The optimal configuration for gcc under OS2/EMX is: +# ./configure --enable-clh --enable-threads --disable-shared --prefix=/emx +# Also append --without-included-gettext if you have the gettext headers +# and library (used with some XFree86 apps, for example). You also should +# export the GMSGFMT variable + +CWD=`pwd` +log='emx-build.log' +emxload -q +export GCCLOAD=1 + +[ -z "$SHELL" ] && SHELL=$BASH +[ -z "$SHELL" ] && SHELL=sh + +# Find gcc directory +gccdir=`which gcc` +gccdir=`dirname $gccdir` +gccdir=`dirname $gccdir` +[ -z "$gccdir" ] && gccdir=/emx + +# The compilation will fail if we have toolkit in C_INCLUDE_PATH +unset C_INCLUDE_PATH +export C_INCLUDE_PATH=$gccdir/include + +for stage in 4 3 2 1 0; do + if [ ${stage} -eq 0 ]; then + stagedir='./' + CC=gcc + stageCC=gcc + else + stagedir=${CWD}/stage${stage}'/' + CC=${stagedir}xgcc.exe + stageCC="${stagedir}xgcc.exe -L${stagedir} -B${stagedir}" + fi + if [ ${stage} -lt 2 ]; then + CFLAGS="-g" + if [ ${stage} -lt 1 ]; then + LDFLAGS="-Zexe" + else + LDFLAGS="-Zexe -B$gccdir/lib" + fi + else + ### gcc 3.0 cannot complete stage 2 with -fomit-frame-pointer! :-( ### + CFLAGS="-s -O2 -mcpu=pentium -mpreferred-stack-boundary=2 -falign-loops=2 -falign-jumps=2 -falign-functions=2 -malign-strings=0" + LDFLAGS="-Zexe -Zcrtdll -B$gccdir/lib" + fi + if [ ${stage} -eq 0 ]; then + LANGUAGES="c" + else +# LANGUAGES='c gcov.exe $(CONFIG_LANGUAGES)' + LANGUAGES='c gcov.exe c++' + fi + if [ ${stage} = 0 ] || [ -f ${CC} ]; then + if [ $stage = 4 ]; then + echo "All done" + exit 0; + fi + echo "----------------------------------------------------------------------" + echo " Doing stage `expr ${stage} + 1` build using stage ${stage} compiler" + echo "Building the following targets: ${LANGUAGES}" + echo "----------------------------------------------------------------------" + + make SHELL=$SHELL CC="${stageCC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ + OLDCC="gcc -O6 -mno-stack-align-double -s" OLDCFLAGS= \ + LOOSE_WARN="-W -Wall -Wwrite-strings -Wstrict-prototypes" \ + LANGUAGES="${LANGUAGES}" $* 2>&1 | tee $log + + if ! tail -1 $log | grep -q "Error"; then + echo -n "Compilation finished succesfully. Finish this stage? [Y/N] " + read answer + case $answer in + [yY] | [yY][eE][sSzZaA] | [oO][kK] | [oO][kK][aA][yY] | [jJ][aA] | [dD][aA] | [¤„| €]) + emxload -q + stage=`expr ${stage} + 1` + make SHELL=$SHELL stage${stage} + ;; + esac + fi + break; + fi +done + +exit Index: src/gcc/gcc/expr.c =================================================================== RCS file: /gccos2/src/gcc/gcc/expr.c,v retrieving revision 1.1.1.3 retrieving revision 1.4 diff -w -u -r1.1.1.3 -r1.4 --- src/gcc/gcc/expr.c 7 Sep 2004 01:27:18 -0000 1.1.1.3 +++ src/gcc/gcc/expr.c 8 Sep 2004 00:03:17 -0000 1.4 @@ -4210,7 +4210,7 @@ since it might be a promoted variable where the zero- or sign- extension needs to be done. Handling this in the normal way is safe because no computation is done before the call. */ - if (TREE_CODE (from) == CALL_EXPR && ! aggregate_value_p (from) + if (TREE_CODE (from) == CALL_EXPR && ! aggregate_value_p2 (from, from) /* bird: #631: return struct */ && TREE_CODE (TYPE_SIZE (TREE_TYPE (from))) == INTEGER_CST && ! ((TREE_CODE (to) == VAR_DECL || TREE_CODE (to) == PARM_DECL) && GET_CODE (DECL_RTL (to)) == REG)) Index: src/gcc/gcc/fix-header.c =================================================================== RCS file: /gccos2/src/gcc/gcc/fix-header.c,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -w -u -r1.1.1.2 -r1.3 --- src/gcc/gcc/fix-header.c 27 Apr 2004 18:38:05 -0000 1.1.1.2 +++ src/gcc/gcc/fix-header.c 28 Apr 2004 04:57:40 -0000 1.3 @@ -1075,6 +1075,10 @@ long int inf_size; struct symbol_list *cur_symbols; +#if defined (__EMX__) + return 0; // fix-header does only harm to emx` includes +#endif + if (argv[0] && argv[0][0]) { char *p; Index: src/gcc/gcc/function.c =================================================================== RCS file: /gccos2/src/gcc/gcc/function.c,v retrieving revision 1.1.1.3 retrieving revision 1.6 diff -w -u -r1.1.1.3 -r1.6 --- src/gcc/gcc/function.c 7 Sep 2004 01:28:15 -0000 1.1.1.3 +++ src/gcc/gcc/function.c 8 Sep 2004 00:03:17 -0000 1.6 @@ -4294,10 +4294,26 @@ function or get an address back from the function. EXP may be a type node or an expression (whose type is tested). */ +/* bird: #631: We need this change now to get _System and _Optlink working on + the EMX target. In the CVS trunk aggregate_value_p is extended with fntype + so this hack will eventually go away. */ +#ifdef RETURN_IN_MEMORY_WITH_FNTYPE int aggregate_value_p (exp) tree exp; { + return aggregate_value_p2 (exp, NULL_TREE); +} + +int +aggregate_value_p2 (exp, fntype) + tree exp, fntype; +#else +int +aggregate_value_p (exp) + tree exp; +#endif +{ int i, regno, nregs; rtx reg; @@ -4305,6 +4321,10 @@ if (TREE_CODE (type) == VOID_TYPE) return 0; + #ifdef RETURN_IN_MEMORY_WITH_FNTYPE /* bird: #631: return struct */ + if (RETURN_IN_MEMORY_WITH_FNTYPE(type, fntype)) + return 1; + #endif if (RETURN_IN_MEMORY (type)) return 1; /* Types that are TREE_ADDRESSABLE must be constructed in memory, @@ -4390,7 +4410,7 @@ stack_args_size.var = 0; /* If struct value address is treated as the first argument, make it so. */ - if (aggregate_value_p (DECL_RESULT (fndecl)) + if (aggregate_value_p2 (DECL_RESULT (fndecl), fndecl) /* bird: #631: return struct */ && ! current_function_returns_pcc_struct && struct_value_incoming_rtx == 0) { @@ -6428,7 +6448,7 @@ emit_note (NULL, NOTE_INSN_DELETED); /* Set flags used by final.c. */ - if (aggregate_value_p (DECL_RESULT (subr))) + if (aggregate_value_p2 (DECL_RESULT (subr), subr)) /* bird: #631: return struct */ { #ifdef PCC_STATIC_STRUCT_RETURN current_function_returns_pcc_struct = 1; @@ -6593,7 +6613,7 @@ before any library calls that assign parms might generate. */ /* Decide whether to return the value in memory or in a register. */ - if (aggregate_value_p (DECL_RESULT (subr))) + if (aggregate_value_p2 (DECL_RESULT (subr), subr)) /* bird: #631: return struct */ { /* Returning something that won't go in a register. */ rtx value_address = 0; Index: src/gcc/gcc/gcc.c =================================================================== RCS file: /gccos2/src/gcc/gcc/gcc.c,v retrieving revision 1.1.1.3 retrieving revision 1.5 diff -w -u -r1.1.1.3 -r1.5 --- src/gcc/gcc/gcc.c 7 Sep 2004 01:28:20 -0000 1.1.1.3 +++ src/gcc/gcc/gcc.c 8 Sep 2004 00:03:17 -0000 1.5 @@ -338,7 +338,7 @@ const char *, const char *, const char *)); #endif -#if defined(HAVE_TARGET_OBJECT_SUFFIX) || defined(HAVE_TARGET_EXECUTABLE_SUFFIX) +#if (defined(HAVE_TARGET_OBJECT_SUFFIX) || defined(HAVE_TARGET_EXECUTABLE_SUFFIX)) && !defined (NO_FORCE_EXEOBJ_SUFFIX) static const char *convert_filename PARAMS ((const char *, int, int)); #endif @@ -1009,6 +1009,9 @@ {"--warn-", "-W", "*j"}, {"--write-dependencies", "-MD", 0}, {"--write-user-dependencies", "-MMD", 0}, +#ifdef CLH + {"--help", "-h", "oj"}, +#endif {"--", "-f", "*j"} }; @@ -1737,8 +1740,11 @@ static int signal_count; /* Name with which this program was invoked. */ - +#ifdef CLH +const char *programname; +#else static const char *programname; +#endif /* Allocate the argument vector. */ @@ -2879,7 +2885,7 @@ /* Gives value to pass as "warn" to add_prefix for standard prefixes. */ static int *warn_std_ptr = 0; -#if defined(HAVE_TARGET_OBJECT_SUFFIX) || defined(HAVE_TARGET_EXECUTABLE_SUFFIX) +#if (defined(HAVE_TARGET_OBJECT_SUFFIX) || defined(HAVE_TARGET_EXECUTABLE_SUFFIX)) && !defined (NO_FORCE_EXEOBJ_SUFFIX) /* Convert NAME to a new name if it is the standard suffix. DO_EXE is true if we should look for an executable suffix. DO_OBJ @@ -3252,6 +3258,7 @@ } } +#ifndef __EMX__ /* Under OS/2 (__EMX__) LPATH is used in LANManager client & server */ /* Use LPATH like LIBRARY_PATH (for the CMU build program). */ GET_ENVIRONMENT (temp, "LPATH"); if (temp && *cross_compile == '0') @@ -3284,6 +3291,7 @@ endp++; } } +#endif /* not __EMX__ */ /* Convert new-style -- options to old-style. */ translate_options (&argc, (const char *const **) &argv); @@ -3485,6 +3493,14 @@ verbose_only_flag++; verbose_flag++; } +#ifdef CLH + else if (! strncmp (argv[i], "-h", 2)) + { + extern int clh_display (const char *text, const char *selector); + extern char *gcc_clh_text; + exit (clh_display (gcc_clh_text, &argv[i][2])); + } +#endif /* CLH */ else if (argv[i][0] == '-' && argv[i][1] != 0) { const char *p = &argv[i][1]; @@ -3582,6 +3598,7 @@ case 'o': have_o = 1; +#ifndef NO_FORCE_EXEOBJ_SUFFIX #if defined(HAVE_TARGET_EXECUTABLE_SUFFIX) if (! have_c) { @@ -3617,6 +3634,7 @@ else argv[i] = convert_filename (argv[i], ! have_c, 0); #endif +#endif goto normal_switch; default: @@ -3684,14 +3702,12 @@ (such as cpp) rather than those of the host system. */ /* Use 2 as fourth arg meaning try just the machine as a suffix, as well as trying the machine and the version. */ -#ifndef OS2 add_prefix (&exec_prefixes, standard_exec_prefix, "GCC", PREFIX_PRIORITY_LAST, 1, warn_std_ptr, 0); add_prefix (&exec_prefixes, standard_exec_prefix, "BINUTILS", PREFIX_PRIORITY_LAST, 2, warn_std_ptr, 0); add_prefix (&exec_prefixes, standard_exec_prefix_1, "BINUTILS", PREFIX_PRIORITY_LAST, 2, warn_std_ptr, 0); -#endif add_prefix (&startfile_prefixes, standard_exec_prefix, "BINUTILS", PREFIX_PRIORITY_LAST, 1, warn_std_ptr, 0); @@ -3954,7 +3970,7 @@ } else { -#ifdef HAVE_TARGET_OBJECT_SUFFIX +#if defined (HAVE_TARGET_OBJECT_SUFFIX) && !defined (NO_FORCE_EXEOBJ_SUFFIX) argv[i] = convert_filename (argv[i], 0, access (argv[i], F_OK)); #endif @@ -6283,7 +6299,11 @@ } if (n_infiles == added_libraries) +#ifdef CLH + fatal ("no input files, try \"%s --help\"", programname); +#else fatal ("no input files"); +#endif /* Make a place to record the compiler output file names that correspond to the input files. */ Index: src/gcc/gcc/genattrtab.c =================================================================== RCS file: /gccos2/src/gcc/gcc/genattrtab.c,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -w -u -r1.1.1.2 -r1.3 --- src/gcc/gcc/genattrtab.c 27 Apr 2004 18:38:05 -0000 1.1.1.2 +++ src/gcc/gcc/genattrtab.c 28 Apr 2004 04:57:40 -0000 1.3 @@ -6039,6 +6039,11 @@ rtx tem; int i; +#ifdef EMX + /* Otherwise we can't use more than 32Mb memory and genattrtab uses a lot */ + _uflags (_UF_SBRK_MODEL, _UF_SBRK_ARBITRARY); +#endif + progname = "genattrtab"; if (argc <= 1) Index: src/gcc/gcc/genmultilib =================================================================== RCS file: /gccos2/src/gcc/gcc/genmultilib,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -w -u -r1.1.1.1 -r1.2 --- src/gcc/gcc/genmultilib 16 Apr 2003 10:10:14 -0000 1.1.1.1 +++ src/gcc/gcc/genmultilib 16 Apr 2003 14:03:38 -0000 1.2 @@ -40,6 +40,9 @@ # elements in the second list are separated by spaces. If the second # argument is empty, the option names will be used as the directory # names. +# If number of elements in second argument is bigger than number of options +# in the first argument, the n+1'th element is used as default directory +# name (i.e. when no one of options specified in argument 1 was used) # The optional third argument is a list of options which are # identical. The elements in the list are separated by spaces. Each @@ -236,6 +239,12 @@ done fi +# See if default directory was specified +if [ -n "$1" ]; then + defaultdir="$1" +else + defaultdir="." +fi # We need another recursive shell script to correctly handle positive # matches. If we are invoked as # genmultilib "opt1 opt2" "" "opt1=nopt1 opt2=nopt2" @@ -275,7 +284,7 @@ done done optout=`echo ${optout} | sed -e 's/^ //'` -echo "\". ${optout};\"," +echo "\"${defaultdir} ${optout};\"," # Work over the list of combinations. We have to translate each one # to use the directory names rather than the option names, we have to Index: src/gcc/gcc/gthr-os2.h =================================================================== RCS file: src/gcc/gcc/gthr-os2.h diff -N src/gcc/gcc/gthr-os2.h --- nul 1 Jan 1970 00:00:00 -0000 +++ src/gcc/gcc/gthr-os2.h 29 Apr 2004 04:33:48 -0000 1.3 @@ -0,0 +1,139 @@ +/* Threads compatibily routines for libgcc2. */ +/* Compile this one with gcc. */ +/* Copyright (C) 1997 Free Software Foundation, Inc. + +This file is part of GNU CC. + +GNU CC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU CC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU CC; see the file COPYING. If not, write to +the Free Software Foundation, 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +/* As a special exception, if you link this library with other files, + some of which are compiled with GCC, to produce an executable, + this library does not by itself cause the resulting executable + to be covered by the GNU General Public License. + This exception does not however invalidate any other reasons why + the executable file might be covered by the GNU General Public License. */ + +#ifndef __gthr_os2_h +#define __gthr_os2_h + +#ifdef _LIBOBJC +#error "gthr-os2.h doesn't implement the _LIBOBJC mode!" +#endif + +#define __GTHREADS 1 + +/* OS/2 threads specific definitions */ + +#include +#include +#include +#include +#include +#include + +typedef int __gthread_key_t; +typedef volatile signed char __gthread_once_t; +typedef _fmutex __gthread_mutex_t; + +#define __GTHREAD_ONCE_INIT 0 +#define __GTHREAD_MUTEX_INIT_FUNCTION __gthread_mutex_init_function + +static inline int +__gthread_active_p (void) +{ + return 1; +} + +static inline int +__gthread_once (__gthread_once_t *once, void (*func) (void)) +{ + if (once == NULL || func == NULL) + return EINVAL; + if (__cxchg (once, 1) == 0) + func (); + return 0; +} + +static inline void +__gthread_mutex_init_function (__gthread_mutex_t *mutex) +{ + _fmutex_create (mutex, 0); +} + +static inline int +__gthread_mutex_lock (__gthread_mutex_t *mutex) +{ + return _fmutex_request (mutex, _FMR_IGNINT); +} + +static inline int +__gthread_mutex_trylock (__gthread_mutex_t *mutex) +{ + return _fmutex_request (mutex, _FMR_IGNINT | _FMR_NOWAIT); +} + +static inline int +__gthread_mutex_unlock (__gthread_mutex_t *mutex) +{ + return _fmutex_release (mutex); +} + +static inline int +__gthread_key_create (__gthread_key_t *key, void (*dtor) (void *)) +{ + int iTLS = __libc_TLSAlloc(); + if (iTLS < 0) + return errno; + __libc_TLSDestructor(iTLS, (void (*)(void *, int, unsigned))dtor, 0); + *key = iTLS; + return 0; +} + +static inline int +__gthread_key_dtor (__gthread_key_t key, void *ptr) +{ + void (*pfnDestructor)(void *pvValue, int iTLSIndex, unsigned fFlags) = __libc_TLSGetDestructor(key, NULL); + if (pfnDestructor) + { + pfnDestructor(ptr, key, 0); + __libc_TLSSet(key, NULL); + } + return 0; +} + +static inline int +__gthread_key_delete (__gthread_key_t key) +{ + if (__libc_TLSFree(key)) + return errno; + return 0; +} + +static inline void * +__gthread_getspecific (__gthread_key_t key) +{ + return __libc_TLSGet(key); +} + +static inline int +__gthread_setspecific (__gthread_key_t key, const void *ptr) +{ + if (__libc_TLSSet(key, (void *)ptr)) + return errno; + return 0; +} + +#endif /* not __gthr_os2_h */ Index: src/gcc/gcc/gthr.h =================================================================== RCS file: /gccos2/src/gcc/gcc/gthr.h,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -w -u -r1.1.1.2 -r1.3 --- src/gcc/gcc/gthr.h 27 Apr 2004 18:38:05 -0000 1.1.1.2 +++ src/gcc/gcc/gthr.h 28 Apr 2004 04:57:40 -0000 1.3 @@ -78,6 +78,7 @@ POSIX threads with -D_PTHREADS DCE threads with -D_DCE_THREADS Solaris/UI threads with -D_SOLARIS_THREADS + OS/2 threads with -D_OS2_THREADS */ /* Check first for thread specific defines. */ @@ -87,6 +88,8 @@ #include "gthr-dce.h" #elif _SOLARIS_THREADS #include "gthr-solaris.h" +#elif _OS2_THREADS +#include "gthr-os2.h" /* Include GTHREAD_FILE if one is defined. */ #elif defined(HAVE_GTHR_DEFAULT) Index: src/gcc/gcc/integrate.c =================================================================== RCS file: /gccos2/src/gcc/gcc/integrate.c,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -w -u -r1.1.1.2 -r1.3 --- src/gcc/gcc/integrate.c 27 Apr 2004 18:38:05 -0000 1.1.1.2 +++ src/gcc/gcc/integrate.c 28 Apr 2004 04:57:40 -0000 1.3 @@ -1036,7 +1036,7 @@ else { if (! structure_value_addr - || ! aggregate_value_p (DECL_RESULT (fndecl))) + || ! aggregate_value_p2 (DECL_RESULT (fndecl), fndecl)) /* bird: #631: return struct */ abort (); /* Pass the function the address in which to return a structure @@ -1291,7 +1291,7 @@ out of the temp register into a BLKmode memory object. */ if (target && TYPE_MODE (TREE_TYPE (TREE_TYPE (fndecl))) == BLKmode - && ! aggregate_value_p (TREE_TYPE (TREE_TYPE (fndecl)))) + && ! aggregate_value_p2 (TREE_TYPE (TREE_TYPE (fndecl)), fndecl)) /* bird: #631: return struct */ target = copy_blkmode_from_reg (0, target, TREE_TYPE (TREE_TYPE (fndecl))); if (structure_value_addr) Index: src/gcc/gcc/langhooks.c =================================================================== RCS file: /gccos2/src/gcc/gcc/langhooks.c,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -w -u -r1.1.1.2 -r1.2 --- src/gcc/gcc/langhooks.c 27 Apr 2004 18:38:05 -0000 1.1.1.2 +++ src/gcc/gcc/langhooks.c 28 Apr 2004 04:57:40 -0000 1.2 @@ -32,6 +32,12 @@ #include "langhooks.h" #include "langhooks-def.h" +/* Provide a dummy target-specific name mangling hook */ +#ifndef TARGET_C_SET_DECL_ASSEMBLER_NAME +#define TARGET_C_SET_DECL_ASSEMBLER_NAME(decl) 0 +#endif + + /* Do nothing; in many cases the default hook. */ void @@ -162,12 +168,17 @@ && (TREE_STATIC (decl) || DECL_EXTERNAL (decl) || TREE_PUBLIC (decl)))) + { + /* GCCOS2: Some targets may want to apply special mangling + depending on certain attributes etc (e.g. stdcall). */ + if (!TARGET_C_SET_DECL_ASSEMBLER_NAME (decl)) /* By default, assume the name to use in assembly code is the same as that used in the source language. (That's correct for C, and GCC used to set DECL_ASSEMBLER_NAME to the same value as DECL_NAME in build_decl, so this choice provides backwards compatibility with existing front-ends. */ SET_DECL_ASSEMBLER_NAME (decl, DECL_NAME (decl)); + } else /* Nobody should ever be asking for the DECL_ASSEMBLER_NAME of these DECLs -- unless they're in language-dependent code, in Index: src/gcc/gcc/libgcc2.c =================================================================== RCS file: /gccos2/src/gcc/gcc/libgcc2.c,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -w -u -r1.1.1.2 -r1.3 --- src/gcc/gcc/libgcc2.c 27 Apr 2004 18:38:06 -0000 1.1.1.2 +++ src/gcc/gcc/libgcc2.c 28 Apr 2004 04:57:40 -0000 1.3 @@ -1835,7 +1835,7 @@ (*(p-1)) (); } #endif -#if defined (EH_FRAME_SECTION_NAME) && !defined (HAS_INIT_SECTION) +#if defined (EH_FRAME_SECTION_NAME) && !defined (HAS_INIT_SECTION) && !defined (DONT_AUTOREGISTER_FRAME_INFO) { static int completed = 0; if (! completed) @@ -1854,7 +1854,7 @@ void __do_global_ctors (void) { -#ifdef EH_FRAME_SECTION_NAME +#if defined (EH_FRAME_SECTION_NAME) && !defined (DONT_AUTOREGISTER_FRAME_INFO) { static struct object object; __register_frame_info (__EH_FRAME_BEGIN__, &object); Index: src/gcc/gcc/mklibgcc.in =================================================================== RCS file: /gccos2/src/gcc/gcc/mklibgcc.in,v retrieving revision 1.1.1.2 retrieving revision 1.5 diff -w -u -r1.1.1.2 -r1.5 --- src/gcc/gcc/mklibgcc.in 27 Apr 2004 18:38:06 -0000 1.1.1.2 +++ src/gcc/gcc/mklibgcc.in 28 Apr 2004 04:57:40 -0000 1.5 @@ -16,6 +16,7 @@ # LIB2ADD_ST # LIB2ADDEH # LIB2ADDEHDEP +# LIB2FUNCS_OMIT # FPBIT # FPBIT_FUNCS # LIB2_DIVMOD_FUNCS Index: src/gcc/gcc/mkoptdesc.sh =================================================================== RCS file: src/gcc/gcc/mkoptdesc.sh diff -N src/gcc/gcc/mkoptdesc.sh --- nul 1 Jan 1970 00:00:00 -0000 +++ src/gcc/gcc/mkoptdesc.sh 16 Apr 2003 14:03:38 -0000 1.1 @@ -0,0 +1,395 @@ +#!/bin/sh +# +# This script will filter $input_file through a number of sed scripts, +# building an output suitable for GNU C command-line help facility +# +# Currently it works only for invoke.texi, g77.texi and gcj.texi +# +# This script needs following tools: +# (ba)sh,sed,uniq +# +# There are some assumptions about input file which this script makes: +# a) Some sections contains options, some contains other useful info, +# sections are identified by their name. If new sections are added +# which would be useful to see in command-line help it would be needed +# to modify a bit the script. +# b) Options are defined using @item{} or @itemx{}. +# c) After each "@item -option" should follow either another "@item -option" +# or a short sentence describing what the options above perform. The +# sentence should be delimited by '.'. Example: +# +# @item -Wundef +# Warn if an undefined identifier is evaluated in an @samp{#if} directive. +# +# d) @pxref{} should not span across multiple lines. +# Example: +# +# @pxref{abc,,abc: a test program} +# +# is good, while +# +# @pxref{abc,,abc: +# a test program} +# +# is bad. + +input_file=$1 +mode=$2 + +if [ -z $mode ]; then + echo "Usage: $0 input_file conversion_mode" + exit 1; +fi + +# Some common SED patterns +common_transform=' +/^@table/d +/^@end/d +/^ *$/d +/^$/d +/^@c /d +/^@.index.*/d +/^@opindex.*/d +s/\(@.\) *{/\1{/g +s/\\/\\\\/g +s/"/\\"/g +s/@\././g +s/@://g +s/@\*//g +s/^@item[x]* @var\({file}.*\)/@x{\1}/ +s/^@item[x]* *\(-.*\)/@t{\1}/ +s/@math/@i/g +s/@gccoptlist/@b/g +s/@option/@b/g +s/@command/@b/g +s/@gol//g +s/@section *\(.*\)/@1{\1}/g +s/@subsection *\(.*\)/@2{\1}/g +s/@samp/@b/g +s/@cite/@b/g +s/@var/@i/g +s/@code/@b/g +s/@emph/@b/g +s/@file/@u/g +s/@strong/@b/g +s/@minus{}/-/g +s/@dots{}/.../g +s/@dfn{\([^}]*\)}/\1/g +s/@r{\([^}]*\)}/\1/g +s/@pxref{[^,]*,[^,]*,\([^,]*\)}/see also: \1/ +s/@pxref{\(.*\)}/see also: \1/ +s/ / /g +s/i\.e\./i.e._/ +s/\. [^.]*$/./ +s/i\.e\._/i.e. / +s/^\(.*\)$/"\1 "/ +' + +fnexthelp="@b{@z -h\\\"File name suffixes\\\"}) " +case "${mode}" in + gcc) + lang='C/C++' + ;; + g77) + lang='Fortran' + ;; + gcj) + lang='Java' + fnexthelp="@b{@z -h\\\"Input and output files\\\"}) " + ;; + cpp) + lang='C/C++ preprocessor' + fnexthelp="@b{@z -h\\\"Input and output files\\\"}) " + ;; +esac + +echo "/* This file was automatically made by $0 from \"$input_file\" */" + +#------------------------------------------------------------------------------ +# Below goes the default help text for all drivers +#------------------------------------------------------------------------------ +echo 'const char *clh_default_text = {\' +echo '"@0{GNU compiler suite '${lang}' driver}"' +echo '"@nUsage: @z [option]... [file]...@n@n"' +case "${mode}" in + cpp) + echo '"Preprocess input files (or read from @b{stdin} if no files are specified)@n@n"' + ;; + *) + echo '"Compile a set of @b{'${lang}'} source code files (for details run '$fnexthelp'"' + echo '"then (depending on options) link resulting object files to produce a executable.@n@n"' + ;; +esac +echo '"The program has a large amount of options, to see the help index type "' +echo '"@b{@z --help=*}. Below is a list of most common options:@n@n"' +[ $mode != cpp ] && \ +echo '"@b{-c} Compile or assemble the source files, but do not link@n"' +echo '"@b{-D@i{macro}{=@i{defn}}} Define @i{macro} as @b{1} (if @i{defn} is missing) or @i{defn}@n"' +[ $mode != cpp ] && \ +echo '"@b{-E} Stop after the preprocessing stage; do not run the compiler@n"' +[ $mode != cpp ] && \ +echo '"@b{-g} Produce debugging information@n"' +echo '"@b{-h@i{topic}} Display command-line help on @i{topic} (* = index)@n"' +echo '"@b{-H} Print the name of each header file used@n"' +echo '"@b{-I@i{dir}} Search the directory @i{dir} for header files@n"' +[ $mode != cpp ] && \ +echo '"@b{-l@i{library}} Search the library named @i{library} when linking@n"' +[ $mode != cpp ] && \ +echo '"@b{-L@i{dir}} Search the directory @i{dir} for @b{-l} files@n"' +echo '"@b{-M} Output a dependence rule for @b{make} for each input file@n"' +echo '"@b{-MM} Same as @b{-M} but ignore system include files@n"' +echo '"@b{-M{M}D} Like @b{-M{M}} but put dependency information in a .d file@n"' +echo '"@b{-o @i{file}} Place output into @i{file}@n"' +[ $mode != cpp ] && \ +echo '"@b{-O{1..3,s}} Enable optimizations (1-few ... 3-most, s-optimize by size)@n"' +[ $mode != cpp ] && \ +echo '"@b{-p{g}} Generate extra code to write profile information@n"' +[ $mode != cpp ] && \ +echo '"@b{-Q} Compiler prints out each function name as it is compiled@n"' +[ $mode != cpp ] && \ +echo '"@b{-S} Stop after the stage of compilation proper; do not assemble@n"' +echo '"@b{-v} Print the commands executed to run the stages of compilation@n"' +[ $mode != cpp ] && \ +echo '"@b{-x @i{language}} Specify explicitly the @i{language} for the following files@n"' +[ $mode != cpp ] && \ +echo '"@b{-w} Inhibit all warning messages@n"' +[ $mode != cpp ] && \ +echo '"@b{-Wall} Enable most warning messages@n"' +echo '};' +echo '' + +echo 'const char *gcc_clh_text = {\' +echo '"@0@b{GNU '${lang}' Command-Line Help Database Index}@n@n"' +echo '"Please specify the help section by using --help=x.y.z where x is "' +echo '"the section number, y is the subsection number and so on. You also "' +echo '"can specify a few starting characters of the option or section name(-s) "' +echo '"you are interested in, e.g. @b{\"@z --help=@i{-W}\"} will display "' +echo '"a description of all the options which starts with @b{-W}, "' +echo '"@b{\"@z --help=@i{VAX}\"} will display all sections which begins "' +echo '"with @i{VAX} and so on. As a equivalent to @b{--help} you can also "' +echo '"use @b{-h} which is shorter to type (for example, \"@b{--help=1.12.6}\" "' +echo '"is equivalent to \"@b{-h1.12.6}\").@n"' + +case "${mode}" in +#------------------------------------------------------------------------------- + gcc) + echo '"@nThe following sections are available:@n@n"' + # + # Pass one: Option summary + # + sed -n -e ' + /^@section Option Summary/,/^@menu/p + ' $input_file | \ + sed -n -e ' + /^@[sub]*section \(.*\)/p + /^@xref/d + /^@smallexample/d + /^@item/,/^@end/p + ' | \ + sed -e ' + s/^@item[x]* *\(.*\)/@2{\1}/ + s/^@emph{\([^}]*\)}/@3{\1}/ + ' | sed -e "$common_transform" && \ + # + # Pass two: Options Controlling the Kind of Output + # + sed -n -e ' + /^@section Options Controlling the Kind of Output/,/^@node/p + ' $input_file | \ + sed -n -e ' + /^@[sub]*section/p + /^@item[x]* *-/,/\./p + s/^@cindex file name suffix/@t{File name suffixes}@n/p + /^@item[x]* @var{file}/,/^ *$/p + /@example/,/^@end/p + ' | \ + sed -e ' + s/^@example.*/Possible values for @var{language} are:@n@b{/ + s/^@end.*/}/ + ' | sed -e "$common_transform" | sed -e "/^ *$/d" && \ + # + # Pass three: All other options + # + sed -n -e ' + /^@section Options Controlling C Dialect/,/^@node/p + /^@section Options Controlling C++ Dialect/,/^@node/p + /^@section Options Controlling Objective-C Dialect/,/^@node/p + /^@section Options to Control Diagnostic Messages Formatting/,/^@node/p + /^@section Options to Request or Suppress Warnings/,/^@node/p + /^@section Options for Debugging Your Program or GNU CC/,/^@node/p + /^@section Options That Control Optimization/,/^@node/p + /^@section Options Controlling the Preprocessor/,/^@node/p + /^@section Passing Options to the Assembler/,/^@node/p + /^@section Options for Linking/,/^@node/p + /^@section Options for Directory Search/,/^@node/p + /^@section Specifying Target Machine and Compiler Version/,/^@node/p + /^@section Hardware Models and Configurations/,/^@section/p + /^@section Options for Code Generation Conventions/,/^@node/p + ' $input_file | \ + sed -n -e ' + /^@[sub]*section/p + /^@item[x]* *-/{ + p + : nextline + n + s/\. .*/\./ + s/\.$/\./ + p + t + b nextline + } + ' | uniq | sed -e "$common_transform" && \ + # + # Pass four: Environment variables + # + sed -n -e ' + /^@section Environment Variables Affecting GNU CC/,/^@node/p + ' $input_file | \ + sed -n -e ' + /^@[sub]*section/p + /^@item.*/,/\./p + ' | \ + sed -e ' + s/^@item[x]* *\(.*\)/@t{\1}/ + ' | sed -e "$common_transform" + ;; +#------------------------------------------------------------------------------- + g77) + echo '"The @b{@z} driver supports all the options supported by @b{gcc}. "' + echo '"For information on the non-Fortran-specific aspects of the "' + echo '"@b{gcc} driver (and, therefore, the @b{@z} driver) please use @b{gcc} "' + echo '"command-line help system.@n"' + echo '"@nThe following sections are available:@n@n"' + # + # Pass one: Option summary + # + sed -n -e ' + /^@section Option Summary/,/^@menu/p + ' $input_file | \ + sed -n -e ' + /^@[sub]*section \(.*\)/p + /^@xref/d + /^@smallexample/d + /^@item/,/^@end/p + ' | \ + sed -e ' + s/^@item[x]* *\(.*\)/@2{\1}/ + s/^@emph{\([^}]*\)}/@3{\1}/ + ' | sed -e "$common_transform" && \ + # + # Pass two: Options Controlling the Kind of Output + # + sed -n -e ' + /^@section Options Controlling the Kind of Output/,/^@node/p + ' $input_file | \ + sed -n -e ' + /^@[sub]*section/p + /^@item[x]* *-/,/\./p + /^@cindex *#/,/\./p + s/^@cindex file name suffix/@t{File name suffixes}@n/p + /^@item[x]* @var{file}.*/,/^ *$/p + ' | \ + sed -e ' + s/@cindex *\(#.*\)/@t{\1}/g + /@end table/d + ' | sed -e "$common_transform" | sed -e "/^ *$/d" && \ + # + # Pass three: All other options + # + sed -n -e ' + /^@section Shorthand Options/,/@node/p + /^@section Options Controlling Fortran Dialect/,/@node/p + /^@section Options to Request or Suppress Warnings/,/@node/p + /^@section Options for Debugging Your Program or GNU Fortran/,/@node/p + /^@section Options That Control Optimization/,/@node/p + /^@section Options for Directory Search/,/@node/p + /^@section Options for Code Generation Conventions/,/@node/p + ' $input_file | \ + sed -n -e ' + /^@[sub]*section/p + /^@item[x]* *-/{ + p + : nextline + n + s/\. .*/\./ + s/\.$/\./ + p + t + b nextline + } + ' | sed -e "$common_transform" + ;; +#------------------------------------------------------------------------------- + gcj) + echo '"@n@nThe following sections are available:@n@n"' + + java_common_transform_1=' + /^@chapter \(.*\)/p + /^@[sub]*section \(.*\)/p + /^@itemx* /,/\./p + ' + java_common_transform_2=' + s/@chapter *\(.*\)/@1{\1}/g + s/@section *\(.*\)/@2{\1}/g + s/^@itemx* *\(.*\)/@t{\1}/ + ' + + # + # Pass one: Invoking gcj + # + sed -n -e ' + /^@chapter Invoking gcj$/,/^@node Compatibility/p + ' $input_file | \ + sed -n -e "/@node Encodings/,/@node Warnings/d" \ + -e "$java_common_transform_1" | \ + sed -e "$java_common_transform_2" \ + -e "$common_transform" + # + # Pass two: Invoking gcjh, Invoking jv-scan, Invoking jcf-dump, Invoking gij + # + sed -n -e ' + /^@chapter Invoking gcjh/,/^@node Resources/p + ' $input_file | \ + sed -n -e "$java_common_transform_1" | \ + sed -e "$java_common_transform_2" \ + -e "$common_transform" + ;; +#------------------------------------------------------------------------------- + cpp) + echo '"@nThe following sections are available:@n@n"' + sed -n -e ' + /^@section Options Controlling the Preprocessor/,/^@node/p + /^@section Options for Directory Search/,/^@node/p + ' $input_file | \ + sed -n -e ' + /^@[sub]*section/p + /^@item[x]* *-/{ + p + : nextline + n + s/\. .*/\./ + s/\.$/\./ + p + t + b nextline + } + ' | sed -e "$common_transform" && \ + sed -n -e ' + /^@section Environment Variables Affecting GNU CC/,/^@node/p + ' $input_file | \ + sed -n -e ' + /^@[sub]*section/p + /^@item.*/,/\./p + ' | \ + sed -e ' + s/^@item[x]* *\(.*\)/@t{\1}/ + ' | sed -e "$common_transform" + ;; + *) + echo "ERROR: $0 does not know how to filter $input_file" + ;; +esac + +echo '};' + +exit 0; Index: src/gcc/gcc/prefix.c =================================================================== RCS file: /gccos2/src/gcc/gcc/prefix.c,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -w -u -r1.1.1.2 -r1.3 --- src/gcc/gcc/prefix.c 27 Apr 2004 18:38:06 -0000 1.1.1.2 +++ src/gcc/gcc/prefix.c 28 Apr 2004 04:57:40 -0000 1.3 @@ -354,5 +354,7 @@ const char *prefix; int len; { +#ifndef __EMX__ std_prefix = save_string (prefix, len); +#endif } Index: src/gcc/gcc/reg-stack.c =================================================================== RCS file: /gccos2/src/gcc/gcc/reg-stack.c,v retrieving revision 1.1.1.2 retrieving revision 1.6 diff -w -u -r1.1.1.2 -r1.6 --- src/gcc/gcc/reg-stack.c 27 Apr 2004 18:38:06 -0000 1.1.1.2 +++ src/gcc/gcc/reg-stack.c 28 Apr 2004 05:43:33 -0000 1.6 @@ -812,7 +812,7 @@ /* If the value is supposed to be returned in memory, then clearly it is not returned in a stack register. */ - if (aggregate_value_p (DECL_RESULT (decl))) + if (aggregate_value_p2 (DECL_RESULT (decl), decl)) /* bird: #631: return struct */ return 0; result = DECL_RTL_IF_SET (DECL_RESULT (decl)); @@ -2391,6 +2391,10 @@ int inserted = 0; edge e; basic_block block; + /* GCC-OS2: fp regs passing */ + tree parm = DECL_ARGUMENTS (current_function_decl); + int incoming_arg [REG_STACK_SIZE]; + int i; FOR_EACH_BB_REVERSE (block) { @@ -2410,6 +2414,17 @@ } } + /* GCC-OS2: fp regs passing + Figure out the arguments passed in stack registers. */ + memset (incoming_arg, 0, sizeof (incoming_arg)); + while (parm) + { + rtx x = DECL_INCOMING_RTL (parm); + if (STACK_REG_P (x)) + incoming_arg[REGNO (x) - FIRST_STACK_REG] = x; + parm = TREE_CHAIN (parm); + } + /* Load something into each stack register live at function entry. Such live registers can be caused by uninitialized variables or functions not returning values on all paths. In order to keep @@ -2424,9 +2439,17 @@ basic_block block = e->dest; block_info bi = BLOCK_INFO (block); int reg, top = -1; + int dead_arguments = 0; /* GCC-OS2: fp regs passing */ + + /* GCC-OS2: fp regs passing + Put the incoming arguments to the stack. */ + for (i = LAST_STACK_REG; i >= FIRST_STACK_REG; i--) + if (incoming_arg [i - FIRST_STACK_REG]) + bi->stack_in.reg[++top] = i; for (reg = LAST_STACK_REG; reg >= FIRST_STACK_REG; --reg) - if (TEST_HARD_REG_BIT (bi->stack_in.reg_set, reg)) + if (TEST_HARD_REG_BIT (bi->stack_in.reg_set, reg) + && !incoming_arg [reg - FIRST_STACK_REG]) /* GCC-OS2: fp regs passing */ { rtx init; @@ -2440,6 +2463,42 @@ } bi->stack_in.top = top; + + /* GCC-OS2: fp regs passing */ + + /* Check whether there are any dead arguments that needs + to be popped. */ + for (i = LAST_STACK_REG; i >= FIRST_STACK_REG; i--) + if (incoming_arg [i - FIRST_STACK_REG] + && !TEST_HARD_REG_BIT (bi->stack_in.reg_set, i)) + { + dead_arguments = 1; + break; + } + + if (dead_arguments) + { + rtx seq; + rtx after; + start_sequence (); + + /* ??? pop_stack needs some point to emit insns after. + Also needed to keep gen_sequence from returning a + pattern as opposed to a sequence, which would lose + REG_DEAD notes. */ + after = emit_note (NULL, NOTE_INSN_DELETED); + + for (i = LAST_STACK_REG; i >= FIRST_STACK_REG; i--) + if (incoming_arg [i - FIRST_STACK_REG] + && !TEST_HARD_REG_BIT (bi->stack_in.reg_set,i)) + after = emit_pop_insn (after, &bi->stack_in, + FP_MODE_REG (i, DFmode), EMIT_AFTER); + + seq = get_insns (); + end_sequence (); + inserted = 1; + insert_insn_on_edge (seq, e); + } } return inserted; Index: src/gcc/gcc/target-def.h =================================================================== RCS file: /gccos2/src/gcc/gcc/target-def.h,v retrieving revision 1.1.1.3 retrieving revision 1.4 diff -w -u -r1.1.1.3 -r1.4 --- src/gcc/gcc/target-def.h 7 Sep 2004 01:31:31 -0000 1.1.1.3 +++ src/gcc/gcc/target-def.h 8 Sep 2004 00:03:17 -0000 1.4 @@ -65,7 +65,9 @@ #define TARGET_ASM_FUNCTION_PROLOGUE default_function_pro_epilogue #define TARGET_ASM_FUNCTION_EPILOGUE default_function_pro_epilogue #define TARGET_ASM_FUNCTION_END_PROLOGUE no_asm_to_stream +#ifndef TARGET_ASM_FUNCTION_BEGIN_EPILOGUE /* GCC-OS2 */ #define TARGET_ASM_FUNCTION_BEGIN_EPILOGUE no_asm_to_stream +#endif /* GCC-OS2 */ #ifndef TARGET_ASM_SELECT_SECTION #define TARGET_ASM_SELECT_SECTION default_select_section Index: src/gcc/gcc/toplev.c =================================================================== RCS file: /gccos2/src/gcc/gcc/toplev.c,v retrieving revision 1.1.1.3 retrieving revision 1.4 diff -w -u -r1.1.1.3 -r1.4 --- src/gcc/gcc/toplev.c 7 Sep 2004 01:31:36 -0000 1.1.1.3 +++ src/gcc/gcc/toplev.c 8 Sep 2004 00:03:17 -0000 1.4 @@ -4820,6 +4820,11 @@ { int i; +#ifdef COMPILER_HOST_INITIALIZATION + /* Perform host dependant initialization when needed. */ + COMPILER_HOST_INITIALIZATION; +#endif + /* Save in case md file wants to emit args as a comment. */ save_argc = argc; save_argv = argv; Index: src/gcc/gcc/tree.c =================================================================== RCS file: /gccos2/src/gcc/gcc/tree.c,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -w -u -r1.1.1.2 -r1.3 Index: src/gcc/gcc/tree.h =================================================================== RCS file: /gccos2/src/gcc/gcc/tree.h,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -w -u -r1.1.1.2 -r1.3 --- src/gcc/gcc/tree.h 27 Apr 2004 18:38:06 -0000 1.1.1.2 +++ src/gcc/gcc/tree.h 28 Apr 2004 04:57:41 -0000 1.3 @@ -2997,6 +2997,11 @@ extern void preserve_temp_slots PARAMS ((rtx)); extern void preserve_rtl_expr_temps PARAMS ((tree)); extern int aggregate_value_p PARAMS ((tree)); +#ifdef RETURN_IN_MEMORY_WITH_FNTYPE /* bird: #631: return struct */ +extern int aggregate_value_p2 PARAMS ((tree, tree)); +#else +#define aggregate_value_p2(exp, fntype) aggregate_value_p (exp) +#endif extern void free_temps_for_rtl_expr PARAMS ((tree)); extern void instantiate_virtual_regs PARAMS ((tree, rtx)); extern void unshare_all_rtl PARAMS ((tree, rtx)); Index: src/gcc/gcc/varasm.c =================================================================== RCS file: /gccos2/src/gcc/gcc/varasm.c,v retrieving revision 1.1.1.3 retrieving revision 1.3 diff -w -u -r1.1.1.3 -r1.3 --- src/gcc/gcc/varasm.c 7 Sep 2004 01:31:57 -0000 1.1.1.3 +++ src/gcc/gcc/varasm.c 8 Sep 2004 00:03:18 -0000 1.3 @@ -1772,6 +1772,19 @@ id = maybe_get_identifier (real_name); if (id) TREE_SYMBOL_REFERENCED (id) = 1; + + /* Some code assume that this is the identifier returned + by DECL_ASSEMBLER_NAME (). However, for GCC-OS2 it's not + since the calling conventions _Optlink, __stdcall, and + _System name encodings are included in the identifier + returned by DECL_ASSEMBLER_NAME (). + Therefore we need this extra little cludge here. */ + if (name != real_name) + { + id = maybe_get_identifier (name); + if (id) + TREE_SYMBOL_REFERENCED (id) = 1; + } if (name[0] == '*') fputs (&name[1], file); Index: src/gcc/gcc/config/i386/emx-ctordtor.c =================================================================== RCS file: src/gcc/gcc/config/i386/emx-ctordtor.c diff -N src/gcc/gcc/config/i386/emx-ctordtor.c --- nul 1 Jan 1970 00:00:00 -0000 +++ src/gcc/gcc/config/i386/emx-ctordtor.c 2 Dec 2004 01:44:21 -0000 1.4 @@ -0,0 +1,104 @@ +/* At startup call all constructor and at shutdown all destructor functions. + Optionally initializes frame unwind info (if emx-eh is linked in). */ + + +/******************************************************************************* +* Header Files * +*******************************************************************************/ +#include +#include + + +/******************************************************************************* +* Global Variables * +*******************************************************************************/ +/** Init indicator. 0 means not inited, 1 means inited. */ +static int inited; + + +/******************************************************************************* +* Internal Functions * +*******************************************************************************/ +static int ctordtorForkChild(__LIBC_PFORKHANDLE pForkHandle, __LIBC_FORKOP enmOperation); +static void ctordtorForkComplete(void *pvArg, int rc, __LIBC_FORKCTX enmCtx); + + +/** + * Create static C++ objects. + */ +void __ctordtorInit(void) +{ + if (!inited) + { + inited = 1; + __ctordtorInit1(&__eh_init__); + __ctordtorInit1(&__CTOR_LIST__); + } +} + + +/** + * Destroy static C++ objects. + */ +void __ctordtorTerm(void) +{ + if (inited) + { + inited = 0; + __ctordtorTerm1(&__DTOR_LIST__); + __ctordtorTerm1(&__eh_term__); + } +} + + +_FORK_CHILD1(0xfffffffe, ctordtorForkChild) + +/** + * Fork callback which will prevent the dtors from running + * unless the fork is successful. + * + * @returns 0 on success. + * @returns -errno on failure. + * @param pForkHandle Pointer to fork handle. + * @param enmOperation Fork operation. + */ +int ctordtorForkChild(__LIBC_PFORKHANDLE pForkHandle, __LIBC_FORKOP enmOperation) +{ + int rc = 0; + switch (enmOperation) + { + /* + * Register a completion callback. + */ + case __LIBC_FORK_OP_FORK_CHILD: + rc = pForkHandle->pfnCompletionCallback(pForkHandle, ctordtorForkComplete, (void *)inited, __LIBC_FORK_CTX_CHILD); + case __LIBC_FORK_OP_EXEC_CHILD: + inited = 0; + break; + + default: + break; + + } + return 0; +} + + +/** + * Fork completion (child) callback for restoring inited to the correct value. + * + * @param pvArg The original value of inited. + * @param rc The fork result. This is 0 on success. On failure it is the + * negative errno value. + * @param enmCtx The context the completion callback function is called in. + */ +static void ctordtorForkComplete(void *pvArg, int rc, __LIBC_FORKCTX enmCtx) +{ + /* + * Restore the inited flag. + */ + inited = !rc && pvArg; + + /* unreferenced */ + enmCtx = enmCtx; +} Index: src/gcc/gcc/config/i386/emx-dllinit.c =================================================================== RCS file: src/gcc/gcc/config/i386/emx-dllinit.c diff -N src/gcc/gcc/config/i386/emx-dllinit.c --- nul 1 Jan 1970 00:00:00 -0000 +++ src/gcc/gcc/config/i386/emx-dllinit.c 7 Aug 2003 18:35:44 -0000 1.6 @@ -0,0 +1,23 @@ +/* This is the startup code for GCC version-specific runtime dll. + It should not be exposed to anyone else as we don't wanna have + duplicate startup code around. The right startup code is in libc. */ + +extern int _CRT_init (void); +extern void __ctordtorInit (void); +extern void __ctordtorTerm (void); + +unsigned long _System _DLL_InitTerm (unsigned long mod_handle, unsigned long flag) +{ + switch (flag) + { + case 0: + if (_CRT_init () != 0) + break; + __ctordtorInit (); + return 1; + case 1: + __ctordtorTerm (); + return 1; + } + return 0; +} Index: src/gcc/gcc/config/i386/emx-eh.c =================================================================== RCS file: src/gcc/gcc/config/i386/emx-eh.c diff -N src/gcc/gcc/config/i386/emx-eh.c --- nul 1 Jan 1970 00:00:00 -0000 +++ src/gcc/gcc/config/i386/emx-eh.c 8 Aug 2003 00:09:48 -0000 1.6 @@ -0,0 +1,44 @@ +/* This piece of code is linked into the program from gccXYZ.a or libgcc_eh.a + if any of the object files in the link are using exception (i.e. have exception + frame tables inside). The code automatically registers all exception + tables into a central list (meant to be placed inside gcc*.dll), + upon program exit these lists are deregistered. */ + +extern int __eh_frame__; +extern void __register_frame_table (void *begin); +extern void __deregister_frame (void *begin); + +/** Exception handler stuff init indicator. 0 means not inited, 1 means inited. */ +static int inited; + +/** + * Inits exception handler stuff. + * Called by __ctordtorInit() thru the __eh_init__ vector. + */ +void __ehInit (void) +{ + if (!inited) + { + int *ptr = &__eh_frame__; + inited = 1; + __register_frame_table (&ptr [*ptr == -2 ? 1 : 2]); + } +} + +/** + * Terminates exception handler stuff. + * Called by __ctordtorTerm() thru the __eh_term__ vector. + */ +void __ehTerm (void) +{ + if (inited) + { + int *ptr = &__eh_frame__; + inited = 0; + __deregister_frame (&ptr [*ptr == -2 ? 1 : 2]); + } +} + +/* emx-ctordtor.c will process these. */ +__asm__ (".stabs \"___eh_init__\", 23, 0, 0, ___ehInit"); +__asm__ (".stabs \"___eh_term__\", 23, 0, 0, ___ehTerm"); Index: src/gcc/gcc/config/i386/emx-libgcc1.asm =================================================================== RCS file: src/gcc/gcc/config/i386/emx-libgcc1.asm diff -N src/gcc/gcc/config/i386/emx-libgcc1.asm --- nul 1 Jan 1970 00:00:00 -0000 +++ src/gcc/gcc/config/i386/emx-libgcc1.asm 13 Mar 2005 11:14:15 -0000 1.5 @@ -0,0 +1,75 @@ +/* $Id: emx-libgcc1.asm,v 1.5 2005/03/13 11:14:15 bird Exp $ */ +/** @file + * + * GCC alloca helper + * + * Copyright (c) 2005 knut st. osmundsen + * + * + * This file is part of InnoTek LIBC. + * + * InnoTek LIBC is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * InnoTek LIBC is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with InnoTek LIBC; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + + .text + +#ifdef L_alloca + .globl __alloca +// IN: EAX = stack space to allocate (rounded to 4 boundary by GCC) +// OUT: ESP adjusted down by EAX, stack probed +// NOTE: Never call this from C! +// CHG: EAX. ESP +__alloca: + /* + * Calc new %esp, store it in %eax. + * The returned address is 8 byte aligned. + */ + negl %eax + lea (%esp, %eax), %eax + andl $0xfffffff8, %eax + + /* + * Setup the prober, %ecx, to point to the top of the stack page below. + */ + pushl %ecx + movl %esp, %ecx + andl $0xfffff000, %ecx + subl $8, %ecx + /* Do we need to probe anything? */ + cmpl %eax, %ecx + jl L2 + + /* + * The probe loop + */ + .align 2, 0x90 +L1: + movb $0, (%ecx) /* probe */ + subl $0x1000, %ecx /* next page */ + cmpl %eax, %ecx /* done? */ + jnl L1 /* jump if done */ + + /* + * Done probing, commit the allocation and jump to the return address. + */ +L2: popl %ecx + xchg %esp, %eax /* commit */ + movl (%eax), %eax /* load return address */ +#if defined (__EPILOGUE__) +___POST$_alloca: +#endif + jmp *%eax /* return */ +#endif // L_alloca Index: src/gcc/gcc/config/i386/emx-libgcc_so_d.def =================================================================== RCS file: src/gcc/gcc/config/i386/emx-libgcc_so_d.def diff -N src/gcc/gcc/config/i386/emx-libgcc_so_d.def --- nul 1 Jan 1970 00:00:00 -0000 +++ src/gcc/gcc/config/i386/emx-libgcc_so_d.def 6 Jun 2005 02:43:42 -0000 1.6 @@ -0,0 +1,73 @@ +; Auto-generated file, DO NOT EDIT!!! (see libgcc_d.awk) */ +LIBRARY libc06b5 INITINSTANCE TERMINSTANCE +EXPORTS +EXPORTS +; GCC322 code and const (starts at 100) + "__Unwind_DeleteException" @100 + "__Unwind_Find_FDE" @101 + "__Unwind_ForcedUnwind" @102 + "__Unwind_GetDataRelBase" @103 + "__Unwind_GetGR" @104 + "__Unwind_GetIP" @105 + "__Unwind_GetLanguageSpecificData" @106 + "__Unwind_GetRegionStart" @107 + "__Unwind_GetTextRelBase" @108 + "__Unwind_RaiseException" @109 + "__Unwind_Resume" @110 + "__Unwind_SetGR" @111 + "__Unwind_SetIP" @112 + "___absvdi2" @113 + "___absvsi2" @114 + "___addvdi3" @115 + "___addvsi3" @116 + "___ashldi3" @117 + "___ashrdi3" @118 + "___clear_cache" @119 + "___clz_tab" @120 + "___cmpdi2" @121 + "___deregister_frame" @122 + "___deregister_frame_info" @123 + "___deregister_frame_info_bases" @124 + "___divdi3" @125 + "___ffsdi2" @126 + "___fixdfdi" @127 + "___fixsfdi" @128 + "___fixunsdfdi" @129 + "___fixunsdfsi" @130 + "___fixunssfdi" @131 + "___fixunssfsi" @132 + "___fixunsxfdi" @133 + "___fixunsxfsi" @134 + "___fixxfdi" @135 + "___floatdidf" @136 + "___floatdisf" @137 + "___floatdixf" @138 + "___frame_state_for" @139 + "___lshrdi3" @140 + "___moddi3" @141 + "___muldi3" @142 + "___mulvdi3" @143 + "___mulvsi3" @144 + "___negdi2" @145 + "___negvdi2" @146 + "___negvsi2" @147 + "___register_frame" @148 + "___register_frame_info" @149 + "___register_frame_info_bases" @150 + "___register_frame_info_table" @151 + "___register_frame_info_table_bases" @152 + "___register_frame_table" @153 + "___subvdi3" @154 + "___subvsi3" @155 + "___ucmpdi2" @156 + "___udiv_w_sdiv" @157 + "___udivdi3" @158 + "___udivmoddi4" @159 + "___umoddi3" @160 + "__alloca" @161 +; GCC333 + "___gcc_personality_v0" @162 ; (this is a bug in the gcc 3.2.2 config, it should've been there too.) + "__Unwind_Backtrace" @163 + "__Unwind_FindEnclosingFunction" @164 + "__Unwind_GetCFA" @165 + "__Unwind_Resume_or_Rethrow" @166 Index: src/gcc/gcc/config/i386/emx.c =================================================================== RCS file: src/gcc/gcc/config/i386/emx.c diff -N src/gcc/gcc/config/i386/emx.c --- nul 1 Jan 1970 00:00:00 -0000 +++ src/gcc/gcc/config/i386/emx.c 25 Jun 2005 00:14:34 -0000 1.30 @@ -0,0 +1,1092 @@ +/* emx.c: Functions for emx as target system. + +Original version by Eberhard Mattes, based on i386.c. +Heavily modified by Andrew Zabolotny and Knut St. Osmundsen. + +This file is part of GNU CC. + +GNU CC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU CC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU CC; see the file COPYING. If not, write to +the Free Software Foundation, 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +#include "config.h" +#include "system.h" +#include "rtl.h" +#include "regs.h" +#include "hard-reg-set.h" +#include "output.h" +#include "tree.h" +#include "toplev.h" +#include "flags.h" +#include "i386-protos.h" +#include "ggc.h" + +/* The size of the target's pointer type. */ +#ifndef PTR_SIZE +#define PTR_SIZE (POINTER_SIZE / BITS_PER_UNIT) +#endif + +/** @todo remove debug code */ +/*#define BIRD_DEBUG - DO NOT COMMIT WITH THIS DEFINED!!! */ + +#ifdef BIRD_DEBUG +static const char *code(node) + tree node; +{ + if (node) + { + switch (TREE_CODE (node)) + { + case FUNCTION_TYPE: return "FUNCTION_TYPE"; + case FUNCTION_DECL: return "FUNCTION_DECL"; + case METHOD_TYPE: return "METHOD_TYPE"; + case FIELD_DECL: return "FIELD_DECL"; + case TYPE_DECL: return "TYPE_DECL"; + case VAR_DECL: return "VAR_DECL"; + case PARM_DECL: return "PARM_DECL"; + case RESULT_DECL: return "RESULT_DECL"; + case CONST_DECL: return "CONST_DECL"; + case POINTER_TYPE: return "POINTER_TYPE"; + case VOID_TYPE: return "VOID_TYPE"; + case INTEGER_TYPE: return "INTEGER_TYPE"; + case CHAR_TYPE: return "CHAR_TYPE"; + case SET_TYPE: return "SET_TYPE"; + case ARRAY_TYPE: return "ARRAY_TYPE"; + case RECORD_TYPE: return "RECORD_TYPE"; + case QUAL_UNION_TYPE: return "QUAL_UNION_TYPE"; + case UNION_TYPE: return "UNION_TYPE"; + default: + break; + } + } + return ""; +} + +const char *birddump_callingconv(tree node); +const char *birddump_callingconv(node) + tree node; +{ + static const char *apsz[] = {"system", "optlink", "stdcall"}; + static const char *psznone = "none"; + static const char *pszdefault = "default"; + tree attr; + unsigned i; + + if (!node) + return psznone; + + attr = (DECL_P (node) ? DECL_ATTRIBUTES (node) : TYPE_ATTRIBUTES (node)); + if (!attr) + return pszdefault; + + for (i = 0; i < sizeof(apsz) / sizeof(apsz[0]); i++) + if (node && attr && lookup_attribute (apsz[i], attr)) + return apsz[i]; + + return pszdefault; +} + +void birddump (node) + tree node; +{ + tree type, type2, context, name; + if (!node) + return; + + type = TREE_TYPE (node); + type2 = type ? TREE_TYPE(type) : NULL; + context = DECL_P (node) ? DECL_CONTEXT (node) : NULL_TREE; + name = DECL_P (node) ? DECL_NAME (node) : NULL_TREE; + + fprintf(stderr, "dbg: node=%d %s %p %s type=%d %s %p %s type_type=%d %s %p %s context=%d %s %p name=%s\n", + TREE_CODE(node), code(node), (void*)node, birddump_callingconv(node), + type ? (int)TREE_CODE(type) : -1, code(type), (void*)type, birddump_callingconv(type), + type2 ? (int)TREE_CODE(type2) : -1, code(type2), (void*)type2, birddump_callingconv(type2), + context ? (int)TREE_CODE(context) : -1, code(context), (void*)context, + name ? IDENTIFIER_POINTER (name) : ""); +} + +#define dfprintf(a) fprintf a +#define DUMP(node) birddump(node) +#else +#define dfprintf(a) do {} while (0) +#define DUMP(node) do {} while (0) +#endif + +int emx_c_set_decl_assembler_name (decl, fclass) + tree decl; + int fclass; +{ + static int recurse; + const char *oldsym; + char *newsym; + size_t sl; + tree id, type; + int rc = 1; + + /* + dfprintf((stderr, "emx_c_set_decl_assembler_name\n")); + DUMP(decl); + */ + + /* Sometimes we recursively call DECL_ASSEMBLER_NAME to apply the default + mangling rules for current compiler. */ + if (recurse) + return 0; + + /* Only functions declarations are subject to mangling. */ + if (TREE_CODE (decl) != FUNCTION_DECL) + return 0; + + recurse++; + type = TREE_TYPE (decl); + + if (lookup_attribute ("system", TYPE_ATTRIBUTES (type))) + { + /* Here we mangle _System functions as defined by IBM specs. + The function always gets its name as-is (unless it is a method, + which is a undefined case as VACPP always use _Optlink for methods, + at least that's what I have understood from the docs). */ + + oldsym = IDENTIFIER_POINTER (DECL_NAME (decl)); + if (fclass) + return 0; + + /* Specifying '*' as first symbol character tells gcc (see varasm.c, + function assemble_name()) to output the label as-is rather than + invoking the ASM_OUTPUT_LABELREF macro (which prepends a underscore) */ + + sl = strlen (oldsym); + newsym = xmalloc (sl + 2); + newsym [0] = '*'; + memcpy (newsym + 1, oldsym, sl + 1); + + SET_DECL_ASSEMBLER_NAME (decl, get_identifier (newsym)); + + dfprintf ((stderr, "dbg: system %s -> %s\n", oldsym, newsym)); + } + else if (lookup_attribute ("optlink", TYPE_ATTRIBUTES (type))) + { + /* At the moment we're only implementing OS/2 VAC linking + compatibility for the C language. This means that no leading + underscore. + For C++ we are not compatible. It doesn't make that much sense + either since we're not VFT compatible either. For simplicity + and safety we are removing the leading underscore from the + default mangled names to catch invalid declarations in the + linking. */ + + id = DECL_ASSEMBLER_NAME (decl); + + /* Remove the leading underscore. */ + oldsym = IDENTIFIER_POINTER (id); + sl = strlen (oldsym); + newsym = xmalloc (sl + 2); + newsym [0] = '*'; + memcpy (newsym + 1, oldsym, sl + 1); + + SET_DECL_ASSEMBLER_NAME (decl, get_identifier (newsym)); + + dfprintf ((stderr, "dbg: optlink %s -> %s\n", oldsym, newsym)); + } + else if (lookup_attribute ("stdcall", TYPE_ATTRIBUTES (type))) + { + /* Mangle decl as the former assembler name modified with a + suffix consisting of an atsign (@) followed by the number of bytes of + arguments. + For C++ the same applies as for optlink. See above. */ + + int total = 0; + + /* If function does not have ellipsis as last argument, count total args size */ + if (TYPE_ARG_TYPES (type)) + if (TREE_VALUE (tree_last (TYPE_ARG_TYPES (type))) == void_type_node) + { + tree formal_type = TYPE_ARG_TYPES (type); + + while (TREE_VALUE (formal_type) != void_type_node) + { + int parm_size = TREE_INT_CST_LOW (TYPE_SIZE (TREE_VALUE (formal_type))); + /* Must round up to include padding. This is done the same + way as in store_one_arg. */ + parm_size = ((parm_size + PARM_BOUNDARY - 1) / PARM_BOUNDARY * PARM_BOUNDARY); + total += parm_size; + formal_type = TREE_CHAIN (formal_type); + } + } + + id = DECL_ASSEMBLER_NAME (decl); + oldsym = IDENTIFIER_POINTER (id); + newsym = xmalloc (strlen (oldsym) + 10); + sprintf (newsym, "%s@%d", oldsym, total / BITS_PER_UNIT); + + SET_DECL_ASSEMBLER_NAME (decl, get_identifier (newsym)); + + dfprintf ((stderr, "dbg: stdcall %s -> %s\n", oldsym, newsym)); + } + else + rc = 0; + + recurse--; + return rc; +} + +#if 0 /* choose between the smaller non working version, and the + large ugly one which is working. */ + +tree emx_handle_vacpp_attribute (tree *node, tree name, tree args, + int flags, bool *no_add_attrs) +{ + tree *type; + (void) args; + (void) flags; + + dfprintf((stderr, "emx_handle_vacpp_attribute\n")); + DUMP (*node); + + if (TREE_CODE (*node) != FUNCTION_TYPE + && TREE_CODE (*node) != METHOD_TYPE + && TREE_CODE (*node) != FIELD_DECL + && TREE_CODE (*node) != TYPE_DECL) + { + warning ("`%s' attribute only applies to functions", + IDENTIFIER_POINTER (name)); + *no_add_attrs = true; + } + + if (TARGET_64BIT) + { + warning ("`%s' attribute ignored", IDENTIFIER_POINTER (name)); + *no_add_attrs = true; + } + + /* Check if the attributes are compatible */ + if (ix86_check_append_attr (*node, name, no_add_attrs)) + return NULL_TREE; + + /* Now, a new type with our attribute please! + If the FUNCTION_TYPE/METHOD_TYPE already have the attribute associated, + there is no need to duplicate the type. + @todo: I'm unsure wether or not we should do this from node and down... */ + for (type = node; + TREE_CODE (*type) != FUNCTION_TYPE && TREE_CODE (*type) != METHOD_TYPE; + type = &TREE_TYPE (*type)) + /* do nothing */; + + if (lookup_attribute (IDENTIFIER_POINTER (name), TYPE_ATTRIBUTES (*type))) + return NULL_TREE; + + *type = build_type_copy (*type); + *type = build_type_attribute_variant (*type, tree_cons (name, args, TYPE_ATTRIBUTES (*type)) ); + /**no_add_attrs = true; ?? */ + + dfprintf((stderr, "emx_handle_vacpp_attribute: new type (%p)\n", (void*)type)); + DUMP (*node); + return NULL_TREE; +} + +#else + +/* This is the working version which we belive duplicate some which could be + done by the generic attribute stuff in GCC... */ +tree emx_handle_vacpp_attribute (node, name, args, flags, no_add_attrs) + tree *node, name, args; int flags; bool *no_add_attrs; +{ + tree type; + + dfprintf((stderr, "emx_handle_vacpp_attribute: node=%p\n", node)); + DUMP (*node); + + switch (TREE_CODE (*node)) + { + /* Declarations! + We need to attach the attribute to the type of the declaration. + (Name mangling is done by emx_c_set_decl_assembler_name().) */ + case FUNCTION_DECL:/* Function declaration. */ + case TYPE_DECL: /* Function or function pointer type. */ + case FIELD_DECL: /* Function pointer (or function?) as a struct, union or class member. */ + case PARM_DECL: /* Function pointer as a parameter. */ + case VAR_DECL: /* Function pointer variable. */ + /* If this is a type declaration with our attribute, we allow it + only if it is a pointer-to-a-function type or a function type. */ + type = TREE_TYPE (*node); + if (TREE_CODE (type) == POINTER_TYPE) + type = TREE_TYPE(type); + if ( TREE_CODE (type) != FUNCTION_TYPE + && TREE_CODE (type) != METHOD_TYPE) + { + warning ("`%s' attribute only applies to functions and function types, not to '%T'.", + IDENTIFIER_POINTER (name), type); + *no_add_attrs = true; + break; + } + + if (ix86_check_append_attr (type, name, no_add_attrs)) + break; + + /* If required we'll make a variant of the type for this attribute. */ + if (!lookup_attribute (IDENTIFIER_POINTER (name), + TYPE_ATTRIBUTES (type))) + { + tree *ptype = node; + while (*ptype != type) + ptype = &TREE_TYPE (*ptype); + *ptype = build_type_copy (*ptype); + *ptype = build_type_attribute_variant ( + *ptype, tree_cons (name, args, TYPE_ATTRIBUTES (*ptype)) ); + dfprintf((stderr, "emx_handle_vacpp_attribute: new type\n")); + DUMP(*node); + } + else + dfprintf((stderr, "emx_handle_vacpp_attribute: use old type\n")); + *no_add_attrs = true; + break; + + /* Types! + For types involving functions we need to convince decl_attributes() + (and its callers) to supply a declaration so we safely can change + the type. */ + case POINTER_TYPE: + /* We allow: + This being the return type of a function which is coming soon. + This being a function pointer which declaration is coming next. + Everything else is considered inappropriate use of the attribute. */ + if ( !(flags & ATTR_FLAG_FUNCTION_NEXT) + && ( !(flags & ATTR_FLAG_DECL_NEXT) + || !(type = TREE_TYPE (*node)) + || ( TREE_CODE (type) != FUNCTION_TYPE + && TREE_CODE (type) != METHOD_TYPE))) + { + warning ("`%s' attribute only applies to functions and function types", + IDENTIFIER_POINTER (name)); + *no_add_attrs = true; + break; + } + /* fall thru */ + case FUNCTION_TYPE: + case METHOD_TYPE: +#if 0 /* bird: This fixes optlink/tst4.c and doesn't seem to break anything. + If set to true we are in some cases imposing _Optlink onto following + declarations. This is weird stuff! + !! This problem is actually what we see with the other implementation!! */ + *no_add_attrs = true; +#endif + return tree_cons (name, args, NULL_TREE); + + default: + warning ("`%s' attribute only applies to functions and function types (code=%d)", + IDENTIFIER_POINTER (name), TREE_CODE (*node)); + *no_add_attrs = true; + break; + } + + return NULL_TREE; +} +#endif + +void +emx_eh_frame_section () +{ +/* + tree label = get_file_function_name ('F'); + The __ehInit undefined external here is to drag __ehInit/__ehInitDLL into + the linking so DLLs are initiated correctly. (#577) +*/ + data_section (); + ASM_OUTPUT_ALIGN (asm_out_file, floor_log2 (PTR_SIZE)); + fputs ("\t.stabs\t\"___eh_frame__\",24,0,0,Lframe1\n", asm_out_file); /* N_SETD */ + fputs ("\t.stabs\t\"___ehInit\",1,0,0,0\n", asm_out_file); /* N_UNDEF | N_EXT */ +} + +/* Add a __POST$xxx label before epilogue if -mepilogue specified */ +void emx_output_function_begin_epilogue (f) + FILE *f; +{ + if (TARGET_EPILOGUE && TREE_PUBLIC (current_function_decl)) + { + const char *func_label = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (current_function_decl)); + char *lbl = alloca (strlen (func_label) + 8); + strcpy (lbl, "__POST$"); + if (func_label[0] == '*') + func_label++; + strcat (lbl, func_label); + ASM_OUTPUT_LABEL (f, lbl); + } +} + + +/* Checks if the function is using either optlink or system calling convention + and returns 1 in those cases forcing the return value to be in memory. + The problem (#631) was that structures less than 8 bytes were returned in + registers. _System and _Optlink requires them to be passed in as a hidden + parameter. + @type is the return type. + @fntype is function type, call expression, function declaration or null. + The return value is 1 to force the return value into memory. Return 0 if we + don't know. */ + +int emx_return_in_memory_with_fntype (type, fntype) + tree type, fntype; +{ + /* (from aggregate_value_p() CVS trunk) */ + if (fntype) + switch (TREE_CODE (fntype)) + { + case CALL_EXPR: + fntype = get_callee_fndecl (fntype); + fntype = fntype ? TREE_TYPE (fntype) : 0; + break; + case FUNCTION_DECL: + fntype = TREE_TYPE (fntype); + break; + case FUNCTION_TYPE: + case METHOD_TYPE: + break; + case IDENTIFIER_NODE: + fntype = 0; + break; + default: + /* We don't expect other rtl types here. */ + abort(); + } + + /* (future targetm.calls.return_in_memory additions) */ + if (fntype + && AGGREGATE_TYPE_P (type) + && ( lookup_attribute ("optlink", TYPE_ATTRIBUTES (fntype)) + || lookup_attribute ("system", TYPE_ATTRIBUTES (fntype)))) + { + dfprintf((stderr, "emx_return_in_memory_with_fntype: returns 1\n")); + return 1; + } + + /* return ix86_return_in_memory (exp); - future */ + dfprintf((stderr, "emx_return_in_memory_with_fntype: returns 0\n")); + return 0; +} + +/* Strip only the leading encoding, leaving the stdcall suffix. */ + +const char * +i386_emx_strip_name_encoding (str) + const char *str; +{ + if (*str == DLL_IMPORT_EXPORT_PREFIX) + str += 3; + if (*str == '%') /* don't actually know what this is.. */ + str += 2; + if (*str == '*') + str += 1; + return str; +} + +/* Also strip the stdcall suffix. */ + +const char * emx_strip_name_encoding_full (str) + const char *str; +{ + const char *p; + const char *name = i386_emx_strip_name_encoding (str); + + p = strchr (name, '@'); + if (p) + return ggc_alloc_string (name, p - name); + + return name; +} + + +/* copy&hack from winnt.c */ + +static tree associated_type PARAMS ((tree)); +/*static const char * gen_stdcall_suffix PARAMS ((tree));*/ +static int i386_emx_dllexport_p PARAMS ((tree)); +static int i386_emx_dllimport_p PARAMS ((tree)); +static void i386_emx_mark_dllexport PARAMS ((tree)); +static void i386_emx_mark_dllimport PARAMS ((tree)); + +/* Handle a "dllimport" or "dllexport" attribute; + arguments as in struct attribute_spec.handler. */ +tree +ix86_handle_dll_attribute (pnode, name, args, flags, no_add_attrs) + tree * pnode; + tree name; + tree args; + int flags; + bool *no_add_attrs; +{ + tree node = *pnode; + + /* These attributes may apply to structure and union types being created, + but otherwise should pass to the declaration involved. */ + if (!DECL_P (node)) + { + if (flags & ((int) ATTR_FLAG_DECL_NEXT | (int) ATTR_FLAG_FUNCTION_NEXT + | (int) ATTR_FLAG_ARRAY_NEXT)) + { + *no_add_attrs = true; + return tree_cons (name, args, NULL_TREE); + } + if (TREE_CODE (node) != RECORD_TYPE && TREE_CODE (node) != UNION_TYPE) + { + warning ("`%s' attribute ignored", IDENTIFIER_POINTER (name)); + *no_add_attrs = true; + } + + return NULL_TREE; + } + + /* Report error on dllimport ambiguities seen now before they cause + any damage. */ + else if (is_attribute_p ("dllimport", name)) + { + /* Like MS, treat definition of dllimported variables and + non-inlined functions on declaration as syntax errors. + We allow the attribute for function definitions if declared + inline, but just ignore it in i386_emx_dllimport_p. */ + if (TREE_CODE (node) == FUNCTION_DECL && DECL_INITIAL (node) + && !DECL_INLINE (node)) + { + error_with_decl (node, "function `%s' definition is marked dllimport."); + *no_add_attrs = true; + } + + else if (TREE_CODE (node) == VAR_DECL) + { + if (DECL_INITIAL (node)) + { + error_with_decl (node,"variable `%s' definition is marked dllimport."); + *no_add_attrs = true; + } + + /* `extern' needn't be specified with dllimport. + Specify `extern' now and hope for the best. Sigh. */ + DECL_EXTERNAL (node) = 1; + /* Also, implicitly give dllimport'd variables declared within + a function global scope, unless declared static. */ + if (current_function_decl != NULL_TREE && !TREE_STATIC (node)) + TREE_PUBLIC (node) = 1; + } + } + + /* Report error if symbol is not accessible at global scope. */ + if (!TREE_PUBLIC (node) + && (TREE_CODE (node) == VAR_DECL + || TREE_CODE (node) == FUNCTION_DECL)) + { + error_with_decl (node, "external linkage required for symbol '%s' because of '%s' attribute.", + IDENTIFIER_POINTER (name)); + *no_add_attrs = true; + } + + return NULL_TREE; +} + +/* Handle a "shared" attribute; + arguments as in struct attribute_spec.handler. */ +tree +ix86_handle_shared_attribute (node, name, args, flags, no_add_attrs) + tree *node; + tree name; + tree args ATTRIBUTE_UNUSED; + int flags ATTRIBUTE_UNUSED; + bool *no_add_attrs; +{ + if (TREE_CODE (*node) != VAR_DECL) + { + warning ("`%s' attribute only applies to variables", + IDENTIFIER_POINTER (name)); + *no_add_attrs = true; + } + + return NULL_TREE; +} + +/* Return the type that we should use to determine if DECL is + imported or exported. */ + +static tree +associated_type (decl) + tree decl; +{ + tree t = NULL_TREE; + + /* In the C++ frontend, DECL_CONTEXT for a method doesn't actually refer + to the containing class. So we look at the 'this' arg. */ + if (TREE_CODE (TREE_TYPE (decl)) == METHOD_TYPE) + { + /* Artificial methods are not affected by the import/export status of + their class unless they are virtual. */ + if (! DECL_ARTIFICIAL (decl) || DECL_VINDEX (decl)) + t = TREE_TYPE (TREE_VALUE (TYPE_ARG_TYPES (TREE_TYPE (decl)))); + } + else if (DECL_CONTEXT (decl) + && TREE_CODE_CLASS (TREE_CODE (DECL_CONTEXT (decl))) == 't') + t = DECL_CONTEXT (decl); + + return t; +} + +/* Return nonzero if DECL is a dllexport'd object. */ + +static int +i386_emx_dllexport_p (decl) + tree decl; +{ + tree exp; + + if (TREE_CODE (decl) != VAR_DECL + && TREE_CODE (decl) != FUNCTION_DECL) + return 0; + exp = lookup_attribute ("dllexport", DECL_ATTRIBUTES (decl)); + if (exp) + return 1; + + /* Class members get the dllexport status of their class. */ + if (associated_type (decl)) + { + exp = lookup_attribute ("dllexport", + TYPE_ATTRIBUTES (associated_type (decl))); + if (exp) + return 1; + } + + return 0; +} + +/* Return nonzero if DECL is a dllimport'd object. */ + +static int +i386_emx_dllimport_p (decl) + tree decl; +{ + tree imp; + int context_imp = 0; + + if (TREE_CODE (decl) == FUNCTION_DECL + && TARGET_NOP_FUN_DLLIMPORT) + return 0; + + if (TREE_CODE (decl) != VAR_DECL + && TREE_CODE (decl) != FUNCTION_DECL) + return 0; + + imp = lookup_attribute ("dllimport", DECL_ATTRIBUTES (decl)); + + /* Class members get the dllimport status of their class. */ + if (!imp && associated_type (decl)) + { + imp = lookup_attribute ("dllimport", + TYPE_ATTRIBUTES (associated_type (decl))); + if (imp) + context_imp = 1; + } + + if (imp) + { + /* Don't mark defined functions as dllimport. If the definition + itself was marked with dllimport, than ix86_handle_dll_attribute + reports an error. This handles the case when the definition + overrides an earlier declaration. */ + if (TREE_CODE (decl) == FUNCTION_DECL && DECL_INITIAL (decl) + && !DECL_INLINE (decl)) + { + /* Don't warn about artificial methods. */ + if (!DECL_ARTIFICIAL (decl)) + warning_with_decl (decl,"function '%s' is defined after prior declaration as dllimport: attribute ignored."); + return 0; + } + + /* We ignore the dllimport attribute for inline member functions. + This differs from MSVC behaviour which treats it like GNUC + 'extern inline' extension. */ + else if (TREE_CODE (decl) == FUNCTION_DECL && DECL_INLINE (decl)) + { + if (extra_warnings) + warning_with_decl (decl, "inline function '%s' is declared as dllimport: attribute ignored."); + return 0; + } + + /* Don't allow definitions of static data members in dllimport class, + Just ignore attribute for vtable data. */ + else if (TREE_CODE (decl) == VAR_DECL + && TREE_STATIC (decl) && TREE_PUBLIC (decl) + && !DECL_EXTERNAL (decl) && context_imp) + { + if (!DECL_VIRTUAL_P (decl)) + error_with_decl (decl, "definition of static data member '%s' of dllimport'd class."); + return 0; + } + + /* Since we can't treat a pointer to a dllimport'd symbol as a + constant address, we turn off the attribute on C++ virtual + methods to allow creation of vtables using thunks. */ + else if (TREE_CODE (TREE_TYPE (decl)) == METHOD_TYPE + && (DECL_VIRTUAL_P (decl))) + return 0; + + return 1; + } + + return 0; +} + +/* Return nonzero if SYMBOL is marked as being dllexport'd. */ + +int +i386_emx_dllexport_name_p (symbol) + const char *symbol; +{ + return symbol[0] == DLL_IMPORT_EXPORT_PREFIX + && symbol[1] == 'e' && symbol[2] == '.'; +} + +/* Return nonzero if SYMBOL is marked as being dllimport'd. */ + +int +i386_emx_dllimport_name_p (symbol) + const char *symbol; +{ + return symbol[0] == DLL_IMPORT_EXPORT_PREFIX + && symbol[1] == 'i' && symbol[2] == '.'; +} + +/* Mark a DECL as being dllexport'd. + Note that we override the previous setting (eg: dllimport). */ + +static void +i386_emx_mark_dllexport (decl) + tree decl; +{ + const char *oldname; + char *newname; + rtx rtlname; + tree idp; + + rtlname = XEXP (DECL_RTL (decl), 0); + if (GET_CODE (rtlname) == SYMBOL_REF) + oldname = XSTR (rtlname, 0); + else if (GET_CODE (rtlname) == MEM + && GET_CODE (XEXP (rtlname, 0)) == SYMBOL_REF) + oldname = XSTR (XEXP (rtlname, 0), 0); + else + abort (); + if (i386_emx_dllimport_name_p (oldname)) + { + warning_with_decl (decl,"inconsistent dll linkage for '%s': dllexport assumed."); + /* Remove DLL_IMPORT_PREFIX. */ + oldname += 9; + DECL_NON_ADDR_CONST_P (decl) = 0; + } + else if (i386_emx_dllexport_name_p (oldname)) + return; /* already done */ + + newname = alloca (strlen (oldname) + 4); + sprintf (newname, "%ce.%s", DLL_IMPORT_EXPORT_PREFIX, oldname); + + /* We pass newname through get_identifier to ensure it has a unique + address. RTL processing can sometimes peek inside the symbol ref + and compare the string's addresses to see if two symbols are + identical. */ + idp = get_identifier (newname); + + XEXP (DECL_RTL (decl), 0) = + gen_rtx (SYMBOL_REF, Pmode, IDENTIFIER_POINTER (idp)); +} + +/* Mark a DECL as being dllimport'd. */ + +static void +i386_emx_mark_dllimport (decl) + tree decl; +{ + const char *oldname; + char *newname; + tree idp; + rtx rtlname, newrtl; + + rtlname = XEXP (DECL_RTL (decl), 0); + if (GET_CODE (rtlname) == SYMBOL_REF) + oldname = XSTR (rtlname, 0); + else if (GET_CODE (rtlname) == MEM + && GET_CODE (XEXP (rtlname, 0)) == SYMBOL_REF) + oldname = XSTR (XEXP (rtlname, 0), 0); + else + abort (); + if (i386_emx_dllexport_name_p (oldname)) + { + error ("`%s' declared as both exported to and imported from a DLL", + IDENTIFIER_POINTER (DECL_NAME (decl))); + return; + } + else if (i386_emx_dllimport_name_p (oldname)) + { + /* Already done, but do a sanity check to prevent assembler errors. */ + if (!DECL_EXTERNAL (decl) || !TREE_PUBLIC (decl)) + { + error_with_decl (decl, "failure in redeclaration of '%s': dllimport'd symbol lacks external linkage."); + abort(); + } + return; + } + + newname = alloca (strlen (oldname) + 11); + sprintf (newname, "%ci.%s", DLL_IMPORT_EXPORT_PREFIX, oldname); + + /* We pass newname through get_identifier to ensure it has a unique + address. RTL processing can sometimes peek inside the symbol ref + and compare the string's addresses to see if two symbols are + identical. */ + idp = get_identifier (newname); + + newrtl = gen_rtx (MEM, Pmode, + gen_rtx (SYMBOL_REF, Pmode, + IDENTIFIER_POINTER (idp))); + XEXP (DECL_RTL (decl), 0) = newrtl; + + /* Can't treat a pointer to this as a constant address */ + DECL_NON_ADDR_CONST_P (decl) = 1; +} + +#if 0 +/* Return string which is the former assembler name modified with a + suffix consisting of an atsign (@) followed by the number of bytes of + arguments */ + +static const char * +gen_stdcall_suffix (decl) + tree decl; +{ + int total = 0; + /* ??? This probably should use XSTR (XEXP (DECL_RTL (decl), 0), 0) instead + of DECL_ASSEMBLER_NAME. */ + const char *asmname = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (decl)); + char *newsym; + + if (TYPE_ARG_TYPES (TREE_TYPE (decl))) + if (TREE_VALUE (tree_last (TYPE_ARG_TYPES (TREE_TYPE (decl)))) + == void_type_node) + { + tree formal_type = TYPE_ARG_TYPES (TREE_TYPE (decl)); + + while (TREE_VALUE (formal_type) != void_type_node) + { + int parm_size + = TREE_INT_CST_LOW (TYPE_SIZE (TREE_VALUE (formal_type))); + /* Must round up to include padding. This is done the same + way as in store_one_arg. */ + parm_size = ((parm_size + PARM_BOUNDARY - 1) + / PARM_BOUNDARY * PARM_BOUNDARY); + total += parm_size; + formal_type = TREE_CHAIN (formal_type); + } + } + + newsym = xmalloc (strlen (asmname) + 10); + sprintf (newsym, "%s@%d", asmname, total/BITS_PER_UNIT); + return IDENTIFIER_POINTER (get_identifier (newsym)); +} +#endif + +void +i386_emx_encode_section_info (decl, first) + tree decl; + int first ATTRIBUTE_UNUSED; +{ + /* This bit is copied from i386.h. */ + if (optimize > 0 && TREE_CONSTANT (decl) + && (!flag_writable_strings || TREE_CODE (decl) != STRING_CST)) + { + rtx rtl = (TREE_CODE_CLASS (TREE_CODE (decl)) != 'd' + ? TREE_CST_RTL (decl) : DECL_RTL (decl)); + SYMBOL_REF_FLAG (XEXP (rtl, 0)) = 1; + } + +#if 0 + if (TREE_CODE (decl) == FUNCTION_DECL) + if (lookup_attribute ("stdcall", + TYPE_ATTRIBUTES (TREE_TYPE (decl)))) + XEXP (DECL_RTL (decl), 0) = + gen_rtx (SYMBOL_REF, Pmode, gen_stdcall_suffix (decl)); +#endif + + /* Mark the decl so we can tell from the rtl whether the object is + dllexport'd or dllimport'd. This also handles dllexport/dllimport + override semantics. */ + + if (i386_emx_dllexport_p (decl)) + i386_emx_mark_dllexport (decl); + else if (i386_emx_dllimport_p (decl)) + i386_emx_mark_dllimport (decl); + /* It might be that DECL has already been marked as dllimport, but a + subsequent definition nullified that. The attribute is gone but + DECL_RTL still has (DLL_IMPORT_EXPORT_PREFIX)i._imp__foo. We need + to remove that. Ditto for the DECL_NON_ADDR_CONST_P flag. */ + else if ((TREE_CODE (decl) == FUNCTION_DECL + || TREE_CODE (decl) == VAR_DECL) + && DECL_RTL (decl) != NULL_RTX + && GET_CODE (DECL_RTL (decl)) == MEM + && GET_CODE (XEXP (DECL_RTL (decl), 0)) == MEM + && GET_CODE (XEXP (XEXP (DECL_RTL (decl), 0), 0)) == SYMBOL_REF + && i386_emx_dllimport_name_p (XSTR (XEXP (XEXP (DECL_RTL (decl), 0), 0), 0))) + { + const char *oldname = XSTR (XEXP (XEXP (DECL_RTL (decl), 0), 0), 0); + tree idp = get_identifier (oldname + 9); + rtx newrtl = gen_rtx (SYMBOL_REF, Pmode, IDENTIFIER_POINTER (idp)); + + warning_with_decl (decl, "'%s' %s after being referenced with dllimport linkage.", + (DECL_INITIAL (decl) || !DECL_EXTERNAL (decl)) + ? "defined locally" : "redeclared without dllimport attribute"); + + XEXP (DECL_RTL (decl), 0) = newrtl; + + DECL_NON_ADDR_CONST_P (decl) = 0; + + /* We previously set TREE_PUBLIC and DECL_EXTERNAL. + We leave these alone for now. */ + } +} + +/* [snip] */ + +#if 0 /* don't think we need this. */ +/* Keep a list of external functions. */ + +struct extern_list +{ + struct extern_list *next; + const char *name; +}; + +static struct extern_list *extern_head; + +/* Assemble an external function reference. We need to keep a list of + these, so that we can output the function types at the end of the + assembly. We can't output the types now, because we might see a + definition of the function later on and emit debugging information + for it then. */ + +void +i386_emx_record_external_function (name) + const char *name; +{ + struct extern_list *p; + + p = (struct extern_list *) xmalloc (sizeof *p); + p->next = extern_head; + p->name = name; + extern_head = p; +} +#endif + +/* Keep a list of exported symbols. */ + +struct export_list +{ + struct export_list *next; + tree decl; + const char *name; + const char *asm_name; + const char *exported_name; + unsigned ordinal; + int is_data; /* used to type tag exported symbols. */ +}; + +static struct export_list *export_head; + +/* Assemble an export symbol entry. We need to keep a list of + these, so that we can output the export list at the end of the + assembly. We used to output these export symbols in each function, + but that causes problems with GNU ld when the sections are + linkonce. */ + +void +i386_emx_record_exported_symbol (decl, name, is_data) + tree decl; + const char *name; + int is_data; +{ + struct export_list *p; + DUMP(decl); + + p = (struct export_list *) xmalloc (sizeof *p); + p->next = export_head; + p->decl = decl; + p->name = name; + p->asm_name = NULL; + p->exported_name = NULL; + p->ordinal = 0; + p->is_data = is_data; + export_head = p; +} + +/* This is called at the end of assembly. For each external function + which has not been defined, we output a declaration now. We also + output the .drectve section. */ + +void +i386_emx_asm_file_end (file) + FILE *file; +{ +/* struct extern_list *p; */ + + ix86_asm_file_end (file); + +#if 0 /* don't think we need this */ + for (p = extern_head; p != NULL; p = p->next) + { + tree decl; + + decl = get_identifier (p->name); + + /* Positively ensure only one declaration for any given symbol. */ + if (! TREE_ASM_WRITTEN (decl) && TREE_SYMBOL_REFERENCED (decl)) + { + TREE_ASM_WRITTEN (decl) = 1; + i386_emx_declare_function_type (file, p->name, TREE_PUBLIC (decl)); + } + } +#endif + if (export_head) + { + struct export_list *q; + fprintf (file, "\t%s Exports: \",=,\", N_EXP,0,0,-42\n", ASM_COMMENT_START); + for (q = export_head; q != NULL; q = q->next) + { + static const char * const types[2] = {",code", ",data"}; + tree decl = q->decl; + if (decl) + { + DUMP(decl); + if (!TREE_STATIC (decl)) + continue; + if (!q->asm_name) + q->asm_name = q->exported_name ? q->exported_name + : IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (decl)); + } + if (!q->asm_name) + q->asm_name = q->exported_name ? q->exported_name : q->name; + if (!q->exported_name && !q->ordinal) + q->exported_name = q->asm_name ? q->asm_name : q->name; + fprintf (file, "\t.stabs\t\""); + ASM_OUTPUT_LABELREF(file, q->exported_name); + fprintf (file, ",%u=", q->ordinal); + ASM_OUTPUT_LABELREF(file, q->asm_name); + fprintf (file, "%s\",0x6c,0,0,-42\t%s %s\n", /* 0x6c == N_EXP */ + types[q->is_data], ASM_COMMENT_START, q->name); + } + } +} + + Index: src/gcc/gcc/config/i386/emx.h =================================================================== RCS file: src/gcc/gcc/config/i386/emx.h diff -N src/gcc/gcc/config/i386/emx.h --- nul 1 Jan 1970 00:00:00 -0000 +++ src/gcc/gcc/config/i386/emx.h 6 Jun 2005 02:43:42 -0000 1.37 @@ -0,0 +1,578 @@ +/* Operating system specific defines to be used when targeting GCC for + hosting on OS/2, using InnoTek LIBC and tools. + Copyright (C) 2000(?)-2003 Andrew Zabolotny + Copyright (C) 2003 InnoTek Systemberatung GmbH + Copyright (C) 2003-2004 Knut St. Osmundsen + +This file is part of the InnoTek port of GNU CC. + +GNU CC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU CC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU CC; see the file COPYING. If not, write to +the Free Software Foundation, 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +/* Use #ifdef EMX for issues needed by EMX target. + Use #ifdef __EMX__ for issues needed on a EMX host. + Note that the cross-compiler is untested */ +#define EMX + +/* We do want to add an underscore to the front of each user symbol. */ +#define YES_UNDERSCORES + +/* Debug formats */ +#define DEFAULT_GDB_EXTENSIONS 1 +#define DBX_DEBUGGING_INFO 1 +#define DWARF2_DEBUGGING_INFO 1 +#define PREFERRED_DEBUGGING_TYPE DBX_DEBUG + +/* headers */ +#include /* for FILE* */ +#include "i386/i386.h" +#include "i386/unix.h" +#include "i386/bsd.h" +#include "i386/gstabs.h" /* GAS stabs */ +#include "i386/gas.h" +#include "aoutos.h" /* constructors/destructors/garbage collectors */ + +/* Some additional system-dependent includes... */ +#include +#include + +/* Generate stack probes for allocations bigger than 4000. */ +#define CHECK_STACK_LIMIT 4000 + +/* OS/2 executables ends with .exe, but it's only enforced sometimes... */ +#define TARGET_EXECUTABLE_SUFFIX ".exe" +#define NO_FORCE_EXEOBJ_SUFFIX + +/* The system headers are C++-aware. */ +#define NO_IMPLICIT_EXTERN_C + +/* Don't provide default values for __CTOR_LIST__ and __DTOR_LIST__ in libgcc */ +#define CTOR_LISTS_DEFINED_EXTERNALLY + +/* Enable parsing of #pragma pack(push,) and #pragma pack(pop). */ +#define HANDLE_PRAGMA_PACK_PUSH_POP 1 + +/* Enable #pragma weak (in the limited way OS/2 supports them). */ +#define HANDLE_PRAGMA_WEAK 1 + +/* We support kind of weak symbols */ +#define SUPPORTS_WEAK 1 + +/* We support weak style link-once semantics. */ +#define SUPPORTS_ONE_ONLY 1 + +/* Enabling aliasing. This is wanted especially for weak externals with + defaults. (#483) */ +#define SET_ASM_OP "\t.set\t" + +/* Support for C++ templates. */ +#undef MAKE_DECL_ONE_ONLY +#define MAKE_DECL_ONE_ONLY(DECL) (DECL_WEAK (DECL) = 1) + +/* This is how we tell the assembler that a symbol is weak. */ +#define ASM_WEAKEN_LABEL(FILE, NAME) \ + do \ + { \ + fputs ("\t.weak\t", (FILE)); \ + assemble_name ((FILE), (NAME)); \ + fputc ('\n', (FILE)); \ + } \ + while (0) + +/* Define this macro if in some cases global symbols from one translation + unit may not be bound to undefined symbols in another translation unit + without user intervention. For instance, under Microsoft Windows + symbols must be explicitly imported from shared libraries (DLLs). */ +#define MULTIPLE_SYMBOL_SPACES 1 + +/* We want DWARF2 frame unwind info for exception handling */ +#define DWARF2_UNWIND_INFO 1 + +/* This macros will stick a label to exception table for current file, + and also will put it in a 'ctor/dtor' - like list (using .stabs - this uses + same technique used in aoutos.h) which ld will collect into a single table + and then __ctordtorInit will use this table to make a call to + __register_frame_tableb. */ +#define TARGET_ASM_EH_FRAME_SECTION emx_eh_frame_section + +/* Put exception tables into .data section */ +#define TARGET_ASM_EXCEPTION_SECTION data_section + +/* Terminate DWARF frame unwind info with a closing zero */ +#define DWARF2_FRAMEINFO_NULL_TERMINATED 1 + +/* Define the type for size_t. */ +#define SIZE_TYPE "unsigned int" +#define PTRDIFF_TYPE "int" + +/* wchar_t is unsigned short. */ +#define WCHAR_TYPE "short unsigned int" +#define WCHAR_TYPE_SIZE 16 + +/* We want the _System attribute */ +#define TARGET_SYSTEM_DECL_ATTRIBUTES +#define ix86_handle_system_attribute emx_handle_vacpp_attribute + +/* We want the _Optlink attribute */ +#define TARGET_OPTLINK_DECL_ATTRIBUTES +#define ix86_handle_optlink_attribute emx_handle_vacpp_attribute + +/* Do our own mangling on some kinds of decls */ +#define TARGET_C_SET_DECL_ASSEMBLER_NAME(decl) \ + emx_c_set_decl_assembler_name (decl, 0) +#define TARGET_CXX_SET_DECL_ASSEMBLER_NAME(decl) \ + (emx_c_set_decl_assembler_name (decl, DECL_LANG_SPECIFIC(decl) && DECL_FUNCTION_MEMBER_P (decl))) + +/* #631: Hack (temporary, will be fixed properly 3.4.x it seems) for _Optlink and + _System functions which returns structures. (breaks some tcpip stuff.) */ +#define RETURN_IN_MEMORY_WITH_FNTYPE emx_return_in_memory_with_fntype + +/* For Win32 ABI compatibility. */ +#define DEFAULT_PCC_STRUCT_RETURN 0 + +/* No data type wants to be aligned rounder than this. */ +#define BIGGEST_ALIGNMENT 128 + +/* Win32 complier aligns internal doubles in structures on dword boundaries. + We need to emulate this behaviour for easier porting. */ +#define BIGGEST_FIELD_ALIGNMENT 64 + +/* If bit field type is int, don't let it cross an int, + and give entire struct the alignment of an int. */ +/* Required on the 386 since it doesn't have bitfield insns. */ +#define PCC_BITFIELD_TYPE_MATTERS 1 + +/* Don't continue symbols. I think all relevant tools can handle + symbols of arbitrary length. GAS does not correctly handle + continued symbols: it sometimes emits another symbol before the + continuation. */ +#define DBX_CONTIN_LENGTH 0 + +/* If defined, a C expression whose value is a string containing the + assembler operation to identify the following data as + uninitialized global data. If not defined, and neither + `ASM_OUTPUT_BSS' nor `ASM_OUTPUT_ALIGNED_BSS' are defined, + uninitialized global data will be output in the data section if + `-fno-common' is passed, otherwise `ASM_OUTPUT_COMMON' will be + used. */ +#undef BSS_SECTION_ASM_OP +#define BSS_SECTION_ASM_OP "\t.bss" + +/* A C statement (sans semicolon) to output to the stdio stream + FILE the assembler definition of uninitialized global DECL named + NAME whose size is SIZE bytes and alignment is ALIGN bytes. + Try to use asm_output_aligned_bss to implement this macro. */ +#define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \ + asm_output_aligned_bss (FILE, DECL, NAME, SIZE, ALIGN) + +/* This is how to output an assembler line that says to advance the + location counter to a multiple of 2**LOG bytes. + bird: Pad using int 3. */ +#undef ASM_OUTPUT_ALIGN +#define ASM_OUTPUT_ALIGN(FILE,LOG) \ + if ((LOG)!=0) fprintf ((FILE), "\t.align %d,0xcc\n", LOG) + +/* Output a reference to a label. + We're doing all here since we must get the '*' vs. user_label_prefix + bit right. */ +#undef ASM_OUTPUT_LABELREF +#define ASM_OUTPUT_LABELREF(FILE,NAME) \ + do { \ + const char *xname = (NAME); \ + if (*xname == DLL_IMPORT_EXPORT_PREFIX) \ + xname += 3; \ + if (*xname == '%') \ + xname += 2; \ + if (*xname == '*') \ + xname += 1; \ + else \ + fputs (user_label_prefix, FILE); \ + fputs (xname, FILE); \ + } while (0) + +/* Get tree.c to declare a target-specific specialization of + merge_decl_attributes. */ +#define TARGET_DLLIMPORT_DECL_ATTRIBUTES + +#undef TARGET_ENCODE_SECTION_INFO +#define TARGET_ENCODE_SECTION_INFO i386_emx_encode_section_info + +/* Output a common block. */ +#undef ASM_OUTPUT_ALIGNED_DECL_COMMON +#define ASM_OUTPUT_ALIGNED_DECL_COMMON(STREAM, DECL, NAME, SIZE, ALIGN) \ +do { \ + if (i386_emx_dllexport_name_p (NAME)) \ + i386_emx_record_exported_symbol (DECL, NAME, 1); \ + if (! i386_emx_dllimport_name_p (NAME)) \ + { \ + /* 16 is the best we can do (segment para). */ \ + const int xalign = (ALIGN) > 16 ? 16 : (ALIGN); \ + fprintf ((STREAM), "\t.comm\t"); \ + assemble_name ((STREAM), (NAME)); \ + fprintf ((STREAM), ", %d\t%s %d\n", \ + (((SIZE) + xalign - 1) / xalign) * xalign, \ + ASM_COMMENT_START, (SIZE)); \ + } \ +} while (0) + +/* Output the label for an initialized variable. */ +#undef ASM_DECLARE_OBJECT_NAME +#define ASM_DECLARE_OBJECT_NAME(STREAM, NAME, DECL) \ +do { \ + if (i386_emx_dllexport_name_p (NAME)) \ + i386_emx_record_exported_symbol (DECL, NAME, 1); \ + ASM_OUTPUT_LABEL ((STREAM), (NAME)); \ +} while (0) + +/* Track exported functions... */ +#undef ASM_DECLARE_FUNCTION_NAME +#define ASM_DECLARE_FUNCTION_NAME(FILE, NAME, DECL) \ + do \ + { \ + if (i386_emx_dllexport_name_p (NAME)) \ + i386_emx_record_exported_symbol (DECL, NAME, 0); \ + ASM_OUTPUT_LABEL (FILE, NAME); \ + } \ + while (0) + +/* Output function declarations at the end of the file. */ +#undef ASM_FILE_END +#define ASM_FILE_END(FILE) \ + i386_emx_asm_file_end (FILE) + +/* Use `#' instead of `/' as assembler comments */ +#undef ASM_COMMENT_START +#define ASM_COMMENT_START "#" +#undef ASM_APP_ON +#define ASM_APP_ON "#APP\n" +#undef ASM_APP_OFF +#define ASM_APP_OFF "#NO_APP\n" + +/* This macro gets just the user-specified name out of the string + in a SYMBOL_REF. Discard trailing @[NUM] encoded by ENCODE_SECTION_INFO. + This is used to generate unique section names from function names + (if -ffunction-sections is given). */ +#undef TARGET_STRIP_NAME_ENCODING +#define TARGET_STRIP_NAME_ENCODING emx_strip_name_encoding_full + + +/* External function declarations. */ + +extern int emx_c_set_decl_assembler_name PARAMS ((tree, int)); +extern int emx_return_in_memory_with_fntype PARAMS ((tree type, tree fntype)); +const char *i386_emx_strip_name_encoding PARAMS ((const char *str)); +extern const char * emx_strip_name_encoding_full PARAMS ((const char *)); +extern void emx_eh_frame_section (void); +extern void emx_output_function_begin_epilogue (FILE *); + +/* This function handles both _System and _Optlink attributes. */ +extern tree emx_handle_vacpp_attribute PARAMS ((tree *, tree, tree, int, _Bool *)); + +/* These functions are for handling dllexport and dllimport. */ +extern void i386_emx_record_exported_symbol PARAMS ((tree, const char *, int)); +extern void i386_emx_asm_file_end PARAMS ((FILE *)); +extern int i386_emx_dllexport_name_p PARAMS ((const char *)); +extern int i386_emx_dllimport_name_p PARAMS ((const char *)); +extern void i386_emx_encode_section_info PARAMS ((tree, int)); + + + +/****************************************************************************** + * - S - W - I - T - C - H - E - S - + ******************************************************************************/ + +/* Define an additional switch -m(no-)probe for backward compatibility. + Also define the -m(no-)epilogue switch. */ +#define MASK_EPILOGUE 0x40000000 /* Use FUNCTION_EPILOGUE */ + +/* Masks for subtarget switches used by other files. */ +#define MASK_NOP_FUN_DLLIMPORT 0x08000000 /* Ignore dllimport for functions */ + +#undef SUBTARGET_SWITCHES +#define SUBTARGET_SWITCHES \ + { "probe", MASK_STACK_PROBE, N_("Do stack probing") }, \ + { "no-probe", -MASK_STACK_PROBE, N_("Don't do stack probing") }, \ + { "epilogue", MASK_EPILOGUE, N_("Generate prologue/epilogue labels") }, \ + { "no-epilogue", -MASK_EPILOGUE, N_("Don't generate prologue/epilogue labels") }, \ + { "nop-fun-dllimport", MASK_NOP_FUN_DLLIMPORT, N_("Ignore dllimport for functions") }, \ + { "no-nop-fun-dllimport", -MASK_NOP_FUN_DLLIMPORT, "" }, + +/* Use FUNCTION_EPILOGUE */ +#define TARGET_EPILOGUE (target_flags & MASK_EPILOGUE) + +/* Used in winnt.c. */ +#define TARGET_NOP_FUN_DLLIMPORT (target_flags & MASK_NOP_FUN_DLLIMPORT) + +/* By default, target has a 80387, uses IEEE compatible arithmetic, + and returns float values in the 387 and needs stack probes */ +#undef TARGET_SUBTARGET_DEFAULT +#define TARGET_SUBTARGET_DEFAULT \ + (MASK_80387 | MASK_IEEE_FP | MASK_FLOAT_RETURNS | MASK_STACK_PROBE) + + +/* The -Zstack option takes an argument. */ +#define WORD_SWITCH_TAKES_ARG(STR) (DEFAULT_WORD_SWITCH_TAKES_ARG (STR) \ + || !strcmp (STR, "Zstack")) + +/* Don't allow flag_pic to propagate since gas may produce invalid code + otherwise. */ +#undef SUBTARGET_OVERRIDE_OPTIONS +#define SUBTARGET_OVERRIDE_OPTIONS \ +do { \ + if (flag_pic) \ + { \ + warning ("-f%s ignored for target (all code is position independent)",\ + (flag_pic > 1) ? "PIC" : "pic"); \ + flag_pic = 0; \ + } \ +} while (0) + +/* Add a __POST$xxx label before epilogue if -mepilogue specified */ +#undef TARGET_ASM_FUNCTION_BEGIN_EPILOGUE +#define TARGET_ASM_FUNCTION_BEGIN_EPILOGUE emx_output_function_begin_epilogue + +/* Output assembler code to FILE to increment profiler label # LABELNO + for profiling a function entry. */ + +#undef FUNCTION_PROFILER +#define FUNCTION_PROFILER(FILE, LABELNO) \ +{ \ + fprintf (FILE, "\tcall __mcount\n"); \ +} + + +/****************************************************************************** + * + * + * - S - P - E - C - S - + * + * + ******************************************************************************/ + +#define TARGET_OS_CPP_BUILTINS() \ + do \ + { \ + builtin_define ("_X86_=1"); \ + builtin_define ("__i386"); \ + builtin_define ("__i386__"); \ + builtin_define ("__32BIT__"); \ + builtin_define ("__OS2__"); \ + builtin_define ("__EMX__"); \ + builtin_define ("__MT__"); \ + builtin_assert ("system=unix"); \ + builtin_assert ("system=posix"); \ + builtin_assert ("system=emx"); \ + builtin_define ("__stdcall=__attribute__((__stdcall__))"); \ + builtin_define ("__cdecl=__attribute__((__cdecl__))"); \ + builtin_define ("_Optlink=__attribute__((__optlink__))"); \ + builtin_define ("_System=__attribute__((__system__))"); \ + builtin_define ("_Export=__attribute__((dllexport))"); \ + builtin_define ("__declspec(x)=__attribute__((x))"); \ + if (!flag_iso) \ + { \ + builtin_define ("_stdcall=__attribute__((__stdcall__))"); \ + builtin_define ("_cdecl=__attribute__((__cdecl__))"); \ + builtin_define ("_Cdecl=__attribute__((__cdecl__))"); \ + } \ + } \ + while (0) + +#if 1 +/*------------------------------------------------------------------------------ +* Current default specs which uses aout by default. +*-----------------------------------------------------------------------------*/ + +/* Predefine symbols. */ +#undef CPP_PREDEFINES +#define CPP_PREDEFINES "-D__INNOTEK_LIBC__=0x006" + +/* Provide extra args to the C preprocessor and extra switch-translations. */ +#undef CPP_SPEC +#define CPP_SPEC \ + "%(cpp_cpu) " \ + "%{posix:-D_POSIX_SOURCE} " \ + "%{Zmt*:} %{Zlow-mem:} " \ + "%{pg:-D__GPROF__} " \ + "%{mepilogue:-D__EPILOGUE__} " \ + "%{mprobe|mstack-arg-probe:-D__STACK_PROBE__} " + +/* -s to -Zstrip and -Zomf must be passed down. */ +#define ASM_SPEC "--traditional-format %{Zomf} %{s:-Zstrip}" + +#define ASM_DEBUG_SPEC "%{g*:--gstabs}" + + +/* Here is the spec for running the linker, after compiling all files. */ + +/* Provide extra args to the linker and extra switch-translations. */ +#define LINK_SPEC \ + "%{Zexe} %{Zstack*} %{Zmap*} %{Zdll} %{shared:-Zdll} %{static:-static}" \ + "%{!o*:-o %b%{Zdll|shared:.dll}%{!Zdll:%{!shared:%{!Zexe:.exe}}}} " \ + "%{static:%{Zcrtdll*:%e-static and -Zcrtdll are incompatible}}" \ + "%{Zomf:%{Zaout:%e-Zomf and -Zaout are incompatible}}" \ + "%{Zdll:%{Zexe:%e-Zdll and -Zexe are incompatible}}" \ + "%{shared:%{Zexe:%e-shared and -Zexe are incompatible}}" \ + "%{Zsmall-conv:%{Zcrtdll*:%e-Zsmall-conv and -Zcrtdll are incompatible}}" + +/* Override how and when libgcc.a is included (%G). */ +#if 1 /* shared lib == libcXY.dll (not bootstrapping issues here!) */ +#define LIBGCC_SPEC \ + "%{static|static-libgcc:%{shared-libgcc:%e-static-libgcc and -shared-libgcc are incompatible}}"\ + "%{shared-libgcc:-lgcc_so_d}" \ + "%{!shared-libgcc:%{!static-libgcc:%{!static*:-lgcc_so_d}}}" \ + "%{!shared-libgcc:%{static-libgcc|static:-lgcc_eh -lgcc}}" +#else /* shared lib == gcc334.dll */ +#define LIBGCC_SPEC \ + "%{static|static-libgcc:%{shared-libgcc:%e-static-libgcc and -shared-libgcc are incompatible}}"\ + "%{shared-libgcc:-lgcc%v1%v2%v3}" \ + "%{!shared-libgcc:%{!static-libgcc:%{!static*:-lgcc%v1%v2%v3}}}" \ + "%{!shared-libgcc:%{static-libgcc|static:-lgcc_eh -lgcc}}" +#endif + +/* We have a shared libgcc, but don't need this extra handling. */ +#undef ENABLE_SHARED_LIBGCC + +/* Override the default libraries (%L). */ +#define LIB_SPEC \ + "-lc_alias " \ + "%{!static:-lc_dll}" \ + "%{static:-lc%{p|pg:_p}_s %{!Zdll:%{!shared:-lc_app%{pg:_p}}}} " \ + "-los2%{p|pg:_p}" + +/* Override the default crt0 files. + bird: we might consider kicking gcrt & mcrt stuff now... */ +#define STARTFILE_SPEC \ + "%{Zno-high-mem:}%{Zfork:}%{Zunix:}" \ + "%{Zdll|shared:dll0%{Zhigh-mem:hi}%{Zno-fork:nofork}%{Zno-unix:noux}%O%{Zomf:bj}%s}" \ + "%{!Zdll:%{!shared:%{pg:gcrt0%O%{Zomf:bj}%s}" \ + "%{!pg:%{pn:gcrt0%O%{Zomf:bj}%s}" \ + "%{!pn:%{p:mcrt0%O%{Zomf:bj}%s}" \ + "%{!p:crt0%{Zhigh-mem:hi}%{Zno-fork:nofork}%{Zno-unix:noux}%{Zargs-wild:wild}%{Zargs-resp:resp}%O%{Zomf:bj}%s}}}}" \ + " %{Zbin-files:binmode%O%{Zomf:bj}%s}" \ + " %{Zsmall-conv:smallcnv%O%{Zomf:bj}%s}}" + +/* Prefer symbols in %L (-lc) over %G (libcAB.dll includes gcc3XY.dll). + For the GNU linker we need to repeate everything as it doesn't + restart the library search as the IBM and M$ linkers do. */ +#define LINK_GCC_C_SEQUENCE_SPEC "%L %G %L %{!Zomf:%G %L %G %L %G %L}" + +#define ENDFILE_SPEC "%{Zomf:-lend}" + +/* Override the default linker program (collect2). */ +#define LINKER_NAME "%{Zomf:emxomf}ld.exe" + + + +#else +/*------------------------------------------------------------------------------ +* As the above specs but defaults to OMF. +* Note: this is not updated lately. +*-----------------------------------------------------------------------------*/ + +/* Predefine symbols. */ +#undef CPP_PREDEFINES +#define CPP_PREDEFINES "" + +/* Provide extra args to the C preprocessor and extra switch-translations. */ +#undef CPP_SPEC +#define CPP_SPEC \ + "%(cpp_cpu) " \ + "%{posix:-D_POSIX_SOURCE} " \ + "%{Zmt*:} %{Zlow-mem:} " \ + "%{pg:-D__GPROF__} " \ + "%{mepilogue:-D__EPILOGUE__} " \ + "%{mprobe|mstack-arg-probe:-D__STACK_PROBE__} " + +/* -s to -Zstrip and -Zomf must be passed down. */ +#define ASM_SPEC "--traditional-format %{!Zaout:-Zomf} %{s:-Zstrip}" + +#define ASM_DEBUG_SPEC "%{g*:--gstabs}" + + +/* Here is the spec for running the linker, after compiling all files. */ + +/* Provide extra args to the linker and extra switch-translations. */ +#define LINK_SPEC \ + "%{Zexe} %{Zstack*} %{Zmap*} %{!Zaout:%{Zdll}} " \ + "%{!o*:-o %b%{Zdll:.dll}%{!Zdll:%{!Zexe:.exe}}} " \ + "%{static:%{Zcrtdll*:%e-static and -Zcrtdll are incompatible}}" \ + "%{Zomf:%{Zaout:%e-Zomf and -Zaout are incompatible}}" \ + "%{Zdll:%{Zexe:%e-Zdll and -Zexe are incompatible}}" \ + "%{Zsmall-conv:%{Zcrtdll*:%e-Zsmall-conv and -Zcrtdll are incompatible}}" + +/* Override how and when libgcc.a is included (%G). */ +#define LIBGCC_SPEC \ + "%{static|static-libgcc:%{shared-libgcc:%e-static-libgcc and -shared-libgcc are incompatible}}"\ + "%{shared-libgcc:-lgcc%v1%v2%v3}" \ + "%{!shared-libgcc:%{!static-libgcc:%{!static:-lgcc%v1%v2%v3}}}" \ + "%{!shared-libgcc:%{static-libgcc|static:-lgcc_eh -lgcc}}" + +/* We have a shared libgcc, but don't need this extra handling. */ +#undef ENABLE_SHARED_LIBGCC + +/* Override the default libraries (%L). */ +#define LIB_SPEC \ + "-lc_alias " \ + "%{!static:-lc_dll}" \ + "%{static:-lc%{p|pg:_p}_s %{!Zdll:-lc_app%{pg:_p}}} -los2%{p|pg:_p}" + +/* Override the default crt0 files. */ +#define STARTFILE_SPEC \ + "%{Zno-high-mem:}%{Zfork:}%{Zunix:}" \ + "%{Zdll:dll0%{Zhigh-mem:hi}%{Zno-fork:nofork}%{Zno-unix:noux}%O%{!Zaout:bj}%s}" \ + "%{!Zdll:%{pg:gcrt0%O%{!Zaout:bj}%s}" \ + "%{!pg:%{pn:gcrt0%O%{!Zaout:bj}%s}%{!pn:%{p:mcrt0%O%{!Zaout:bj}%s}%{!p:crt0%{Zhigh-mem:hi}%{Zno-fork:nofork}%{Zno-unix:noux}%{Zargs-wild:wild}%{Zargs-resp:resp}%O%{!Zaout:bj}%s}}}"\ + " %{Zbin-files:binmode%O%{!Zaout:bj}%s} %{Zsmall-conv:smallcnv%O%{!Zaout:bj}%s}}" + +/* Prefer symbols in %L (-lc) over %G (libcAB.dll includes gcc3XY.dll). + For the GNU linker we need to repeate everything as it doesn't + restart the library search as the IBM and M$ linkers do. */ +#define LINK_GCC_C_SEQUENCE_SPEC "%L %G %L %{Zaout:%G %L %G %L %G %L}" + +#define ENDFILE_SPEC "%{!Zaout:-lend}" + +/* Override the default linker program (collect2). */ +#define LINKER_NAME "%{!Zaout:emxomf}ld.exe" + +#endif + + +/* The following will be defined only when compiling libgcc2 + * to avoid including large .h files when they are not needed. + * Including them is neccessary to avoid 'implicit declatation' + * warnings, and also for __write. + */ +#ifdef IN_LIBGCC2 +/* define "write" and some other external functions for libgcc */ +#define write __write + +#include +#include +#include +#include + +extern void __ctordtorInit (void); +extern void __ctordtorTerm (void); + +/* Invoke static object constructors/destructors */ +/* Also register/deregister frame unwind information */ +#define DO_GLOBAL_CTORS_BODY __ctordtorInit () +#define DO_GLOBAL_DTORS_BODY __ctordtorTerm () + +/* We call register_frame_table ourselves */ +#define DONT_AUTOREGISTER_FRAME_INFO + +#endif + Index: src/gcc/gcc/config/i386/i386-protos.h =================================================================== RCS file: /gccos2/src/gcc/gcc/config/i386/i386-protos.h,v retrieving revision 1.1.1.2 retrieving revision 1.4 diff -w -u -r1.1.1.2 -r1.4 --- src/gcc/gcc/config/i386/i386-protos.h 27 Apr 2004 18:38:15 -0000 1.1.1.2 +++ src/gcc/gcc/config/i386/i386-protos.h 28 Apr 2004 04:57:44 -0000 1.4 @@ -204,6 +204,8 @@ #endif #ifdef TREE_CODE +extern int ix86_check_append_attr PARAMS ((tree, tree, bool *)); + extern int ix86_return_pops_args PARAMS ((tree, tree, int)); extern tree ix86_build_va_list PARAMS ((void)); @@ -217,6 +219,12 @@ int)); extern void i386_pe_asm_named_section PARAMS ((const char *, unsigned int)); extern int x86_field_alignment PARAMS ((tree, int)); +#endif + +#ifdef GCC_DIAGNOSTIC_H +#define TARGET_PRINT_TYPE_ATTRS(t, scratch_buffer) \ + ix86_print_attributes (t, scratch_buffer) +extern void ix86_print_attributes PARAMS ((tree type, struct output_buffer *scratch_buffer)); #endif extern rtx ix86_tls_get_addr PARAMS ((void)); Index: src/gcc/gcc/config/i386/i386.c =================================================================== RCS file: /gccos2/src/gcc/gcc/config/i386/i386.c,v retrieving revision 1.1.1.3 retrieving revision 1.18 diff -w -u -r1.1.1.3 -r1.18 --- src/gcc/gcc/config/i386/i386.c 7 Sep 2004 01:50:17 -0000 1.1.1.3 +++ src/gcc/gcc/config/i386/i386.c 8 Sep 2004 00:03:18 -0000 1.18 @@ -23,6 +23,7 @@ #include "system.h" #include "rtl.h" #include "tree.h" +#include "diagnostic.h" #include "tm_p.h" #include "regs.h" #include "hard-reg-set.h" @@ -692,6 +693,11 @@ /* Power of two alignment for non-loop jumps. */ const char *ix86_align_jumps_string; +#ifndef DONT_ALIGN_CONST +/* Power of two alignment for constant strings in bytes. */ +const char *ix86_align_constr_string; +#endif + /* Power of two alignment for stack boundary in bytes. */ const char *ix86_preferred_stack_boundary_string; @@ -705,6 +711,11 @@ /* Power of two alignment for functions. */ const char *ix86_align_funcs_string; +#ifndef DONT_ALIGN_CONST +/* Power of two alignment for constant strings. */ +int ix86_align_constr; +#endif + /* Prefix built by ASM_GENERATE_INTERNAL_LABEL. */ static char internal_label_prefix[16]; static int internal_label_prefix_len; @@ -800,7 +811,9 @@ static int ix86_comp_type_attributes PARAMS ((tree, tree)); static int ix86_fntype_regparm PARAMS ((tree)); const struct attribute_spec ix86_attribute_table[]; +#ifndef EMX static tree ix86_handle_cdecl_attribute PARAMS ((tree *, tree, tree, int, bool *)); +#endif static tree ix86_handle_regparm_attribute PARAMS ((tree *, tree, tree, int, bool *)); static int ix86_value_regno PARAMS ((enum machine_mode)); static bool contains_128bit_aligned_vector_p PARAMS ((tree)); @@ -954,16 +967,21 @@ const int align_jump_max_skip; const int align_func; const int branch_cost; +#ifndef DONT_ALIGN_CONST + const int align_constr; +#else + const int align_constr_dummy; +#endif } const processor_target_table[PROCESSOR_max] = { - {&i386_cost, 0, 0, 4, 3, 4, 3, 4, 1}, - {&i486_cost, 0, 0, 16, 15, 16, 15, 16, 1}, - {&pentium_cost, 0, 0, 16, 7, 16, 7, 16, 1}, - {&pentiumpro_cost, 0, 0, 16, 15, 16, 7, 16, 1}, - {&k6_cost, 0, 0, 32, 7, 32, 7, 32, 1}, - {&athlon_cost, 0, 0, 16, 7, 64, 7, 16, 1}, - {&pentium4_cost, 0, 0, 0, 0, 0, 0, 0, 1} + {&i386_cost, 0, 0, 4, 3, 4, 3, 4, 1, 2}, + {&i486_cost, 0, 0, 16, 15, 16, 15, 16, 1, 2}, + {&pentium_cost, 0, 0, 16, 7, 16, 7, 16, 1, 5}, + {&pentiumpro_cost, 0, 0, 16, 15, 16, 7, 16, 1, 5}, + {&k6_cost, 0, 0, 32, 7, 32, 7, 32, 1, 5}, + {&athlon_cost, 0, 0, 16, 7, 64, 7, 16, 1, 5}, + {&pentium4_cost, 0, 0, 0, 0, 0, 0, 0, 1, 0} }; static const char * const cpu_names[] = TARGET_CPU_DEFAULT_NAMES; @@ -1239,6 +1257,20 @@ ix86_preferred_stack_boundary = (1 << i) * BITS_PER_UNIT; } + +#ifndef DONT_ALIGN_CONST + /* Validate -malign-strings= value, or provide default. */ + ix86_align_constr = processor_target_table[ix86_cpu].align_constr; + if (ix86_align_constr_string) + { + i = atoi (ix86_align_constr_string); + if (i < 0 || i > MAX_CODE_ALIGN) + error ("-malign-strings=%d is not between 0 and %d", i, MAX_CODE_ALIGN); + else + ix86_align_constr = i; + } +#endif + /* Validate -mbranch-cost= value, or provide default. */ ix86_branch_cost = processor_target_table[ix86_cpu].branch_cost; if (ix86_branch_cost_string) @@ -1384,15 +1416,25 @@ flag_asynchronous_unwind_tables = 2; } -/* Table of valid machine attributes. */ +/* Table of valid machine attributes. + If you change it, you must change the array at the beginning of + ix86_comp_type_attributes() as well! */ const struct attribute_spec ix86_attribute_table[] = { /* { name, min_len, max_len, decl_req, type_req, fn_type_req, handler } */ +#ifdef EMX /** @todo: ugly stuff, cleanup later. */ + /* Stdcall attribute says callee is responsible for popping arguments + if they are not variable. */ + { "stdcall", 0, 0, false, false, false, ix86_handle_system_attribute }, + /* Cdecl attribute says the callee is a normal C declaration */ + { "cdecl", 0, 0, false, false, false, ix86_handle_system_attribute }, +#else /* Stdcall attribute says callee is responsible for popping arguments if they are not variable. */ { "stdcall", 0, 0, false, true, true, ix86_handle_cdecl_attribute }, /* Cdecl attribute says the callee is a normal C declaration */ { "cdecl", 0, 0, false, true, true, ix86_handle_cdecl_attribute }, +#endif /* Regparm attribute specifies how many integer arguments are to be passed in registers. */ { "regparm", 1, 1, false, true, true, ix86_handle_regparm_attribute }, @@ -1401,9 +1443,104 @@ { "dllexport", 0, 0, false, false, false, ix86_handle_dll_attribute }, { "shared", 0, 0, true, false, false, ix86_handle_shared_attribute }, #endif +#ifdef EMX /** @todo: ugly stuff, cleanup later. */ +#ifdef TARGET_SYSTEM_DECL_ATTRIBUTES + /* System says the function is extern "C" and is not underscored. */ + { "system", 0, 0, false, false, false, ix86_handle_system_attribute }, +#endif +#ifdef TARGET_OPTLINK_DECL_ATTRIBUTES + /* Optlink is like regparm with a few differences */ + { "optlink", 0, 0, false, false, false, ix86_handle_optlink_attribute }, +#endif +#else +#ifdef TARGET_SYSTEM_DECL_ATTRIBUTES + /* System says the function is extern "C" and is not underscored. */ + { "system", 0, 0, false, true, true, ix86_handle_system_attribute }, +#endif +#ifdef TARGET_OPTLINK_DECL_ATTRIBUTES + /* Optlink is like regparm with a few differences */ + { "optlink", 0, 0, false, true, true, ix86_handle_optlink_attribute }, +#endif +#endif { NULL, 0, 0, false, false, false, NULL } }; +/* The attribute denotes a calling convention */ +#define IX86_ATTR_TYPE_CALLCONV 0x00010000 +/* Calling convention mask: attributes with bits + in these positions equal are nealy compatible */ +#define IX86_ATTR_MASK_CALLCONV 0x0000000f +/* Ordinal number for attributes with equal calling convention bits */ +#define IX86_ATTR_MASK_ORDINAL 0x000000f0 + +/* This array contains some flags containing additional information + about attributes. Keep it in sync with ix86_attribute_table. */ +static unsigned ix86_attribute_codes [] = +{ + IX86_ATTR_TYPE_CALLCONV | 0x01, /* stdcall */ + IX86_ATTR_TYPE_CALLCONV | 0x02, /* cdecl */ + IX86_ATTR_TYPE_CALLCONV | 0x03, /* regparm */ +#ifdef TARGET_DLLIMPORT_DECL_ATTRIBUTES + 0, /* dllimport */ + 0, /* dllexport */ + 0, /* shared */ +#endif +#ifdef TARGET_SYSTEM_DECL_ATTRIBUTES + IX86_ATTR_TYPE_CALLCONV | 0x12, /* system is compatible with cdecl */ +#endif +#ifdef TARGET_OPTLINK_DECL_ATTRIBUTES + IX86_ATTR_TYPE_CALLCONV | 0x04, /* optlink */ +#endif +}; + + +/* Check if we don't have incompatible calling conversion attributes */ +int +ix86_check_append_attr (type, name, no_add_attrs) + tree type, name; + bool *no_add_attrs; +{ + /* ??? use ix86_comp_type_attributes maybe ??? */ + unsigned i; + const char *exclname; + + exclname = IDENTIFIER_POINTER (name); + if (exclname [0] == '_') + { + /* Remove leading and trailing underscores */ + const char *x1, *x2; + char *newname; + x1 = exclname + 1; + while (*x1 == '_') + x1++; + x2 = strchr (x1, 0); + while (x2 [-1] == '_' && x2 > x1) + x2--; + newname = alloca (x2 - x1 + 1); + memcpy (newname, x1, x2 - x1); + newname [x2 - x1] = 0; + exclname = newname; + } + + for (i = 0; ix86_attribute_table [i].name; i++) + if ((ix86_attribute_codes [i] & IX86_ATTR_TYPE_CALLCONV) + && lookup_attribute (ix86_attribute_table [i].name, TYPE_ATTRIBUTES (type))) + { + /* Warn if we have another calling convention attribute and it is + different from the currently processed attribute. If there is + already an attribute with the same name attached, silently ignore + currently processed attribute. */ + if (strcmp (exclname, ix86_attribute_table [i].name)) + warning ("`%s' attribute is incompatible with earlier defined `%s' attribute", + IDENTIFIER_POINTER (name), ix86_attribute_table [i].name); + *no_add_attrs = true; + return -1; + } + + return 0; +} + +#ifndef EMX /* Handle a "cdecl" or "stdcall" attribute; arguments as in struct attribute_spec.handler. */ static tree @@ -1430,8 +1567,13 @@ *no_add_attrs = true; } + /* Check if the attributes are compatible */ + if (ix86_check_append_attr (*node, name, no_add_attrs)) + return NULL_TREE; + return NULL_TREE; } +#endif /* Handle a "regparm" attribute; arguments as in struct attribute_spec.handler. */ @@ -1471,9 +1613,41 @@ } } + /* Check if the attributes are compatible */ + if (ix86_check_append_attr (*node, name, no_add_attrs)) + return NULL_TREE; + return NULL_TREE; } +/* Adds calling convention to a function dump. (diagnostic) */ +void ix86_print_attributes (type, scratch_buffer) + tree type; + struct output_buffer *scratch_buffer; +{ + tree attr; + + if (lookup_attribute ("cdecl", TYPE_ATTRIBUTES (type))) + output_add_string(scratch_buffer, "__attribute__((cdecl)) "); + if (lookup_attribute ("stdcall", TYPE_ATTRIBUTES (type))) + output_add_string(scratch_buffer, "__attribute__((stdcall)) "); + if ((attr = lookup_attribute ("regparm", TYPE_ATTRIBUTES (type)))) + { + char temp [32]; + int nregs = TREE_INT_CST_LOW (TREE_VALUE (TREE_VALUE (attr))); + sprintf (temp, "__attribute__((regparm(%d))) ", nregs); + output_add_string(scratch_buffer, temp); + } +#ifdef TARGET_SYSTEM_DECL_ATTRIBUTES + if (lookup_attribute ("system", TYPE_ATTRIBUTES (type))) + output_add_string(scratch_buffer, "__attribute__((system)) "); +#endif +#ifdef TARGET_OPTLINK_DECL_ATTRIBUTES + if (lookup_attribute ("optlink", TYPE_ATTRIBUTES (type))) + output_add_string(scratch_buffer, "__attribute__((optlink)) "); +#endif +} + /* Return 0 if the attributes for two types are incompatible, 1 if they are compatible, and 2 if they are nearly compatible (which causes a warning to be generated). */ @@ -1483,17 +1657,51 @@ tree type1; tree type2; { - /* Check for mismatch of non-default calling convention. */ - const char *const rtdstr = TARGET_RTD ? "cdecl" : "stdcall"; + unsigned i, cc1 = 0, cc2 = 0; + + /* The following calling conventions have meaning only for functions, + methods and pointers to such. */ + if (TREE_CODE (type1) == POINTER_TYPE) + type1 = TREE_TYPE(type1); + if (TREE_CODE (type2) == POINTER_TYPE) + type2 = TREE_TYPE(type2); + if ( TREE_CODE (type1) != FUNCTION_TYPE + && TREE_CODE (type1) != METHOD_TYPE + && TREE_CODE (type2) != FUNCTION_TYPE + && TREE_CODE (type2) != METHOD_TYPE) + return 1; + + /* The function may have only one calling convention. + * For simplicity we translate the calling conversion attribute + * to a numeric constant, then the numbers are compared. + * + * If the top 4 bits are the same, the types are compatible + * (e.g. issue a warning but allow the operation). + */ + for (i = 0; ix86_attribute_table [i].name; i++) + if (ix86_attribute_codes [i] & IX86_ATTR_TYPE_CALLCONV) + { + if (lookup_attribute (ix86_attribute_table [i].name, TYPE_ATTRIBUTES (type1))) + cc1 = ix86_attribute_codes [i]; + if (lookup_attribute (ix86_attribute_table [i].name, TYPE_ATTRIBUTES (type2))) + cc2 = ix86_attribute_codes [i]; + } - if (TREE_CODE (type1) != FUNCTION_TYPE) + if (!cc1) + cc1 = ix86_attribute_codes [TARGET_RTD ? 0 : 1]; + if (!cc2) + cc2 = ix86_attribute_codes [TARGET_RTD ? 0 : 1]; + + /* If calling conventions are the same, its okay */ + if (cc1 == cc2) return 1; - /* Check for mismatched return types (cdecl vs stdcall). */ - if (!lookup_attribute (rtdstr, TYPE_ATTRIBUTES (type1)) - != !lookup_attribute (rtdstr, TYPE_ATTRIBUTES (type2))) + /* If they are not compatible, return 0 */ + if ((cc1 ^ cc2) & IX86_ATTR_MASK_CALLCONV) return 0; - return 1; + + /* They are nearly compatible */ + return 2; } /* Return the regparm value for a fuctio with the indicated TYPE. */ @@ -1537,7 +1745,11 @@ int rtd = TARGET_RTD && (!fundecl || TREE_CODE (fundecl) != IDENTIFIER_NODE); /* Cdecl functions override -mrtd, and never pop the stack. */ - if (! lookup_attribute ("cdecl", TYPE_ATTRIBUTES (funtype))) { + if (! lookup_attribute ("cdecl", TYPE_ATTRIBUTES (funtype)) +#ifdef TARGET_SYSTEM_DECL_ATTRIBUTES + && ! lookup_attribute ("system", TYPE_ATTRIBUTES (funtype)) +#endif + ) { /* Stdcall functions will pop the stack if not variable args. */ if (lookup_attribute ("stdcall", TYPE_ATTRIBUTES (funtype))) @@ -1623,6 +1835,12 @@ if (attr) cum->nregs = TREE_INT_CST_LOW (TREE_VALUE (TREE_VALUE (attr))); +#ifdef TARGET_OPTLINK_DECL_ATTRIBUTES + if (lookup_attribute ("optlink", TYPE_ATTRIBUTES (fntype))) + { + cum->nregs = 3; cum->optlink = 1; + } +#endif } cum->maybe_vaarg = false; @@ -1633,17 +1851,55 @@ if (cum->nregs) { +#ifdef TARGET_OPTLINK_DECL_ATTRIBUTES + if (cum->optlink) + { + /* Only arguments until the ellipsis are passed in registers. Count them. */ + cum->nregs = 0; + cum->fpu_nregs = 0; + /* The total size of arguments passed in registers can be up to 12 dwords. + Float types count for their real size (e.g. float for 1 dword, double + for 2 dwords, long double for 4 dwords). */ + cum->ec_slots = 12; + } +#endif for (param = (fntype) ? TYPE_ARG_TYPES (fntype) : 0; param != 0; param = next_param) { +#ifdef TARGET_OPTLINK_DECL_ATTRIBUTES + if (cum->optlink) + { + if (INTEGRAL_TYPE_P (TREE_VALUE (param)) + || POINTER_TYPE_P (TREE_VALUE (param))) + cum->nregs++; + else if (TREE_CODE (TREE_VALUE (param)) == REAL_TYPE) + cum->fpu_nregs++; + } +#endif next_param = TREE_CHAIN (param); if (next_param == 0 && TREE_VALUE (param) != void_type_node) { +#ifdef TARGET_OPTLINK_DECL_ATTRIBUTES + /* _Optlink calling convention says all args until the ellipsis + are passed in registers, and all varargs on the stack. */ + if (!cum->optlink) +#endif if (!TARGET_64BIT) cum->nregs = 0; cum->maybe_vaarg = true; } } + +#ifdef TARGET_OPTLINK_DECL_ATTRIBUTES + /* Limit number of registers to pass arguments as in _Optlink specification */ + if (cum->optlink) + { + if (cum->nregs > 3) + cum->nregs = 3; + if (cum->fpu_nregs > 4) + cum->fpu_nregs = 4; + } +#endif } if ((!fntype && !libname) || (fntype && !TYPE_ARG_TYPES (fntype))) @@ -2211,7 +2467,11 @@ } else { - if (TARGET_SSE && mode == TImode) + if (TARGET_SSE && mode == TImode +#ifdef TARGET_OPTLINK_DECL_ATTRIBUTES + && !cum->optlink +#endif + ) { cum->sse_words += words; cum->sse_nregs -= 1; @@ -2225,6 +2485,61 @@ else { cum->words += words; +#ifdef TARGET_OPTLINK_DECL_ATTRIBUTES + /* Optlink functions never pass aggregates in registers + (they are pushed on the stack, and the registers are + preserved for following parameters). */ + if (cum->optlink) + { + /* If out of eyecatcher slots, do nothing */ + if (!cum->ec_slots) + return; + + if (INTEGRAL_TYPE_P (type) + || POINTER_TYPE_P (type)) + { + /* Integer types takes one slot in eyecatcher */ + cum->ec_slots--; + } + else if (FLOAT_MODE_P (mode)) + { + /* Fixed-point parameters are passed in FPU registers */ + if (cum->fpu_nregs) + { + cum->fpu_nregs--; + cum->fpu_regno++; + /* Args passed in FPU stack takes one eyecatcher slot */ + cum->ec_slots--; + } + else + { + /* FPU args passed on RT stack takes 1/2/4 slots */ + cum->ec_slots -= words; + } + + /* The case with ec_slots <= 0 will be catched a little lates */ + if (cum->ec_slots > 0) + return; + } + else + { + /* This is nor a integer, address or float parameter. + Pass it on the stack but count its size in eyecatcher. */ + cum->ec_slots -= words; + if (cum->ec_slots > 0) + return; + } + + /* If we're out of eyecatcher slots, pass the arg on the stack */ + if (cum->ec_slots <= 0) + { + cum->ec_slots = 0; + cum->nregs = 0; + cum->fpu_nregs = 0; + return; + } + } +#endif cum->nregs -= words; cum->regno += words; @@ -2282,12 +2597,42 @@ &x86_64_int_parameter_registers [cum->regno], cum->sse_regno); else + { +#ifdef TARGET_OPTLINK_DECL_ATTRIBUTES + /* For optlink calling convention, don't pass anything other than + integral types and floats through registers. */ + if (!cum->optlink + || INTEGRAL_TYPE_P (type) + || POINTER_TYPE_P (type) + || (TREE_CODE (type) == REAL_TYPE)) +#endif switch (mode) { /* For now, pass fp/complex values on the stack. */ default: break; +#if defined TARGET_OPTLINK_DECL_ATTRIBUTES + case QFmode: + case HFmode: + case TQFmode: + case SFmode: + case DFmode: + case XFmode: + case TFmode: + if (cum->fpu_nregs && cum->optlink && cum->ec_slots) + { + /* Pass first four floating-point args in FPU registers */ + ret = gen_rtx (PARALLEL, mode, rtvec_alloc (2)); + XVECEXP (ret, 0, 0) = gen_rtx (EXPR_LIST, VOIDmode, + NULL_RTX, const0_rtx); + XVECEXP (ret, 0, 1) = gen_rtx (EXPR_LIST, VOIDmode, + gen_rtx (REG, mode, FIRST_FLOAT_REG + cum->fpu_regno), + const0_rtx); + } + break; +#endif + case BLKmode: if (bytes < 0) break; @@ -2297,13 +2642,37 @@ case HImode: case QImode: if (words <= cum->nregs) +#ifdef TARGET_OPTLINK_DECL_ATTRIBUTES + { + if (cum->optlink) + { + if (cum->ec_slots) + { + /* Optlink specs says that the parameter is passed in a register + and space on the stack is reserved for it as well (which is not + filled). Currently GCC will pass the parameter *both* in register + and stack; this is suboptimal but is compatible. */ + ret = gen_rtx (PARALLEL, mode, rtvec_alloc (2)); + XVECEXP (ret, 0, 0) = gen_rtx (EXPR_LIST, VOIDmode, + NULL_RTX, const0_rtx); + XVECEXP (ret, 0, 1) = gen_rtx (EXPR_LIST, VOIDmode, + gen_rtx (REG, mode, cum->regno), + const0_rtx); + } + } + else ret = gen_rtx_REG (mode, cum->regno); + } +#else + ret = gen_rtx_REG (mode, cum->regno); +#endif break; case TImode: if (cum->sse_nregs) ret = gen_rtx_REG (mode, cum->sse_regno); break; } + } if (TARGET_DEBUG_ARG) { @@ -2311,6 +2680,12 @@ "function_arg (size=%d, wds=%2d, nregs=%d, mode=%4s, named=%d, ", words, cum->words, cum->nregs, GET_MODE_NAME (mode), named); +#ifdef TARGET_OPTLINK_DECL_ATTRIBUTES + if (ret && GET_CODE (ret) == PARALLEL) + fprintf (stderr, ", stack/reg=%%e%s", + reg_names[ REGNO(XEXP (XVECEXP (ret, 0, 1), 0))]); + else +#endif if (ret) print_simple_rtl (stderr, ret); else @@ -4049,6 +4424,10 @@ { struct ix86_frame frame; +#ifdef EMX + if (TARGET_EPILOGUE) + return 0; +#endif /* EMX */ #ifdef NON_SAVING_SETJMP if (NON_SAVING_SETJMP && current_function_calls_setjmp) return 0; @@ -7642,11 +8021,15 @@ emit_insn (gen_x86_fnstcw_1 (normal)); emit_move_insn (reg, normal); +#ifdef EMX /* #563: On OS/2 we need to mask exceptions. */ + emit_insn (gen_iorhi3 (reg, reg, GEN_INT (0xc3f))); +#else if (!TARGET_PARTIAL_REG_STALL && !optimize_size && !TARGET_64BIT) emit_insn (gen_movsi_insv_1 (reg, GEN_INT (0xc))); else emit_insn (gen_iorhi3 (reg, reg, GEN_INT (0xc00))); +#endif emit_move_insn (round_down, reg); } @@ -7679,6 +8062,9 @@ output_asm_insn ("fistp%z0\t%0", operands); else output_asm_insn ("fist%z0\t%0", operands); +#ifdef EMX /* #563: On OS/2 we need to clear exception flags. */ + output_asm_insn ("fnclex", operands); +#endif output_asm_insn ("fldcw\t%2", operands); return ""; @@ -11980,8 +12366,13 @@ return 128; } else if (TREE_CODE (exp) == STRING_CST && TREE_STRING_LENGTH (exp) >= 31 +#ifndef DONT_ALIGN_CONST + && !optimize_size && align < (8 << ix86_align_constr)) + return 8 << ix86_align_constr; +#else && align < 256) return 256; +#endif return align; } Index: src/gcc/gcc/config/i386/i386.h =================================================================== RCS file: /gccos2/src/gcc/gcc/config/i386/i386.h,v retrieving revision 1.1.1.2 retrieving revision 1.5 diff -w -u -r1.1.1.2 -r1.5 --- src/gcc/gcc/config/i386/i386.h 27 Apr 2004 18:38:15 -0000 1.1.1.2 +++ src/gcc/gcc/config/i386/i386.h 28 Apr 2004 05:43:33 -0000 1.5 @@ -403,6 +403,14 @@ redefines this to 1. */ #define TARGET_MACHO 0 +#ifndef DONT_ALIGN_CONST +#define TARGET_OPTIONS_ALIGN \ + { "align-strings=", &ix86_align_constr_string, \ + N_("Constant strings are aligned to this power of 2") }, +#else +#define TARGET_OPTIONS_ALIGN +#endif + /* This macro is similar to `TARGET_SWITCHES' but defines names of command options that have values. Its definition is an initializer with a subgrouping for each command option. @@ -427,6 +435,7 @@ N_("Jump targets are aligned to this power of 2") }, \ { "align-functions=", &ix86_align_funcs_string, \ N_("Function starts are aligned to this power of 2") }, \ + TARGET_OPTIONS_ALIGN \ { "preferred-stack-boundary=", \ &ix86_preferred_stack_boundary_string, \ N_("Attempt to keep stack aligned to this power of 2") }, \ @@ -1710,6 +1719,12 @@ int sse_nregs; /* # sse registers available for passing */ int sse_regno; /* next available sse register number */ int maybe_vaarg; /* true for calls to possibly vardic fncts. */ +#ifdef EMX + int fpu_regno; /* next available FPU register number */ + int fpu_nregs; /* # registers available for passing */ + int ec_slots; /* # eyecatcher slots left (see optlink specs) */ + int optlink; /* nonzero if optlink (vs. regparm) */ +#endif /* EMX */ } CUMULATIVE_ARGS; /* Initialize a variable CUM of type CUMULATIVE_ARGS @@ -3441,6 +3456,9 @@ extern const char *ix86_align_loops_string; extern const char *ix86_align_jumps_string; extern const char *ix86_align_funcs_string; +#ifndef DONT_ALIGN_CONST +extern const char *ix86_align_constr_string; /* power of two alignment for constant strings */ +#endif /* Smallest class containing REGNO. */ extern enum reg_class const regclass_map[FIRST_PSEUDO_REGISTER]; Index: src/gcc/gcc/config/i386/t-emx =================================================================== RCS file: src/gcc/gcc/config/i386/t-emx diff -N src/gcc/gcc/config/i386/t-emx --- nul 1 Jan 1970 00:00:00 -0000 +++ src/gcc/gcc/config/i386/t-emx 1 May 2004 08:57:23 -0000 1.27 @@ -0,0 +1,98 @@ +# start-of-file: $Id: t-emx,v 1.27 2004/05/01 08:57:23 bird Exp $ +# +# InnoTek GCC for OS/2 target stuff. +# + +# Native include directory. +ifdef PATH_IGCC +NATIVE_SYSTEM_HEADER_DIR = $(PATH_IGCC)/include +else +ifdef PATH_EMXPGCC +NATIVE_SYSTEM_HEADER_DIR = $(PATH_EMXPGCC)/include +else +ifdef PATH_EMX +NATIVE_SYSTEM_HEADER_DIR = $(PATH_EMX)/include +endif +endif +endif + + +# DLL version string. +gccdll_version = $(subst .,,$(gcc_version)) + +# The command to run REXX scripts (you overload) +REXX ?= kRx.exe + +# The OS/2 target have shared libgcc, but the names are release specific and constrained by 8.3 limits. +SHLIB_BASENAME = gcc$(gccdll_version) +SHLIB_MULTINAME = $(SHLIB_BASENAME) +SHLIB_DLLNAME = $(SHLIB_MULTINAME).dll +SHLIB_LINK = export DLLAR_CMDLINE="@shlib_objs@" && \ + $(REXX) dllar.cmd -o $(SHLIB_DLLNAME) \ + -ordinal @multilib_flags@ -nocrtdll \ + -flags "-Zhigh-mem -Zomf -g" \ + -ex "___main ___do_global_* ___ctordtor* ___eh* _DLL_InitTerm" \ + -d "GNU GCC Runtime Version $(gcc_version)" \ + -libf "INITINSTANCE TERMGLOBAL" -lc_alias -lc_dll \ + && ar rs $(SHLIB_BASENAME).a libgcc/__main.o libgcc/emx-ctordtor.o libgcc/emx-eh.o \ + && emximp -o libgcc_so_d.a $(srcdir)/config/i386/emx-libgcc_so_d.def \ + && ar rs libgcc_so_d.a libgcc/__main.o libgcc/emx-ctordtor.o libgcc/emx-eh.o \ + && touch $$@ +SHLIB_SUBDIR = . +SHLIB_INSTALL = $$(INSTALL_DATA) $(SHLIB_SUBDIR)/$(SHLIB_DLLNAME) $$(DESTDIR)$$(slibdir)/ \ + && $$(INSTALL_DATA) $(SHLIB_SUBDIR)/$(SHLIB_BASENAME).a $$(DESTDIR)$$(libsubdir)/$(SHLIB_SUBDIR)/ \ + && $$(INSTALL_DATA) $(SHLIB_SUBDIR)/libgcc_so_d.a $$(DESTDIR)$$(libsubdir)/$(SHLIB_SUBDIR)/ + +# Dont use collect2 +USE_COLLECT2 = +# Don't run fixproto +STMP_FIXPROTO = +# Don't fix includes +STMP_FIXINC = + +# Override libgcc2 C flags to ensure stack probing and epilogues. +TARGET_LIBGCC2_CFLAGS = -Zaout -O2 -fomit-frame-pointer -Wall -mprobe -mepilogue -DNDEBUG + +# Provide alternative source code for libgcc1 +LIBGCC1 = libgcc1-asm.a +CROSS_LIBGCC1 = libgcc1-asm.a +LIB1ASMSRC = i386/emx-libgcc1.asm +LIB1ASMFUNCS = _alloca + +# Extra functions to add to libgcc. +LIB2FUNCS_EXTRA = $(srcdir)/config/i386/emx-ctordtor.c +LIB2ADDEH = \ + $(srcdir)/config/i386/emx-eh.c \ + $(srcdir)/config/i386/emx-dllinit.c \ + $(srcdir)/unwind-dw2.c \ + $(srcdir)/unwind-dw2-fde.c \ + $(srcdir)/unwind-sjlj.c \ + $(srcdir)/unwind-c.c +#LIB2ADDEHDEP + + +# Copy these files to include/ subdirectory +# GCC-OS/2: We override this to prevent usage of $(srcdir)/ginclude/stddef.h +# and $(srcdir)/ginclude/float.h. +# bird: Don't forget to check this when updating the code GCC. +USER_H = \ + $(srcdir)/ginclude/iso646.h \ + $(srcdir)/ginclude/stdarg.h \ + $(srcdir)/ginclude/stdbool.h \ + \ + $(srcdir)/ginclude/varargs.h \ + $(srcdir)/unwind.h \ + $(EXTRA_HEADERS) + +# bird (#424): New gcc*dll hacks +stage1 stage2 stage3 stage4: + echo "t-emx hacks: $@ starting" + -mv -f gcc3*.dll gcc3*.a gcc3*.def $@ + echo "t-emx hacks: $@ done" + +# how to make the emx.o object. +emx.o: $(srcdir)/config/i386/emx.c $(RTL_H) $(TREE_H) $(CONFIG_H) + $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(srcdir)/config/i386/emx.c + +# end-of-file: t-emx + Index: src/gcc/gcc/config/i386/xm-emx.h =================================================================== RCS file: src/gcc/gcc/config/i386/xm-emx.h diff -N src/gcc/gcc/config/i386/xm-emx.h --- nul 1 Jan 1970 00:00:00 -0000 +++ src/gcc/gcc/config/i386/xm-emx.h 2 May 2004 06:59:35 -0000 1.11 @@ -0,0 +1,259 @@ +/* Configuration for GNU C-compiler for hosting on OS/2. + Using InnoTek GCC and InnoTek LIBC. + Copyright (C) 2000(?)-2003 Andrew Zabolotny + Copyright (C) 2003 InnoTek Systemberatung GmbH + Copyright (C) 2003-2004 Knut St. Osmundsen + +This file is part of the InnoTek port of GNU CC. + +GNU CC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU CC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU CC; see the file COPYING. If not, write to +the Free Software Foundation, 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + + +/* Handle drive separator in path names */ +#define HAVE_DOS_BASED_FILE_SYSTEM + +/* Directories in path environment variables are separated by semicolons. */ +#undef PATH_SEPARATOR +#define PATH_SEPARATOR ';' + +/* OS/2 executables ends with '.exe' */ +#undef HOST_EXECUTABLE_SUFFIX +#define HOST_EXECUTABLE_SUFFIX ".exe" + +/* Pathname components are separated by '/' or '\\'. */ +#undef DIR_SEPARATOR +#define DIR_SEPARATOR '/' +#undef DIR_SEPARATOR_2 +#define DIR_SEPARATOR_2 '\\' + +/* Tell GCC about OS/2's bit bucket. */ +#define HOST_BIT_BUCKET "NUL" + +/* No block device special files on OS/2 */ +#ifndef S_ISBLK +#define S_ISBLK(x) 0 +#endif + + +/****************************************************************************** + * - P - A - T - H - S - + ******************************************************************************/ + +/* (The /gcc/ prefix is rewritten to the real path when initalizing GCC.) */ +#ifndef CROSS_COMPILE +#undef LOCAL_INCLUDE_DIR +#undef CROSS_INCLUDE_DIR +#undef TOOL_INCLUDE_DIR +#undef STANDARD_INCLUDE_DIR +#define STANDARD_INCLUDE_DIR "/gcc/include/" +#define STANDARD_INCLUDE_COMPONENT "GCC" +#define STANDARD_INCLUDE_SYSROOT 0 +#undef LOCAL_INCLUDE_DIR +#undef PREFIX_INCLUDE_DIR +#undef TOOL_INCLUDE_DIR +#undef SYSTEM_INCLUDE_DIR +#endif /* not CROSS_COMPILE */ + +/* for prefix.c */ +#define UPDATE_PATH_HOST_CANONICALIZE(path) \ +{ \ + char prefix_buffer [260 + 1], *c; \ + _abspath (prefix_buffer, path, sizeof (prefix_buffer)); \ + free (path); \ + /* Way too often gcc generates double slashes, it looks bad */ \ + for (c = prefix_buffer; *c; c++) \ + if ((c [0] == '/') && (c [1] == '/')) \ + memmove (c, c + 1, strlen (c)); \ + path = xstrdup (prefix_buffer); \ +} + + +/****************************************************************************** + * - I - N - I - T - + ******************************************************************************/ + +#define EMX_INITIALIZE_ENVIRONMENT(taildirs) \ + /* Set env.vars GCC_ROOT, G++_ROOT and BINUTILS_ROOT. */ \ + { \ + int fGCC = !getenv ("GCC_ROOT"); \ + int fGPP = !getenv ("G++_ROOT"); \ + int fBIN = !getenv ("BINUTILS_ROOT"); \ + if (fGCC || fGPP || fBIN) \ + { \ + char root_path [260]; \ + if (!_execname (root_path, sizeof (root_path))) \ + { \ + int i; \ + for (i = 0; i < taildirs; i++) \ + { \ + char *name = _getname (root_path); \ + if (name > root_path) \ + { \ + if (i < taildirs - 1) \ + name--; \ + if (*name != ':') \ + *name = '\0'; \ + } \ + } \ + if (fGCC) \ + setenv ("GCC_ROOT", root_path, 1); \ + if (fGPP) \ + setenv ("G++_ROOT", root_path, 1); \ + if (fGCC) \ + setenv ("BINUTILS_ROOT", root_path, 1); \ + } \ + } \ + } + +/* emxomf does not understand stabs+, so for frontends we have to + switch to standard stabs if -Zomf is used. We also do many other + argv preprocessing here. */ +#define GCC_DRIVER_HOST_INITIALIZATION \ + { \ + int i, j, new_argc, max_argc; \ + const char **new_argv; \ + _emxload_env ("GCCLOAD"); \ + _envargs (&argc, (char ***)&argv, "GCCOPT"); \ + _response (&argc, (char ***)&argv); \ + _wildcard (&argc, (char ***)&argv); \ + \ + /* Copy argv into a new location and modify it while copying */ \ + new_argv = (const char **)malloc ((max_argc = argc) * sizeof (char *)); \ + new_argv [0] = argv [0]; \ + for (i = 1, new_argc = 1; i < argc; i++) \ + { \ + int arg_count = 1; \ + const char *arg [4]; \ + arg [0] = argv [i]; \ + if (!strcmp (argv [i], "-Zcrtdll")) \ + arg [0] = "-Zcrtdll=c_dll"; \ + else if (!strcmp (argv [i], "-Zlinker")) \ + { \ + if (i + 1 >= argc) \ + fatal ("argument to `-Zlinker' is missing"); \ + arg [0] = "-Xlinker"; \ + arg [1] = "-O"; \ + arg [2] = "-Xlinker"; \ + arg [3] = argv [++i]; \ + arg_count = 4; \ + } \ + if (new_argc + arg_count > max_argc) \ + new_argv = (const char **)realloc (new_argv, \ + (new_argc + arg_count) * sizeof (char *)); \ + for (j = 0; j < arg_count; j++) \ + new_argv [new_argc++] = arg [j]; \ + } \ + argv = new_argv; argc = new_argc; \ + EMX_INITIALIZE_ENVIRONMENT(2) \ + } + +/* Do some OS/2-specific work upon initialization of all compilers */ +#define COMPILER_HOST_INITIALIZATION \ + { \ + /* Preload compiler if specified by GCCLOAD for faster subsequent runs */ \ + _emxload_env ("GCCLOAD"); \ + /* Compilers don't fork (thanks God!) so we can use >32MB RAM */ \ + /* bird: this doesn't matter really as the compiler now should use high */ \ + /* memory. But we'll leave it here in case a DLL gets broken. */ \ + _uflags (_UF_SBRK_MODEL, _UF_SBRK_ARBITRARY); \ + EMX_INITIALIZE_ENVIRONMENT(5) \ + } + + + +/****************************************************************************** + * - C - L - H - + ******************************************************************************/ + +/* Command-line help facility support - + avoid using termcap since its not too reliable on OS/2 */ +#ifdef IN_CLH + +#include + +static int emx_monochrome = 0; /* 1 for monochrome output */ +static int emx_textattr = 0; /* current text attributes */ + +static int +emx_getwidth (void) +{ + int wh[2]; + char *term; + + term = getenv ("CLH_TERM"); + if (!term) + term = getenv ("TERM"); + if (term && stricmp (term, "mono") == 0) + emx_monochrome = 1; + + _scrsize (wh); + return (wh[0]); +} + +static const char *ansi_seq [] = +{ +/* color monochrome */ + "\033[0;36m", "\033[0m", /* */ + "\033[1;36m", "\033[1m", /* header */ + "\033[1;37m", "\033[7m", /* option */ + "\033[1;37m", "\033[7m", /* option + header */ + "\033[1;37m", "\033[1m", /* bold */ + "\033[1;37m", "\033[1m", /* bold + header */ + "\033[1;37m", "\033[7m", /* bold + option */ + "\033[1;37m", "\033[7m", /* bold + option + header */ + "\033[1;32m", "\033[1m", /* italic */ + "\033[1;32m", "\033[1m", /* italic + header */ + "\033[1;32m", "\033[1m", /* italic + option */ + "\033[1;32m", "\033[1m", /* italic + option + header */ + "\033[1;32m", "\033[1m", /* italic + bold */ + "\033[1;32m", "\033[1m", /* italic + bold + header */ + "\033[1;32m", "\033[1m", /* italic + bold + option */ + "\033[1;32m", "\033[1m", /* italic + bold + option + header */ + "\033[1;33m", "\033[4m", /* underline */ + "\033[1;33m", "\033[4m", /* underline + header */ + "\033[1;37m", "\033[4m", /* underline + option */ + "\033[1;37m", "\033[4m", /* underline + option + header */ + "\033[1;37m", "\033[4m", /* underline + bold */ + "\033[1;37m", "\033[4m", /* underline + bold + header */ + "\033[1;37m", "\033[4m", /* underline + bold + option */ + "\033[1;37m", "\033[4m", /* underline + bold + option + header */ + "\033[1;33m", "\033[4m", /* underline + italic */ + "\033[1;37m", "\033[4m", /* underline + italic + header */ + "\033[1;37m", "\033[4m", /* underline + italic + option */ + "\033[1;37m", "\033[4m", /* underline + italic + option + header */ + "\033[1;37m", "\033[4m", /* underline + italic + bold */ + "\033[1;37m", "\033[4m", /* underline + italic + bold + header */ + "\033[1;37m", "\033[4m", /* underline + italic + bold + option */ + "\033[1;37m", "\033[4m", /* underline + italic + bold + option + header */ +}; + +#define TERM_OUT(s) \ + write (1, s, strlen (s)); + +static int +emx_setattr (int flags, int flagmask) +{ + emx_textattr = (emx_textattr & ~flagmask) | flags; + TERM_OUT (ansi_seq [emx_textattr * 2 + emx_monochrome]); + return (0); +} + +#define CLH_GET_WIDTH emx_getwidth () +#define CLH_GET_FILE_WIDTH emx_getwidth () +#define CLH_SET_ATTR(flags, flagmask) emx_setattr (flags, flagmask) +#define CLH_FINISH TERM_OUT (ansi_seq [emx_monochrome]) + +#endif /* IN_CLH */ Index: src/gcc/gcc/cp/Make-lang.in =================================================================== RCS file: /gccos2/src/gcc/gcc/cp/Make-lang.in,v retrieving revision 1.1.1.3 retrieving revision 1.4 diff -w -u -r1.1.1.3 -r1.4 --- src/gcc/gcc/cp/Make-lang.in 7 Sep 2004 02:03:32 -0000 1.1.1.3 +++ src/gcc/gcc/cp/Make-lang.in 8 Sep 2004 00:03:18 -0000 1.4 @@ -67,9 +67,9 @@ # Create the compiler driver for g++. GXX_OBJS = gcc.o g++spec.o intl.o prefix.o version.o -g++$(exeext): $(GXX_OBJS) $(EXTRA_GCC_OBJS) $(LIBDEPS) +g++$(exeext): $(GXX_OBJS) $(EXTRA_GCC_OBJS) $(CLH_GCC) $(LIBDEPS) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \ - $(GXX_OBJS) $(EXTRA_GCC_OBJS) $(LIBS) + $(GXX_OBJS) $(EXTRA_GCC_OBJS) $(CLH_GCC) $(LIBS) # Create a version of the g++ driver which calls the cross-compiler. g++-cross$(exeext): g++$(exeext) Index: src/gcc/gcc/cp/decl.c =================================================================== RCS file: /gccos2/src/gcc/gcc/cp/decl.c,v retrieving revision 1.1.1.4 retrieving revision 1.6 diff -w -u -r1.1.1.4 -r1.6 --- src/gcc/gcc/cp/decl.c 3 Nov 2004 05:59:23 -0000 1.1.1.4 +++ src/gcc/gcc/cp/decl.c 4 Nov 2004 00:37:17 -0000 1.6 @@ -15058,7 +15058,7 @@ if (r != error_mark_node /* This is only worth doing for fns that return in memory--and simpler, since we don't have to worry about promoted modes. */ - && aggregate_value_p (TREE_TYPE (TREE_TYPE (fndecl))) + && aggregate_value_p2 (TREE_TYPE (TREE_TYPE (fndecl)), fndecl) /* bird: #631: return struct */ /* Only allow this for variables declared in the outer scope of the function so we know that their lifetime always ends with a return; see g++.dg/opt/nrv6.C. We could be more flexible if Index: src/gcc/gcc/cp/error.c =================================================================== RCS file: /gccos2/src/gcc/gcc/cp/error.c,v retrieving revision 1.1.1.3 retrieving revision 1.6 diff -w -u -r1.1.1.3 -r1.6 --- src/gcc/gcc/cp/error.c 3 Nov 2004 05:59:30 -0000 1.1.1.3 +++ src/gcc/gcc/cp/error.c 4 Nov 2004 00:37:17 -0000 1.6 @@ -27,6 +27,7 @@ #include "toplev.h" #include "flags.h" #include "diagnostic.h" +#include "tm_p.h" #include "langhooks-def.h" enum pad { none, before, after }; @@ -651,6 +652,9 @@ if (padding != none) output_add_space (scratch_buffer); print_left_paren (scratch_buffer); +#ifdef TARGET_PRINT_TYPE_ATTRS + TARGET_PRINT_TYPE_ATTRS (t, scratch_buffer); +#endif padding = none; break; @@ -659,6 +663,9 @@ if (padding != none) output_add_space (scratch_buffer); print_left_paren (scratch_buffer); +#ifdef TARGET_PRINT_TYPE_ATTRS + TARGET_PRINT_TYPE_ATTRS (t, scratch_buffer); +#endif padding = none; dump_aggr_type (TYPE_METHOD_BASETYPE (t), flags); print_scope_operator (scratch_buffer); Index: src/gcc/gcc/cp/except.c =================================================================== RCS file: /gccos2/src/gcc/gcc/cp/except.c,v retrieving revision 1.1.1.3 retrieving revision 1.5 diff -w -u -r1.1.1.3 -r1.5 --- src/gcc/gcc/cp/except.c 7 Sep 2004 02:03:24 -0000 1.1.1.3 +++ src/gcc/gcc/cp/except.c 8 Sep 2004 00:03:18 -0000 1.5 @@ -891,6 +891,13 @@ return 0; id = DECL_ASSEMBLER_NAME (fn); +#ifdef TARGET_CXX_SET_DECL_ASSEMBLER_NAME /* GCC-OS2 */ + /* Actually the above is a bug. We can't mangle correctly unless we + have a complete decl. Until then, as a partial fix, reset the + mangled name to NULL so that next DECL_ASSEMBLER_NAME calls + mangler again, now with a complete decl. */ + SET_DECL_ASSEMBLER_NAME(fn, NULL_TREE); +#endif return !!libc_name_p (IDENTIFIER_POINTER (id), IDENTIFIER_LENGTH (id)); } Index: src/gcc/gcc/cp/mangle.c =================================================================== RCS file: /gccos2/src/gcc/gcc/cp/mangle.c,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -w -u -r1.1.1.2 -r1.3 --- src/gcc/gcc/cp/mangle.c 27 Apr 2004 18:38:18 -0000 1.1.1.2 +++ src/gcc/gcc/cp/mangle.c 28 Apr 2004 04:57:51 -0000 1.3 @@ -77,6 +77,11 @@ # define MANGLE_TRACE_TREE(FN, NODE) #endif +/* Provide a dummy target-specific name mangling hook */ +#ifndef TARGET_CXX_SET_DECL_ASSEMBLER_NAME +#define TARGET_CXX_SET_DECL_ASSEMBLER_NAME(decl) 0 +#endif + /* Nonzero if NODE is a class template-id. We can't rely on CLASSTYPE_USE_TEMPLATE here because of tricky bugs in the parser that hard to distinguish A from A, where A is the type as @@ -2437,9 +2442,15 @@ mangle_decl (decl) tree decl; { - tree id = get_identifier (mangle_decl_string (decl)); + /* GCC-OS2: mangling hack */ + tree id; + + if (!TARGET_CXX_SET_DECL_ASSEMBLER_NAME (decl)) + { + id = get_identifier (mangle_decl_string (decl)); SET_DECL_ASSEMBLER_NAME (decl, id); + } } /* Generate the mangled representation of TYPE. */ Index: src/gcc/gcc/cp/semantics.c =================================================================== RCS file: /gccos2/src/gcc/gcc/cp/semantics.c,v retrieving revision 1.1.1.3 retrieving revision 1.4 diff -w -u -r1.1.1.3 -r1.4 --- src/gcc/gcc/cp/semantics.c 3 Nov 2004 05:59:50 -0000 1.1.1.3 +++ src/gcc/gcc/cp/semantics.c 4 Nov 2004 00:37:17 -0000 1.4 @@ -2241,7 +2241,7 @@ SLOT. */ copy_from_buffer_p = 0; #ifdef PCC_STATIC_STRUCT_RETURN - if (!AGGR_INIT_VIA_CTOR_P (aggr_init_expr) && aggregate_value_p (type)) + if (!AGGR_INIT_VIA_CTOR_P (aggr_init_expr) && aggregate_value_p2 (type, fn)) /* bird: #631: return struct */ { int old_ac = flag_access_control; Index: src/gcc/gcc/doc/invoke.texi =================================================================== RCS file: /gccos2/src/gcc/gcc/doc/invoke.texi,v retrieving revision 1.1.1.4 retrieving revision 1.5 diff -w -u -r1.1.1.4 -r1.5 --- src/gcc/gcc/doc/invoke.texi 3 Nov 2004 06:00:30 -0000 1.1.1.4 +++ src/gcc/gcc/doc/invoke.texi 4 Nov 2004 00:37:17 -0000 1.5 @@ -11076,6 +11076,19 @@ If @env{LANG} is not defined, or if it has some other value, then the compiler will use mblen and mbtowc as defined by the default locale to recognize and translate multibyte characters. + +@item CLH_TERM +@item TERM +@findex CLH_TERM +@findex TERM +If @code{CLH_TERM} is set, or as a fallback @code{TERM} is set, @i{GCC} +built-in command-line help will use it as a index into @code{TERMCAP} file +to highlight the text of command-line help. + +These variables affects only the appearance of @i{GCC} built-in command-line +help, and only if @i{GCC} was configured using @i{--enable-clh}. +@code{CLH_TERM} is preferred over @code{TERM}, and can additionaly have a +value of "-" which indicates to display command-line help with no highlighting. @end table @noindent Index: src/gcc/gcc/f/Make-lang.in =================================================================== RCS file: /gccos2/src/gcc/gcc/f/Make-lang.in,v retrieving revision 1.1.1.2 retrieving revision 1.4 diff -w -u -r1.1.1.2 -r1.4 --- src/gcc/gcc/f/Make-lang.in 27 Apr 2004 18:38:19 -0000 1.1.1.2 +++ src/gcc/gcc/f/Make-lang.in 28 Apr 2004 04:57:52 -0000 1.4 @@ -65,6 +65,9 @@ f77.extraclean f77.maintainer-clean f77.rebuilt \ f77.stage1 f77.stage2 f77.stage3 f77.stage4 +clh_g77.c: $(srcdir)/f/invoke.texi $(srcdir)/mkoptdesc.sh + $(srcdir)/mkoptdesc.sh $(srcdir)/f/invoke.texi g77 > clh_g77.c + g77spec.o: $(srcdir)/f/g77spec.c $(SYSTEM_H) $(GCC_H) \ $(CONFIG_H) (SHLIB_LINK='$(SHLIB_LINK)' \ @@ -74,9 +77,9 @@ # Create the compiler driver for g77. g77$(exeext): gcc.o g77spec.o version.o prefix.o intl.o \ - $(LIBDEPS) $(EXTRA_GCC_OBJS) + $(LIBDEPS) $(EXTRA_GCC_OBJS) $(CLH_G77) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ gcc.o g77spec.o \ - version.o prefix.o intl.o $(EXTRA_GCC_OBJS) $(LIBS) + version.o prefix.o intl.o $(EXTRA_GCC_OBJS) $(CLH_G77) $(LIBS) # Create a version of the g77 driver which calls the cross-compiler. g77-cross$(exeext): g77$(exeext) Index: src/gcc/gcc/fixinc/mkfixinc.sh =================================================================== RCS file: /gccos2/src/gcc/gcc/fixinc/mkfixinc.sh,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -w -u -r1.1.1.2 -r1.3 --- src/gcc/gcc/fixinc/mkfixinc.sh 27 Apr 2004 18:38:19 -0000 1.1.1.2 +++ src/gcc/gcc/fixinc/mkfixinc.sh 28 Apr 2004 04:57:52 -0000 1.3 @@ -27,7 +27,9 @@ CFLAGS="${CFLAGS} -Dexit=xexit -Datexit=xatexit" MAKE="${MAKE} TARGETS=oneprocess" ;; - + *-*-os2* ) + fixincludes= + ;; * ) MAKE="${MAKE} TARGETS=oneprocess" ;; Index: src/gcc/gcc/fixinc/procopen.c =================================================================== RCS file: /gccos2/src/gcc/gcc/fixinc/procopen.c,v retrieving revision 1.1.1.1 retrieving revision 1.3 diff -w -u -r1.1.1.1 -r1.3 --- src/gcc/gcc/fixinc/procopen.c 16 Apr 2003 10:10:39 -0000 1.1.1.1 +++ src/gcc/gcc/fixinc/procopen.c 28 Apr 2003 16:48:30 -0000 1.3 @@ -45,9 +45,11 @@ * choice whether to permit this exception to apply to your modifications. * If you do not wish that, delete this exception notice. */ +#ifndef __EMX__ /* r=bird: Why do we do this? It wasn't in the diff, but it was in the sources I got... */ #include "auto-host.h" #include "ansidecl.h" #include "system.h" +#endif #include "server.h" #include "fixlib.h" Index: src/gcc/gcc/fixinc/server.c =================================================================== RCS file: /gccos2/src/gcc/gcc/fixinc/server.c,v retrieving revision 1.1.1.1 retrieving revision 1.3 diff -w -u -r1.1.1.1 -r1.3 --- src/gcc/gcc/fixinc/server.c 16 Apr 2003 10:10:39 -0000 1.1.1.1 +++ src/gcc/gcc/fixinc/server.c 28 Apr 2003 16:48:19 -0000 1.3 @@ -45,6 +45,7 @@ * choice whether to permit this exception to apply to your modifications. * If you do not wish that, delete this exception notice. */ +#ifndef __EMX__ /* r=bird: Why do we do this? It wasn't in the diff, but it was in the sources I got... */ #include "auto-host.h" #include "ansidecl.h" @@ -52,6 +53,11 @@ #include #include "server.h" +#else +#include "fixlib.h" +#include "server.h" +#include +#endif #if !defined(volatile) && !defined(HAVE_VOLATILE) # define volatile Index: src/gcc/gcc/java/Make-lang.in =================================================================== RCS file: /gccos2/src/gcc/gcc/java/Make-lang.in,v retrieving revision 1.1.1.2 retrieving revision 1.4 diff -w -u -r1.1.1.2 -r1.4 --- src/gcc/gcc/java/Make-lang.in 27 Apr 2004 18:38:20 -0000 1.1.1.2 +++ src/gcc/gcc/java/Make-lang.in 28 Apr 2004 04:57:52 -0000 1.4 @@ -69,9 +69,9 @@ # Create the compiler driver for $(GCJ). $(GCJ)$(exeext): gcc.o jvspec.o version.o \ - prefix.o intl.o $(LIBDEPS) $(EXTRA_GCC_OBJS) + prefix.o intl.o $(LIBDEPS) $(EXTRA_GCC_OBJS) $(CLH_GCJ) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ gcc.o jvspec.o prefix.o intl.o \ - version.o $(EXTRA_GCC_OBJS) $(LIBS) + version.o $(EXTRA_GCC_OBJS) $(CLH_GCJ) $(LIBS) # Create a version of the $(GCJ) driver which calls the cross-compiler. $(GCJ)-cross$(exeext): $(GCJ)$(exeext) @@ -97,6 +97,9 @@ rm -f k$$$$.h; \ exit 1; } ; \ mv -f k$$$$.h keyword.h) + +clh_gcj.c: $(srcdir)/java/gcj.texi $(srcdir)/mkoptdesc.sh + $(srcdir)/mkoptdesc.sh $(srcdir)/java/gcj.texi gcj > clh_gcj.c gt-java-class.h gt-java-constants.h gt-java-decl.h : s-gtype ; @true gt-java-expr.h gt-java-jcf-parse.h gt-java-jcf-write.h : s-gtype ; @true Index: src/gcc/libf2c/Makefile.in =================================================================== RCS file: /gccos2/src/gcc/libf2c/Makefile.in,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -w -u -r1.1.1.2 -r1.3 Index: src/gcc/libf2c/cfg.sh =================================================================== RCS file: src/gcc/libf2c/cfg.sh diff -N src/gcc/libf2c/cfg.sh --- nul 1 Jan 1970 00:00:00 -0000 +++ src/gcc/libf2c/cfg.sh 16 Apr 2003 14:03:38 -0000 1.1 @@ -0,0 +1,4 @@ +#!/bin/sh + +export with_target_subdir=. +exec ./configure --prefix=/usr --srcdir=. Index: src/gcc/libf2c/configure =================================================================== RCS file: /gccos2/src/gcc/libf2c/configure,v retrieving revision 1.1.1.3 retrieving revision 1.6 diff -w -u -r1.1.1.3 -r1.6 --- src/gcc/libf2c/configure 7 Sep 2004 02:30:49 -0000 1.1.1.3 +++ src/gcc/libf2c/configure 8 Sep 2004 00:03:18 -0000 1.6 @@ -541,6 +541,157 @@ ac_n= ac_c='\c' ac_t= fi +echo $ac_n "checking for path separator""... $ac_c" 1>&6 +echo "configure:546: checking for path separator" >&5 +# Filter path to get backslahes into forwardslashes +case "`uname -s 2> /dev/null`" in +OS/2) + PATH=`echo -E "$PATH" | sed 's+\\\\+/+g'` + PATH_IFS=';' + ;; +*) + PATH_IFS=':' + ;; +esac +echo "$ac_t""${PATH_IFS}" 1>&6 + +echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 +echo "configure:560: checking for Cygwin environment" >&5 +if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cygwin=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cygwin=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_cygwin" 1>&6 +CYGWIN= +test "$ac_cv_cygwin" = yes && CYGWIN=yes +echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 +echo "configure:593: checking for mingw32 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_mingw32=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_mingw32=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_mingw32" 1>&6 +MINGW32= +test "$ac_cv_mingw32" = yes && MINGW32=yes +echo $ac_n "checking for EMX/OS2 environment""... $ac_c" 1>&6 +echo "configure:622: checking for EMX/OS2 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_emxos2'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + : ${CC=gcc.exe} +cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_emxos2=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_emxos2=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_emxos2" 1>&6 +if eval "test \"`echo '$''{'ac_cv_libpre'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$ac_cv_emxos2" = yes ; then + ac_cv_libpre= +else + ac_cv_libpre=lib +fi + +fi + +EMXOS2= +test "$ac_cv_emxos2" = yes && EMXOS2=yes + + + +echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 +echo "configure:666: checking for executable suffix" >&5 +if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then + ac_cv_exeext=.exe +else + rm -f conftest* + echo 'int main () { return 0; }' > conftest.$ac_ext + ac_cv_exeext= + if { (eval echo configure:676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + for file in conftest.*; do + case $file in + *.c | *.o | *.obj) ;; + *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; + esac + done + else + { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } + fi + rm -f conftest* + test x"${ac_cv_exeext}" = x && ac_cv_exeext=no +fi +fi + +EXEEXT="" +test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} +echo "$ac_t""${ac_cv_exeext}" 1>&6 +ac_exeext=$EXEEXT + # This works around the fact that libtool configuration may change LD @@ -631,7 +782,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:635: checking host system type" >&5 +echo "configure:786: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -652,7 +803,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:656: checking target system type" >&5 +echo "configure:807: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -670,7 +821,7 @@ echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:674: checking build system type" >&5 +echo "configure:825: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -701,68 +852,6 @@ ac_tool_prefix= fi -echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:706: checking for Cygwin environment" >&5 -if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cygwin=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_cygwin=no -fi -rm -f conftest* -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_cygwin" 1>&6 -CYGWIN= -test "$ac_cv_cygwin" = yes && CYGWIN=yes -echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:739: checking for mingw32 environment" >&5 -if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_mingw32=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_mingw32=no -fi -rm -f conftest* -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_mingw32" 1>&6 -MINGW32= -test "$ac_cv_mingw32" = yes && MINGW32=yes # Export build and source directories. # These need to be absolute paths, yet at the same time need to @@ -782,7 +871,7 @@ # be 'cp -p' if linking isn't available. #ac_cv_prog_LN_S='cp -p' echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:786: checking whether ln -s works" >&5 +echo "configure:875: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -792,8 +881,14 @@ rm -f conftestdata ac_cv_prog_LN_S="ln -s" else + echo A > conftestdata; + if ln conftestdata conftestdata2 2>/dev/null; then ac_cv_prog_LN_S=ln + else + ac_cv_prog_LN_S=cp + fi fi +rm -f conftestdata* fi LN_S="$ac_cv_prog_LN_S" if test "$ac_cv_prog_LN_S" = "ln -s"; then @@ -838,18 +933,19 @@ # 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:842: checking for $ac_word" >&5 +echo "configure:937: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_CC="gcc" break fi @@ -868,20 +964,22 @@ # 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:872: checking for $ac_word" >&5 +echo "configure:968: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_prog_rejected=no ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc" -o \ + "$ac_dir/$ac_word$ac_exeext" = "/usr/ucb/cc" ; then ac_prog_rejected=yes continue fi @@ -917,7 +1015,7 @@ fi echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:921: checking whether we are using GNU C" >&5 +echo "configure:1019: 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 @@ -926,7 +1024,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:930: \"$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:1028: \"$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 @@ -941,7 +1039,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:945: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1043: 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 @@ -972,18 +1070,19 @@ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:976: checking for $ac_word" >&5 +echo "configure:1074: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AS"; then ac_cv_prog_AS="$AS" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_AS="${ac_tool_prefix}as" break fi @@ -1004,18 +1103,19 @@ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1008: checking for $ac_word" >&5 +echo "configure:1107: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_AR="${ac_tool_prefix}ar" break fi @@ -1036,18 +1136,19 @@ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1040: checking for $ac_word" >&5 +echo "configure:1140: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" break fi @@ -1068,18 +1169,19 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1072: checking for $ac_word" >&5 +echo "configure:1173: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="ranlib" break fi @@ -1112,28 +1214,30 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1116: checking for a BSD compatible install" >&5 +echo "configure:1218: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="$PATH_IFS" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + # We reject the install program from OS/2 or W3.1 + */OS2|*/OS2/*|*/WINDOWS|*/WINDOWS/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. # Don't use installbsd from OSF since it installs stuff as root # by default. for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then + if test -f $ac_dir/$ac_prog$ac_exeext; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : else - ac_cv_path_install="$ac_dir/$ac_prog -c" + ac_cv_path_install="$ac_dir/$ac_prog$ac_exeext -c" break 2 fi fi @@ -1179,18 +1283,19 @@ : + echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1184: checking for executable suffix" >&5 +echo "configure:1289: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test "$CYGWIN" = yes || test "$MINGW32" = yes; then + if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then ac_cv_exeext=.exe else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1220,13 +1325,13 @@ glibcpp_prefixdir=${prefix} echo $ac_n "checking for interface version number""... $ac_c" 1>&6 -echo "configure:1224: checking for interface version number" >&5 +echo "configure:1329: checking for interface version number" >&5 libstdcxx_interface=$INTERFACE echo "$ac_t""$libstdcxx_interface" 1>&6 # Process the option "--enable-version-specific-runtime-libs" echo $ac_n "checking for --enable-version-specific-runtime-libs""... $ac_c" 1>&6 -echo "configure:1230: checking for --enable-version-specific-runtime-libs" >&5 +echo "configure:1335: checking for --enable-version-specific-runtime-libs" >&5 # Check whether --enable-version-specific-runtime-libs or --disable-version-specific-runtime-libs was given. if test "${enable_version_specific_runtime_libs+set}" = set; then enableval="$enable_version_specific_runtime_libs" @@ -1281,7 +1386,7 @@ compiler_name=f771 rm -f skip-this-dir echo $ac_n "checking if compiler $compiler_name has been built""... $ac_c" 1>&6 -echo "configure:1285: checking if compiler $compiler_name has been built" >&5 +echo "configure:1390: checking if compiler $compiler_name has been built" >&5 if eval "test \"`echo '$''{'g77_cv_compiler_exists'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1389,7 +1494,7 @@ if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1393: checking for ld used by GCC" >&5 +echo "configure:1498: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1419,10 +1524,10 @@ esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1423: checking for GNU ld" >&5 +echo "configure:1528: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1426: checking for non-GNU ld" >&5 +echo "configure:1531: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1457,7 +1562,7 @@ fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1461: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1566: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1474,7 +1579,7 @@ echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1478: checking for $LD option to reload object files" >&5 +echo "configure:1583: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1486,7 +1591,7 @@ test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1490: checking for BSD-compatible nm" >&5 +echo "configure:1595: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1524,7 +1629,7 @@ echo "$ac_t""$NM" 1>&6 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:1528: checking how to recognise dependant libraries" >&5 +echo "configure:1633: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1657,6 +1762,10 @@ lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; + osf3* | osf4* | osf5*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' @@ -1697,13 +1806,13 @@ deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1701: checking for object suffix" >&5 +echo "configure:1810: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:1707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -1727,7 +1836,7 @@ file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:1731: checking for ${ac_tool_prefix}file" >&5 +echo "configure:1840: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1789,7 +1898,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:1793: checking for file" >&5 +echo "configure:1902: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1860,18 +1969,19 @@ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1864: checking for $ac_word" >&5 +echo "configure:1973: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" break fi @@ -1892,18 +2002,19 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1896: checking for $ac_word" >&5 +echo "configure:2006: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="ranlib" break fi @@ -1927,18 +2038,19 @@ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1931: checking for $ac_word" >&5 +echo "configure:2042: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" break fi @@ -1959,18 +2071,19 @@ # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1963: checking for $ac_word" >&5 +echo "configure:2075: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_STRIP="strip" break fi @@ -2026,8 +2139,8 @@ case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2030 "configure"' > conftest.$ac_ext - if { (eval echo configure:2031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2143 "configure"' > conftest.$ac_ext + if { (eval echo configure:2144: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) @@ -2060,7 +2173,7 @@ ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2177: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2076,7 +2189,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2080: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) case $host in @@ -2120,7 +2233,7 @@ SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2124: checking whether the C compiler needs -belf" >&5 +echo "configure:2237: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2133,14 +2246,14 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2264,18 +2377,19 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2268: checking for $ac_word" >&5 +echo "configure:2381: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="ranlib" break fi @@ -2304,28 +2418,30 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:2308: checking for a BSD compatible install" >&5 +echo "configure:2422: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="$PATH_IFS" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + # We reject the install program from OS/2 or W3.1 + */OS2|*/OS2/*|*/WINDOWS|*/WINDOWS/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. # Don't use installbsd from OSF since it installs stuff as root # by default. for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then + if test -f $ac_dir/$ac_prog$ac_exeext; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : else - ac_cv_path_install="$ac_dir/$ac_prog -c" + ac_cv_path_install="$ac_dir/$ac_prog$ac_exeext -c" break 2 fi fi @@ -2357,7 +2473,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:2361: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:2477: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2386,7 +2502,7 @@ # Sanity check for the cross-compilation case: echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2390: checking how to run the C preprocessor" >&5 +echo "configure:2506: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2401,13 +2517,14 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < +#line 2522 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2411: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2528: \"$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 : @@ -2418,13 +2535,14 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < +#line 2540 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2546: \"$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 : @@ -2435,13 +2553,14 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < +#line 2558 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2564: \"$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 : @@ -2467,17 +2586,18 @@ ac_safe=`echo "stdio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for stdio.h""... $ac_c" 1>&6 -echo "configure:2471: checking for stdio.h" >&5 +echo "configure:2590: checking for stdio.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 2596 "configure" #include "confdefs.h" #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2481: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2601: \"$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* @@ -2505,12 +2625,12 @@ echo $ac_n "checking for built-in g77 integer types""... $ac_c" 1>&6 -echo "configure:2509: checking for built-in g77 integer types" >&5 +echo "configure:2629: checking for built-in g77 integer types" >&5 if eval "test \"`echo '$''{'libf2c_cv_has_g77_builtin_types'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libf2c_cv_has_g77_builtin_types=yes else @@ -2617,34 +2737,15 @@ # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. -# -# If the first sed substitution is executed (which looks for macros that -# take arguments), then we branch to the quote section. Otherwise, -# look for a macro that doesn't take arguments. -cat >confdef2opt.sed <<\_ACEOF -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g -t quote -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g -t quote -d -: quote -s,[ `~#$^&*(){}\\|;'"<>?],\\&,g -s,\[,\\&,g -s,\],\\&,g -s,\$,$$,g -p -_ACEOF -# We use echo to avoid assuming a particular line-breaking character. -# The extra dot is to prevent the shell from consuming trailing -# line-breaks from the sub-command output. A line-break within -# single-quotes doesn't work because, if this script is created in a -# platform that uses two characters for line-breaks (e.g., DOS), tr -# would break. -ac_LF_and_DOT=`echo; echo .` -DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` -rm -f confdef2opt.sed +cat > conftest.defs <<\EOF +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g +s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g +s%\[%\\&%g +s%\]%\\&%g +s%\$%$$%g +EOF +DEFS=`sed -f conftest.defs confdefs.h | tr '\012\015' ' '` +rm -f conftest.defs # Without the "./", some shells look in PATH for config.status. @@ -2657,6 +2758,9 @@ # Generated automatically by configure. # Run this file to recreate the current configuration. # This directory was configured as follows, +EOF +echo ': ${CONFIG_SHELL='"${CONFIG_SHELL-/bin/sh}"'}' >> $CONFIG_STATUS +cat >> $CONFIG_STATUS </dev/null | sed 1q`: # # $0 $ac_configure_args @@ -2682,6 +2786,7 @@ ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" +PATHIFS="$PATH_IFS" trap 'rm -fr `echo "Makefile g2c.h:g2c.hin" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF @@ -2692,6 +2797,7 @@ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub +s,\([^a-zA-Z0-9:]\)/bin/sh\(.exe\),\1${CONFIG_SHELL-/bin/sh}\2,g s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g @@ -2715,6 +2821,8 @@ s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g +s%@PATH_IFS@%$PATH_IFS%g +s%@EXEEXT@%$EXEEXT%g s%@toplevel_srcdir@%$toplevel_srcdir%g s%@host@%$host%g s%@host_alias@%$host_alias%g @@ -2741,7 +2849,6 @@ s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g -s%@EXEEXT@%$EXEEXT%g s%@gcc_version@%$gcc_version%g s%@gcc_version_trigger@%$gcc_version_trigger%g s%@glibcpp_prefixdir@%$glibcpp_prefixdir%g @@ -2823,14 +2930,15 @@ .) srcdir=. if test -z "$ac_dots"; then top_srcdir=. else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + [/\\]* | [a-zA-Z]:*) + srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; *) # Relative path. srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" top_srcdir="$ac_dots$ac_given_srcdir" ;; esac case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; + [/$\\]* | [A-Za-z]:*) INSTALL="$ac_given_INSTALL" ;; *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac @@ -2843,7 +2951,7 @@ *) ac_comsub= ;; esac - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%$PATHIFS% $ac_given_srcdir/%g"` sed -e "$ac_comsub s%@configure_input@%$configure_input%g s%@srcdir@%$srcdir%g @@ -2937,7 +3045,7 @@ case "$srcdir" in .) # No --srcdir option. We are building in place. ac_sub_srcdir=$srcdir ;; - /*) # Absolute path. + [/\\]* | [a-zA-Z]:*) # Absolute path. ac_sub_srcdir=$srcdir/$ac_config_dir ;; *) # Relative path. ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;; @@ -2947,7 +3055,11 @@ if test -f $ac_sub_srcdir/configure; then ac_sub_configure=$ac_sub_srcdir/configure elif test -f $ac_sub_srcdir/configure.in; then - ac_sub_configure=$ac_configure + ac_current_dir=`pwd` + cd $ac_sub_srcdir + autoconf + cd $ac_current_dir + ac_sub_configure=$ac_sub_srcdir/configure else echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2 ac_sub_configure= @@ -2958,12 +3070,12 @@ # Make the cache file name correct relative to the subdirectory. case "$cache_file" in - /*) ac_sub_cache_file=$cache_file ;; + [/\\]* | [a-zA-Z]:*) ac_sub_cache_file=$cache_file ;; *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; + [/$\\]* | [A-Za-z]:*) INSTALL="$ac_given_INSTALL" ;; *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac Index: src/gcc/libf2c/libF77/configure =================================================================== RCS file: /gccos2/src/gcc/libf2c/libF77/configure,v retrieving revision 1.1.1.2 retrieving revision 1.5 diff -w -u -r1.1.1.2 -r1.5 --- src/gcc/libf2c/libF77/configure 27 Apr 2004 18:38:54 -0000 1.1.1.2 +++ src/gcc/libf2c/libF77/configure 28 Apr 2004 04:57:55 -0000 1.5 @@ -520,6 +520,157 @@ ac_n= ac_c='\c' ac_t= fi +echo $ac_n "checking for path separator""... $ac_c" 1>&6 +echo "configure:525: checking for path separator" >&5 +# Filter path to get backslahes into forwardslashes +case "`uname -s 2> /dev/null`" in +OS/2) + PATH=`echo -E "$PATH" | sed 's+\\\\+/+g'` + PATH_IFS=';' + ;; +*) + PATH_IFS=':' + ;; +esac +echo "$ac_t""${PATH_IFS}" 1>&6 + +echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 +echo "configure:539: checking for Cygwin environment" >&5 +if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cygwin=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cygwin=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_cygwin" 1>&6 +CYGWIN= +test "$ac_cv_cygwin" = yes && CYGWIN=yes +echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 +echo "configure:572: checking for mingw32 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_mingw32=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_mingw32=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_mingw32" 1>&6 +MINGW32= +test "$ac_cv_mingw32" = yes && MINGW32=yes +echo $ac_n "checking for EMX/OS2 environment""... $ac_c" 1>&6 +echo "configure:601: checking for EMX/OS2 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_emxos2'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + : ${CC=gcc.exe} +cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_emxos2=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_emxos2=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_emxos2" 1>&6 +if eval "test \"`echo '$''{'ac_cv_libpre'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$ac_cv_emxos2" = yes ; then + ac_cv_libpre= +else + ac_cv_libpre=lib +fi + +fi + +EMXOS2= +test "$ac_cv_emxos2" = yes && EMXOS2=yes + + + +echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 +echo "configure:645: checking for executable suffix" >&5 +if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then + ac_cv_exeext=.exe +else + rm -f conftest* + echo 'int main () { return 0; }' > conftest.$ac_ext + ac_cv_exeext= + if { (eval echo configure:655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + for file in conftest.*; do + case $file in + *.c | *.o | *.obj) ;; + *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; + esac + done + else + { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } + fi + rm -f conftest* + test x"${ac_cv_exeext}" = x && ac_cv_exeext=no +fi +fi + +EXEEXT="" +test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} +echo "$ac_t""${ac_cv_exeext}" 1>&6 +ac_exeext=$EXEEXT + @@ -530,18 +681,19 @@ # 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:534: checking for $ac_word" >&5 +echo "configure:685: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_CC="gcc" break fi @@ -560,20 +712,22 @@ # 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:564: checking for $ac_word" >&5 +echo "configure:716: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_prog_rejected=no ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc" -o \ + "$ac_dir/$ac_word$ac_exeext" = "/usr/ucb/cc" ; then ac_prog_rejected=yes continue fi @@ -611,18 +765,19 @@ # 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:615: checking for $ac_word" >&5 +echo "configure:769: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_CC="cl" break fi @@ -644,7 +799,7 @@ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:648: checking whether we are using GNU C" >&5 +echo "configure:803: 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 @@ -653,7 +808,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:657: \"$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:812: \"$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 @@ -672,7 +827,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:676: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:831: 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 @@ -715,18 +870,19 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:719: checking for $ac_word" >&5 +echo "configure:874: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="ranlib" break fi @@ -744,7 +900,7 @@ fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:748: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:904: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -774,7 +930,7 @@ # Sanity check for the cross-compilation case: echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:778: checking how to run the C preprocessor" >&5 +echo "configure:934: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -789,13 +945,14 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < +#line 950 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:956: \"$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 : @@ -806,13 +963,14 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < +#line 968 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:816: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:974: \"$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 : @@ -823,13 +981,14 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < +#line 986 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:992: \"$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 : @@ -855,17 +1014,18 @@ ac_safe=`echo "stdio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for stdio.h""... $ac_c" 1>&6 -echo "configure:859: checking for stdio.h" >&5 +echo "configure:1018: checking for stdio.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 1024 "configure" #include "confdefs.h" #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1029: \"$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* @@ -893,12 +1053,13 @@ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:897: checking for ANSI C header files" >&5 +echo "configure:1057: 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 < +#line 1063 "configure" #include "confdefs.h" #include #include @@ -906,7 +1067,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:910: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1071: \"$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* @@ -923,7 +1084,7 @@ 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 @@ -941,7 +1102,7 @@ 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 @@ -962,7 +1123,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -973,7 +1134,7 @@ exit (0); } EOF -if { (eval echo configure:977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -997,12 +1158,12 @@ fi echo $ac_n "checking for posix""... $ac_c" 1>&6 -echo "configure:1001: checking for posix" >&5 +echo "configure:1162: checking for posix" >&5 if eval "test \"`echo '$''{'g77_cv_header_posix'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1028,12 +1189,12 @@ # We can rely on the GNU library being posix-ish. I guess checking the # header isn't actually like checking the functions, though... echo $ac_n "checking for GNU library""... $ac_c" 1>&6 -echo "configure:1032: checking for GNU library" >&5 +echo "configure:1193: checking for GNU library" >&5 if eval "test \"`echo '$''{'g77_cv_lib_gnu'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef __GNU_LIBRARY__ @@ -1056,12 +1217,12 @@ echo "$ac_t""$g77_cv_lib_gnu" 1>&6 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:1060: checking return type of signal handlers" >&5 +echo "configure:1221: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1078,7 +1239,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:1082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -1099,12 +1260,12 @@ # we'll get atexit by default if test $ac_cv_header_stdc != yes; then echo $ac_n "checking for atexit""... $ac_c" 1>&6 -echo "configure:1103: checking for atexit" >&5 +echo "configure:1264: checking for atexit" >&5 if eval "test \"`echo '$''{'ac_cv_func_atexit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_atexit=yes" else @@ -1152,12 +1313,12 @@ EOF echo $ac_n "checking for onexit""... $ac_c" 1>&6 -echo "configure:1156: checking for onexit" >&5 +echo "configure:1317: checking for onexit" >&5 if eval "test \"`echo '$''{'ac_cv_func_onexit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_onexit=yes" else @@ -1198,12 +1359,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for on_exit""... $ac_c" 1>&6 -echo "configure:1202: checking for on_exit" >&5 +echo "configure:1363: checking for on_exit" >&5 if eval "test \"`echo '$''{'ac_cv_func_on_exit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_on_exit=yes" else @@ -1256,7 +1417,7 @@ fi echo $ac_n "checking for drem in -lm""... $ac_c" 1>&6 -echo "configure:1260: checking for drem in -lm" >&5 +echo "configure:1421: checking for drem in -lm" >&5 ac_lib_var=`echo m'_'drem | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1264,7 +1425,7 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1440: \"$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 @@ -1381,7 +1542,7 @@ s%\]%\\&%g s%\$%$$%g EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` +DEFS=`sed -f conftest.defs confdefs.h | tr '\012\015' ' '` rm -f conftest.defs @@ -1395,6 +1556,9 @@ # Generated automatically by configure. # Run this file to recreate the current configuration. # This directory was configured as follows, +EOF +echo ': ${CONFIG_SHELL='"${CONFIG_SHELL-/bin/sh}"'}' >> $CONFIG_STATUS +cat >> $CONFIG_STATUS </dev/null | sed 1q`: # # $0 $ac_configure_args @@ -1419,6 +1583,7 @@ done ac_given_srcdir=$srcdir +PATHIFS="$PATH_IFS" trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF @@ -1429,6 +1594,7 @@ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub +s,\([^a-zA-Z0-9:]\)/bin/sh\(.exe\),\1${CONFIG_SHELL-/bin/sh}\2,g s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g @@ -1452,6 +1618,8 @@ s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g +s%@PATH_IFS@%$PATH_IFS%g +s%@EXEEXT@%$EXEEXT%g s%@CC@%$CC%g s%@LIBTOOL@%$LIBTOOL%g s%@AR@%$AR%g @@ -1528,7 +1696,8 @@ .) srcdir=. if test -z "$ac_dots"; then top_srcdir=. else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + [/\\]* | [a-zA-Z]:*) + srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; *) # Relative path. srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" top_srcdir="$ac_dots$ac_given_srcdir" ;; @@ -1544,7 +1713,7 @@ *) ac_comsub= ;; esac - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%$PATHIFS% $ac_given_srcdir/%g"` sed -e "$ac_comsub s%@configure_input@%$configure_input%g s%@srcdir@%$srcdir%g Index: src/gcc/libf2c/libI77/configure =================================================================== RCS file: /gccos2/src/gcc/libf2c/libI77/configure,v retrieving revision 1.1.1.2 retrieving revision 1.5 diff -w -u -r1.1.1.2 -r1.5 --- src/gcc/libf2c/libI77/configure 27 Apr 2004 18:38:58 -0000 1.1.1.2 +++ src/gcc/libf2c/libI77/configure 28 Apr 2004 04:57:55 -0000 1.5 @@ -28,7 +28,6 @@ program_transform_name=s,x,x, silent= site= -sitefile= srcdir= target=NONE verbose= @@ -143,7 +142,6 @@ --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages - --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -314,11 +312,6 @@ -site=* | --site=* | --sit=*) site="$ac_optarg" ;; - -site-file | --site-file | --site-fil | --site-fi | --site-f) - ac_prev=sitefile ;; - -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) - sitefile="$ac_optarg" ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -484,7 +477,6 @@ srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -if test -z "$sitefile"; then if test -z "$CONFIG_SITE"; then if test "x$prefix" != xNONE; then CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" @@ -492,9 +484,6 @@ CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi fi -else - CONFIG_SITE="$sitefile" -fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then echo "loading site script $ac_site_file" @@ -531,6 +520,157 @@ ac_n= ac_c='\c' ac_t= fi +echo $ac_n "checking for path separator""... $ac_c" 1>&6 +echo "configure:525: checking for path separator" >&5 +# Filter path to get backslahes into forwardslashes +case "`uname -s 2> /dev/null`" in +OS/2) + PATH=`echo -E "$PATH" | sed 's+\\\\+/+g'` + PATH_IFS=';' + ;; +*) + PATH_IFS=':' + ;; +esac +echo "$ac_t""${PATH_IFS}" 1>&6 + +echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 +echo "configure:539: checking for Cygwin environment" >&5 +if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cygwin=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cygwin=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_cygwin" 1>&6 +CYGWIN= +test "$ac_cv_cygwin" = yes && CYGWIN=yes +echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 +echo "configure:572: checking for mingw32 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_mingw32=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_mingw32=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_mingw32" 1>&6 +MINGW32= +test "$ac_cv_mingw32" = yes && MINGW32=yes +echo $ac_n "checking for EMX/OS2 environment""... $ac_c" 1>&6 +echo "configure:601: checking for EMX/OS2 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_emxos2'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + : ${CC=gcc.exe} +cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_emxos2=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_emxos2=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_emxos2" 1>&6 +if eval "test \"`echo '$''{'ac_cv_libpre'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$ac_cv_emxos2" = yes ; then + ac_cv_libpre= +else + ac_cv_libpre=lib +fi + +fi + +EMXOS2= +test "$ac_cv_emxos2" = yes && EMXOS2=yes + + + +echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 +echo "configure:645: checking for executable suffix" >&5 +if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then + ac_cv_exeext=.exe +else + rm -f conftest* + echo 'int main () { return 0; }' > conftest.$ac_ext + ac_cv_exeext= + if { (eval echo configure:655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + for file in conftest.*; do + case $file in + *.c | *.o | *.obj) ;; + *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; + esac + done + else + { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } + fi + rm -f conftest* + test x"${ac_cv_exeext}" = x && ac_cv_exeext=no +fi +fi + +EXEEXT="" +test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} +echo "$ac_t""${ac_cv_exeext}" 1>&6 +ac_exeext=$EXEEXT + @@ -541,18 +681,19 @@ # 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:545: checking for $ac_word" >&5 +echo "configure:685: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_CC="gcc" break fi @@ -571,20 +712,22 @@ # 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:575: checking for $ac_word" >&5 +echo "configure:716: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_prog_rejected=no ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc" -o \ + "$ac_dir/$ac_word$ac_exeext" = "/usr/ucb/cc" ; then ac_prog_rejected=yes continue fi @@ -622,18 +765,19 @@ # 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:626: checking for $ac_word" >&5 +echo "configure:769: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_CC="cl" break fi @@ -655,7 +799,7 @@ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:659: checking whether we are using GNU C" >&5 +echo "configure:803: 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 @@ -664,7 +808,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:668: \"$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:812: \"$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 @@ -683,7 +827,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:687: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:831: 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 @@ -719,9 +863,9 @@ # NetBSD 1.4 header files does not support XOPEN_SOURCE == 600, but it # handles 64-bit file sizes without needing these defines. echo $ac_n "checking whether _XOPEN_SOURCE may be defined""... $ac_c" 1>&6 -echo "configure:723: checking whether _XOPEN_SOURCE may be defined" >&5 +echo "configure:867: checking whether _XOPEN_SOURCE may be defined" >&5 cat > conftest.$ac_ext < @@ -729,7 +873,7 @@ ; return 0; } EOF -if { (eval echo configure:733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* may_use_xopen_source=yes else @@ -772,7 +916,7 @@ test "$AR" || AR=ar echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:776: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:920: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -802,7 +946,7 @@ # Sanity check for the cross-compilation case: echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:806: checking how to run the C preprocessor" >&5 +echo "configure:950: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -817,13 +961,14 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < +#line 966 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:972: \"$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 : @@ -834,13 +979,14 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < +#line 984 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:990: \"$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 : @@ -851,13 +997,14 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < +#line 1002 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:861: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1008: \"$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 : @@ -883,17 +1030,18 @@ ac_safe=`echo "stdio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for stdio.h""... $ac_c" 1>&6 -echo "configure:887: checking for stdio.h" >&5 +echo "configure:1034: checking for stdio.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 1040 "configure" #include "confdefs.h" #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1045: \"$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* @@ -921,12 +1069,13 @@ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:925: checking for ANSI C header files" >&5 +echo "configure:1073: 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 < +#line 1079 "configure" #include "confdefs.h" #include #include @@ -934,7 +1083,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1087: \"$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* @@ -951,7 +1100,7 @@ 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 @@ -969,7 +1118,7 @@ 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 @@ -990,7 +1139,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1001,7 +1150,7 @@ exit (0); } EOF -if { (eval echo configure:1005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1025,12 +1174,12 @@ fi echo $ac_n "checking for posix""... $ac_c" 1>&6 -echo "configure:1029: checking for posix" >&5 +echo "configure:1178: checking for posix" >&5 if eval "test \"`echo '$''{'g77_cv_header_posix'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1056,12 +1205,12 @@ # We can rely on the GNU library being posix-ish. I guess checking the # header isn't actually like checking the functions, though... echo $ac_n "checking for GNU library""... $ac_c" 1>&6 -echo "configure:1060: checking for GNU library" >&5 +echo "configure:1209: checking for GNU library" >&5 if eval "test \"`echo '$''{'g77_cv_lib_gnu'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef __GNU_LIBRARY__ @@ -1085,12 +1234,12 @@ # Apparently cygwin needs to be special-cased. echo $ac_n "checking for cyg\`win'32""... $ac_c" 1>&6 -echo "configure:1089: checking for cyg\`win'32" >&5 +echo "configure:1238: checking for cyg\`win'32" >&5 if eval "test \"`echo '$''{'g77_cv_sys_cygwin32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:1117: checking for mingw32" >&5 +echo "configure:1266: checking for mingw32" >&5 if eval "test \"`echo '$''{'g77_cv_sys_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:1145: checking for working const" >&5 +echo "configure:1294: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1216,12 +1365,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1220: checking for size_t" >&5 +echo "configure:1369: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1254,12 +1403,12 @@ # Apparently positive result on cygwin loses re. NON_UNIX_STDIO # (as of cygwin b18). Likewise on mingw. echo $ac_n "checking for fstat""... $ac_c" 1>&6 -echo "configure:1258: checking for fstat" >&5 +echo "configure:1407: checking for fstat" >&5 if eval "test \"`echo '$''{'ac_cv_func_fstat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_fstat=yes" else @@ -1302,7 +1451,7 @@ fi echo $ac_n "checking need for NON_UNIX_STDIO""... $ac_c" 1>&6 -echo "configure:1306: checking need for NON_UNIX_STDIO" >&5 +echo "configure:1455: checking need for NON_UNIX_STDIO" >&5 if test $g77_cv_sys_cygwin32 = yes \ || test $g77_cv_sys_mingw32 = yes \ || test $ac_cv_func_fstat = no; then @@ -1318,12 +1467,12 @@ for ac_func in fseeko do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1322: checking for $ac_func" >&5 +echo "configure:1471: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1373,12 +1522,12 @@ for ac_func in ftello do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1377: checking for $ac_func" >&5 +echo "configure:1526: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1428,12 +1577,12 @@ for ac_func in ftruncate do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1432: checking for $ac_func" >&5 +echo "configure:1581: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1483,12 +1632,12 @@ for ac_func in mkstemp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1487: checking for $ac_func" >&5 +echo "configure:1636: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1538,12 +1687,12 @@ for ac_func in tempnam do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1542: checking for $ac_func" >&5 +echo "configure:1691: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1593,12 +1742,12 @@ for ac_func in tmpnam do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1597: checking for $ac_func" >&5 +echo "configure:1746: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1651,19 +1800,19 @@ # However, on my sunos4/gcc setup unistd.h leads us wrongly to believe # we're posix-conformant, so always do the test. echo $ac_n "checking for ansi/posix sprintf result""... $ac_c" 1>&6 -echo "configure:1655: checking for ansi/posix sprintf result" >&5 +echo "configure:1804: checking for ansi/posix sprintf result" >&5 if test "$cross_compiling" = yes; then g77_cv_sys_sprintf_ansi=no else cat > conftest.$ac_ext < /* does sprintf return the number of chars transferred? */ main () {char foo[2]; (sprintf(foo, "1") == 1) ? exit(0) : exit(1);} EOF -if { (eval echo configure:1667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then g77_cv_sys_sprintf_ansi=yes else @@ -1694,9 +1843,9 @@ # define NON_ANSI_RW_MODES on unix (can't hurt) echo $ac_n "checking NON_ANSI_RW_MODES""... $ac_c" 1>&6 -echo "configure:1698: checking NON_ANSI_RW_MODES" >&5 +echo "configure:1847: checking NON_ANSI_RW_MODES" >&5 cat > conftest.$ac_ext <&6 -echo "configure:1745: checking for off_t" >&5 +echo "configure:1894: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1854,6 +2003,9 @@ # Generated automatically by configure. # Run this file to recreate the current configuration. # This directory was configured as follows, +EOF +echo ': ${CONFIG_SHELL='"${CONFIG_SHELL-/bin/sh}"'}' >> $CONFIG_STATUS +cat >> $CONFIG_STATUS </dev/null | sed 1q`: # # $0 $ac_configure_args @@ -1878,6 +2030,7 @@ done ac_given_srcdir=$srcdir +PATHIFS="$PATH_IFS" trap 'rm -fr `echo "Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF @@ -1888,6 +2041,7 @@ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub +s,\([^a-zA-Z0-9:]\)/bin/sh\(.exe\),\1${CONFIG_SHELL-/bin/sh}\2,g s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g @@ -1911,6 +2065,8 @@ s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g +s%@PATH_IFS@%$PATH_IFS%g +s%@EXEEXT@%$EXEEXT%g s%@CC@%$CC%g s%@LIBTOOL@%$LIBTOOL%g s%@AR@%$AR%g @@ -1986,7 +2142,8 @@ .) srcdir=. if test -z "$ac_dots"; then top_srcdir=. else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + [/\\]* | [a-zA-Z]:*) + srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; *) # Relative path. srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" top_srcdir="$ac_dots$ac_given_srcdir" ;; @@ -2002,7 +2159,7 @@ *) ac_comsub= ;; esac - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%$PATHIFS% $ac_given_srcdir/%g"` sed -e "$ac_comsub s%@configure_input@%$configure_input%g s%@srcdir@%$srcdir%g @@ -2048,7 +2205,9 @@ echo creating $ac_file rm -f conftest.frag conftest.in conftest.out - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` +# kso the other way around might work better with drive letters and such. +# ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + ac_file_inputs=`echo $ac_file_in|sed -e "s%:% $ac_given_srcdir/%g" -e "s%^%$ac_given_srcdir/%" ` cat $ac_file_inputs > conftest.in EOF Index: src/gcc/libf2c/libU77/configure =================================================================== RCS file: /gccos2/src/gcc/libf2c/libU77/configure,v retrieving revision 1.1.1.2 retrieving revision 1.5 diff -w -u -r1.1.1.2 -r1.5 --- src/gcc/libf2c/libU77/configure 27 Apr 2004 18:38:58 -0000 1.1.1.2 +++ src/gcc/libf2c/libU77/configure 28 Apr 2004 04:57:55 -0000 1.5 @@ -28,7 +28,6 @@ program_transform_name=s,x,x, silent= site= -sitefile= srcdir= target=NONE verbose= @@ -143,7 +142,6 @@ --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages - --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -314,11 +312,6 @@ -site=* | --site=* | --sit=*) site="$ac_optarg" ;; - -site-file | --site-file | --site-fil | --site-fi | --site-f) - ac_prev=sitefile ;; - -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) - sitefile="$ac_optarg" ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -484,7 +477,6 @@ srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -if test -z "$sitefile"; then if test -z "$CONFIG_SITE"; then if test "x$prefix" != xNONE; then CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" @@ -492,9 +484,6 @@ CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi fi -else - CONFIG_SITE="$sitefile" -fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then echo "loading site script $ac_site_file" @@ -531,6 +520,157 @@ ac_n= ac_c='\c' ac_t= fi +echo $ac_n "checking for path separator""... $ac_c" 1>&6 +echo "configure:525: checking for path separator" >&5 +# Filter path to get backslahes into forwardslashes +case "`uname -s 2> /dev/null`" in +OS/2) + PATH=`echo -E "$PATH" | sed 's+\\\\+/+g'` + PATH_IFS=';' + ;; +*) + PATH_IFS=':' + ;; +esac +echo "$ac_t""${PATH_IFS}" 1>&6 + +echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 +echo "configure:539: checking for Cygwin environment" >&5 +if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cygwin=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cygwin=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_cygwin" 1>&6 +CYGWIN= +test "$ac_cv_cygwin" = yes && CYGWIN=yes +echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 +echo "configure:572: checking for mingw32 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_mingw32=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_mingw32=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_mingw32" 1>&6 +MINGW32= +test "$ac_cv_mingw32" = yes && MINGW32=yes +echo $ac_n "checking for EMX/OS2 environment""... $ac_c" 1>&6 +echo "configure:601: checking for EMX/OS2 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_emxos2'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + : ${CC=gcc.exe} +cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_emxos2=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_emxos2=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_emxos2" 1>&6 +if eval "test \"`echo '$''{'ac_cv_libpre'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$ac_cv_emxos2" = yes ; then + ac_cv_libpre= +else + ac_cv_libpre=lib +fi + +fi + +EMXOS2= +test "$ac_cv_emxos2" = yes && EMXOS2=yes + + + +echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 +echo "configure:645: checking for executable suffix" >&5 +if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then + ac_cv_exeext=.exe +else + rm -f conftest* + echo 'int main () { return 0; }' > conftest.$ac_ext + ac_cv_exeext= + if { (eval echo configure:655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + for file in conftest.*; do + case $file in + *.c | *.o | *.obj) ;; + *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; + esac + done + else + { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } + fi + rm -f conftest* + test x"${ac_cv_exeext}" = x && ac_cv_exeext=no +fi +fi + +EXEEXT="" +test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} +echo "$ac_t""${ac_cv_exeext}" 1>&6 +ac_exeext=$EXEEXT + @@ -541,18 +681,19 @@ # 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:545: checking for $ac_word" >&5 +echo "configure:685: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_CC="gcc" break fi @@ -571,20 +712,22 @@ # 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:575: checking for $ac_word" >&5 +echo "configure:716: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_prog_rejected=no ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc" -o \ + "$ac_dir/$ac_word$ac_exeext" = "/usr/ucb/cc" ; then ac_prog_rejected=yes continue fi @@ -622,18 +765,19 @@ # 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:626: checking for $ac_word" >&5 +echo "configure:769: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_CC="cl" break fi @@ -655,7 +799,7 @@ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:659: checking whether we are using GNU C" >&5 +echo "configure:803: 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 @@ -664,7 +808,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:668: \"$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:812: \"$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 @@ -683,7 +827,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:687: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:831: 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 @@ -719,9 +863,9 @@ # NetBSD 1.4 header files does not support XOPEN_SOURCE == 600, but it # handles 64-bit file sizes without needing these defines. echo $ac_n "checking whether _XOPEN_SOURCE may be defined""... $ac_c" 1>&6 -echo "configure:723: checking whether _XOPEN_SOURCE may be defined" >&5 +echo "configure:867: checking whether _XOPEN_SOURCE may be defined" >&5 cat > conftest.$ac_ext < @@ -729,7 +873,7 @@ ; return 0; } EOF -if { (eval echo configure:733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* may_use_xopen_source=yes else @@ -774,7 +918,7 @@ test "$AR" || AR=ar echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:778: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:922: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -804,19 +948,19 @@ # Extract the first word of "chmod", so it can be a program name with args. set dummy chmod; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:808: checking for $ac_word" >&5 +echo "configure:952: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ac_cv_prog_chmod'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else case "$ac_cv_prog_chmod" in - /*) + [/\\]* | [a-zA-Z]:*) ac_cv_path_ac_cv_prog_chmod="$ac_cv_prog_chmod" # Let the user override the test with a path. ;; ?:/*) ac_cv_path_ac_cv_prog_chmod="$ac_cv_prog_chmod" # Let the user override the test with a dos path. ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. @@ -824,6 +968,10 @@ ac_cv_path_ac_cv_prog_chmod="$ac_dir/$ac_word" break fi + if test -f $ac_dir/$ac_word$ac_exeext; then + ac_cv_path_ac_cv_prog_chmod="$ac_dir/$ac_word$ac_exeext" + break + fi done IFS="$ac_save_ifs" test -z "$ac_cv_path_ac_cv_prog_chmod" && ac_cv_path_ac_cv_prog_chmod="no" @@ -848,7 +996,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:852: checking how to run the C preprocessor" >&5 +echo "configure:1000: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -863,13 +1011,14 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < +#line 1016 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1022: \"$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 : @@ -880,13 +1029,14 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < +#line 1034 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1040: \"$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 : @@ -897,13 +1047,14 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < +#line 1052 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1058: \"$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 : @@ -928,12 +1079,13 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:932: checking for ANSI C header files" >&5 +echo "configure:1083: 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 < +#line 1089 "configure" #include "confdefs.h" #include #include @@ -941,7 +1093,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1097: \"$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* @@ -958,7 +1110,7 @@ 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 @@ -976,7 +1128,7 @@ 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 @@ -997,7 +1149,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1008,7 +1160,7 @@ exit (0); } EOF -if { (eval echo configure:1012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1032,12 +1184,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:1036: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:1188: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1046,7 +1198,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -1071,17 +1223,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1075: checking for $ac_hdr" >&5 +echo "configure:1227: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 1233 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1085: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1238: \"$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* @@ -1109,12 +1262,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1113: checking for working const" >&5 +echo "configure:1266: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1184,12 +1337,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1188: checking for size_t" >&5 +echo "configure:1341: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1217,12 +1370,12 @@ fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:1221: checking for mode_t" >&5 +echo "configure:1374: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1251,12 +1404,12 @@ echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:1255: checking for pid_t" >&5 +echo "configure:1408: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1284,12 +1437,12 @@ fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:1288: checking for st_blksize in struct stat" >&5 +echo "configure:1441: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1297,7 +1450,7 @@ struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:1301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -1318,12 +1471,12 @@ fi echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:1322: checking for st_blocks in struct stat" >&5 +echo "configure:1475: checking for st_blocks in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1331,7 +1484,7 @@ struct stat s; s.st_blocks; ; return 0; } EOF -if { (eval echo configure:1335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else @@ -1354,12 +1507,12 @@ fi echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 -echo "configure:1358: checking for st_rdev in struct stat" >&5 +echo "configure:1511: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1367,7 +1520,7 @@ struct stat s; s.st_rdev; ; return 0; } EOF -if { (eval echo configure:1371: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else @@ -1388,12 +1541,12 @@ fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:1392: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:1545: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1401,7 +1554,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:1405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -1423,7 +1576,7 @@ echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6 -echo "configure:1427: checking for gethostname in -lsocket" >&5 +echo "configure:1580: checking for gethostname in -lsocket" >&5 ac_lib_var=`echo socket'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1431,7 +1584,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1599: \"$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 @@ -1468,12 +1621,12 @@ getrusage times alarm getlogin getgid getuid kill link ttyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1472: checking for $ac_func" >&5 +echo "configure:1625: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1525,12 +1678,12 @@ for ac_func in gettimeofday do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1529: checking for $ac_func" >&5 +echo "configure:1682: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1579,19 +1732,19 @@ if test "$ac_cv_func_gettimeofday" = yes; then echo $ac_n "checking for struct timezone""... $ac_c" 1>&6 -echo "configure:1583: checking for struct timezone" >&5 +echo "configure:1736: checking for struct timezone" >&5 if eval "test \"`echo '$''{'g77_cv_struct_timezone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { struct timezone tz; ; return 0; } EOF -if { (eval echo configure:1595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* g77_cv_struct_timezone=yes else @@ -1612,7 +1765,7 @@ else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define HAVE_TIMEZONE 1 @@ -1651,12 +1804,12 @@ fi echo $ac_n "checking whether gettimeofday can accept two arguments""... $ac_c" 1>&6 -echo "configure:1655: checking whether gettimeofday can accept two arguments" >&5 +echo "configure:1808: checking whether gettimeofday can accept two arguments" >&5 if eval "test \"`echo '$''{'emacs_cv_gettimeofday_two_arguments'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* emacs_cv_gettimeofday_two_arguments=yes else @@ -1788,6 +1941,9 @@ # Generated automatically by configure. # Run this file to recreate the current configuration. # This directory was configured as follows, +EOF +echo ': ${CONFIG_SHELL='"${CONFIG_SHELL-/bin/sh}"'}' >> $CONFIG_STATUS +cat >> $CONFIG_STATUS </dev/null | sed 1q`: # # $0 $ac_configure_args @@ -1812,6 +1968,7 @@ done ac_given_srcdir=$srcdir +PATHIFS="$PATH_IFS" trap 'rm -fr `echo "Makefile config.h:config.hin" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF @@ -1822,6 +1979,7 @@ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub +s,\([^a-zA-Z0-9:]\)/bin/sh\(.exe\),\1${CONFIG_SHELL-/bin/sh}\2,g s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g @@ -1845,6 +2003,8 @@ s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g +s%@PATH_IFS@%$PATH_IFS%g +s%@EXEEXT@%$EXEEXT%g s%@CC@%$CC%g s%@LIBTOOL@%$LIBTOOL%g s%@AR@%$AR%g @@ -1926,7 +2086,8 @@ .) srcdir=. if test -z "$ac_dots"; then top_srcdir=. else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + [/\\]* | [a-zA-Z]:*) + srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; *) # Relative path. srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" top_srcdir="$ac_dots$ac_given_srcdir" ;; @@ -1942,7 +2103,7 @@ *) ac_comsub= ;; esac - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%$PATHIFS% $ac_given_srcdir/%g"` sed -e "$ac_comsub s%@configure_input@%$configure_input%g s%@srcdir@%$srcdir%g @@ -1988,7 +2149,9 @@ echo creating $ac_file rm -f conftest.frag conftest.in conftest.out - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` +# kso the other way around might work better with drive letters and such. +# ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + ac_file_inputs=`echo $ac_file_in|sed -e "s%:% $ac_given_srcdir/%g" -e "s%^%$ac_given_srcdir/%" ` cat $ac_file_inputs > conftest.in EOF Index: src/gcc/libffi/Makefile.am =================================================================== RCS file: /gccos2/src/gcc/libffi/Makefile.am,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -w -u -r1.1.1.2 -r1.3 Index: src/gcc/libffi/Makefile.in =================================================================== RCS file: /gccos2/src/gcc/libffi/Makefile.in,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -w -u -r1.1.1.2 -r1.3 Index: src/gcc/libffi/configure =================================================================== RCS file: /gccos2/src/gcc/libffi/configure,v retrieving revision 1.1.1.3 retrieving revision 1.6 diff -w -u -r1.1.1.3 -r1.6 --- src/gcc/libffi/configure 7 Sep 2004 02:31:42 -0000 1.1.1.3 +++ src/gcc/libffi/configure 8 Sep 2004 00:03:18 -0000 1.6 @@ -545,13 +545,27 @@ ac_n= ac_c='\c' ac_t= fi +echo $ac_n "checking for path separator""... $ac_c" 1>&6 +echo "configure:550: checking for path separator" >&5 +# Filter path to get backslahes into forwardslashes +case "`uname -s 2> /dev/null`" in +OS/2) + PATH=`echo -E "$PATH" | sed 's+\\\\+/+g'` + PATH_IFS=';' + ;; +*) + PATH_IFS=':' + ;; +esac +echo "$ac_t""${PATH_IFS}" 1>&6 + echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:550: checking for Cygwin environment" >&5 +echo "configure:564: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -579,19 +593,19 @@ CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:583: checking for mingw32 environment" >&5 +echo "configure:597: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -607,6 +621,81 @@ echo "$ac_t""$ac_cv_mingw32" 1>&6 MINGW32= test "$ac_cv_mingw32" = yes && MINGW32=yes +echo $ac_n "checking for EMX/OS2 environment""... $ac_c" 1>&6 +echo "configure:626: checking for EMX/OS2 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_emxos2'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + : ${CC=gcc.exe} +cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_emxos2=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_emxos2=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_emxos2" 1>&6 +if eval "test \"`echo '$''{'ac_cv_libpre'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$ac_cv_emxos2" = yes ; then + ac_cv_libpre= +else + ac_cv_libpre=lib +fi + +fi + +EMXOS2= +test "$ac_cv_emxos2" = yes && EMXOS2=yes + + + +echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 +echo "configure:670: checking for executable suffix" >&5 +if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then + ac_cv_exeext=.exe +else + rm -f conftest* + echo 'int main () { return 0; }' > conftest.$ac_ext + ac_cv_exeext= + if { (eval echo configure:680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + for file in conftest.*; do + case $file in + *.c | *.o | *.obj) ;; + *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; + esac + done + else + { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } + fi + rm -f conftest* + test x"${ac_cv_exeext}" = x && ac_cv_exeext=no +fi +fi + +EXEEXT="" +test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} +echo "$ac_t""${ac_cv_exeext}" 1>&6 +ac_exeext=$EXEEXT + @@ -668,7 +757,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:672: checking host system type" >&5 +echo "configure:761: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -759,7 +848,7 @@ fi echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:763: checking build system type" >&5 +echo "configure:852: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -779,18 +868,19 @@ # 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:783: checking for $ac_word" >&5 +echo "configure:872: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_CC="gcc" break fi @@ -809,20 +899,22 @@ # 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:813: checking for $ac_word" >&5 +echo "configure:903: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_prog_rejected=no ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc" -o \ + "$ac_dir/$ac_word$ac_exeext" = "/usr/ucb/cc" ; then ac_prog_rejected=yes continue fi @@ -860,18 +952,19 @@ # 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:864: checking for $ac_word" >&5 +echo "configure:956: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_CC="cl" break fi @@ -892,7 +985,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:896: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:989: 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. @@ -903,12 +996,12 @@ cat > conftest.$ac_ext << EOF -#line 907 "configure" +#line 1000 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1005: \"$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 @@ -934,12 +1027,12 @@ { 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:938: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1031: 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:943: checking whether we are using GNU C" >&5 +echo "configure:1036: 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 @@ -948,7 +1041,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:952: \"$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:1045: \"$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 @@ -967,7 +1060,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:971: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1064: 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 @@ -1010,7 +1103,7 @@ if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1014: checking for ld used by GCC" >&5 +echo "configure:1107: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1040,10 +1133,10 @@ esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1044: checking for GNU ld" >&5 +echo "configure:1137: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1047: checking for non-GNU ld" >&5 +echo "configure:1140: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1078,7 +1171,7 @@ fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1082: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1175: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1095,7 +1188,7 @@ echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1099: checking for $LD option to reload object files" >&5 +echo "configure:1192: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1107,7 +1200,7 @@ test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1111: checking for BSD-compatible nm" >&5 +echo "configure:1204: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1145,7 +1238,7 @@ echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1149: checking whether ln -s works" >&5 +echo "configure:1242: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1155,8 +1248,14 @@ rm -f conftestdata ac_cv_prog_LN_S="ln -s" else + echo A > conftestdata; + if ln conftestdata conftestdata2 2>/dev/null; then ac_cv_prog_LN_S=ln + else + ac_cv_prog_LN_S=cp + fi fi +rm -f conftestdata* fi LN_S="$ac_cv_prog_LN_S" if test "$ac_cv_prog_LN_S" = "ln -s"; then @@ -1166,7 +1265,7 @@ fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:1170: checking how to recognise dependant libraries" >&5 +echo "configure:1269: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1299,6 +1398,10 @@ lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; + osf3* | osf4* | osf5*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' @@ -1339,13 +1442,13 @@ deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1343: checking for object suffix" >&5 +echo "configure:1446: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:1349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -1362,39 +1465,6 @@ OBJEXT=$ac_cv_objext ac_objext=$ac_cv_objext - - -echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1369: checking for executable suffix" >&5 -if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$CYGWIN" = yes || test "$MINGW32" = yes; then - ac_cv_exeext=.exe -else - rm -f conftest* - echo 'int main () { return 0; }' > conftest.$ac_ext - ac_cv_exeext= - if { (eval echo configure:1379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then - for file in conftest.*; do - case $file in - *.c | *.o | *.obj) ;; - *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; - esac - done - else - { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } - fi - rm -f conftest* - test x"${ac_cv_exeext}" = x && ac_cv_exeext=no -fi -fi - -EXEEXT="" -test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} -echo "$ac_t""${ac_cv_exeext}" 1>&6 -ac_exeext=$EXEEXT - if test $host != $build; then ac_tool_prefix=${host_alias}- else @@ -1408,7 +1478,7 @@ file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:1412: checking for ${ac_tool_prefix}file" >&5 +echo "configure:1482: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1470,7 +1540,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:1474: checking for file" >&5 +echo "configure:1544: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1541,18 +1611,19 @@ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1545: checking for $ac_word" >&5 +echo "configure:1615: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" break fi @@ -1573,18 +1644,19 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1577: checking for $ac_word" >&5 +echo "configure:1648: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="ranlib" break fi @@ -1608,18 +1680,19 @@ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1612: checking for $ac_word" >&5 +echo "configure:1684: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" break fi @@ -1640,18 +1713,19 @@ # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1644: checking for $ac_word" >&5 +echo "configure:1717: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_STRIP="strip" break fi @@ -1707,8 +1781,8 @@ case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 1711 "configure"' > conftest.$ac_ext - if { (eval echo configure:1712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 1785 "configure"' > conftest.$ac_ext + if { (eval echo configure:1786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) @@ -1741,7 +1815,7 @@ ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:1745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:1819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -1757,7 +1831,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:1761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:1835: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) case $host in @@ -1801,7 +1875,7 @@ SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:1805: checking whether the C compiler needs -belf" >&5 +echo "configure:1879: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1814,14 +1888,14 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -1949,28 +2023,30 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1953: checking for a BSD compatible install" >&5 +echo "configure:2027: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="$PATH_IFS" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + # We reject the install program from OS/2 or W3.1 + */OS2|*/OS2/*|*/WINDOWS|*/WINDOWS/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. # Don't use installbsd from OSF since it installs stuff as root # by default. for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then + if test -f $ac_dir/$ac_prog$ac_exeext; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : else - ac_cv_path_install="$ac_dir/$ac_prog -c" + ac_cv_path_install="$ac_dir/$ac_prog$ac_exeext -c" break 2 fi fi @@ -2002,7 +2078,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:2006: checking whether build environment is sane" >&5 +echo "configure:2082: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -2059,7 +2135,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:2063: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:2139: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2098,7 +2174,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:2102: checking for working aclocal" >&5 +echo "configure:2178: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -2111,7 +2187,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:2115: checking for working autoconf" >&5 +echo "configure:2191: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -2124,7 +2200,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:2128: checking for working automake" >&5 +echo "configure:2204: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -2137,7 +2213,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:2141: checking for working autoheader" >&5 +echo "configure:2217: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -2150,7 +2226,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:2154: checking for working makeinfo" >&5 +echo "configure:2230: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -2166,18 +2242,19 @@ + echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:2171: checking for executable suffix" >&5 +echo "configure:2248: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test "$CYGWIN" = yes || test "$MINGW32" = yes; then + if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then ac_cv_exeext=.exe else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:2181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:2258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -2198,7 +2275,7 @@ ac_exeext=$EXEEXT echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:2202: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:2279: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -2224,18 +2301,19 @@ # 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:2228: checking for $ac_word" >&5 +echo "configure:2305: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_CC="gcc" break fi @@ -2254,20 +2332,22 @@ # 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:2258: checking for $ac_word" >&5 +echo "configure:2336: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_prog_rejected=no ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc" -o \ + "$ac_dir/$ac_word$ac_exeext" = "/usr/ucb/cc" ; then ac_prog_rejected=yes continue fi @@ -2305,18 +2385,19 @@ # 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:2309: checking for $ac_word" >&5 +echo "configure:2389: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_CC="cl" break fi @@ -2337,7 +2418,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2341: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2422: 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. @@ -2348,12 +2429,12 @@ cat > conftest.$ac_ext << EOF -#line 2352 "configure" +#line 2433 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2438: \"$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 @@ -2379,12 +2460,12 @@ { 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:2383: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2464: 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:2388: checking whether we are using GNU C" >&5 +echo "configure:2469: 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 @@ -2393,7 +2474,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2397: \"$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:2478: \"$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 @@ -2412,7 +2493,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2416: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2497: 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 @@ -2636,7 +2717,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2640: checking how to run the C preprocessor" >&5 +echo "configure:2721: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2651,13 +2732,14 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < +#line 2737 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2743: \"$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 : @@ -2668,13 +2750,14 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < +#line 2755 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2761: \"$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 : @@ -2685,13 +2768,14 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < +#line 2773 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2779: \"$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 : @@ -2716,12 +2800,13 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2720: checking for ANSI C header files" >&5 +echo "configure:2804: 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 < +#line 2810 "configure" #include "confdefs.h" #include #include @@ -2729,7 +2814,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2733: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2818: \"$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* @@ -2746,7 +2831,7 @@ 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 @@ -2764,7 +2849,7 @@ 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 @@ -2785,7 +2870,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2796,7 +2881,7 @@ exit (0); } EOF -if { (eval echo configure:2800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2822,12 +2907,12 @@ for ac_func in memcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2826: checking for $ac_func" >&5 +echo "configure:2911: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2877,19 +2962,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:2881: checking for working alloca.h" >&5 +echo "configure:2966: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; 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:2978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -2910,12 +2995,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:2914: checking for alloca" >&5 +echo "configure:2999: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -2975,12 +3060,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:2979: checking whether alloca needs Cray hooks" >&5 +echo "configure:3064: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:3009: checking for $ac_func" >&5 +echo "configure:3094: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3060,7 +3145,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:3064: checking stack direction for C alloca" >&5 +echo "configure:3149: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3068,7 +3153,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -3110,13 +3195,13 @@ echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:3114: checking size of short" >&5 +echo "configure:3199: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 12 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -3126,7 +3211,7 @@ switch (0) case 0: case (sizeof (short) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:3130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_short=$ac_size else @@ -3149,13 +3234,13 @@ echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:3153: checking size of int" >&5 +echo "configure:3238: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 12 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -3165,7 +3250,7 @@ switch (0) case 0: case (sizeof (int) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:3169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_int=$ac_size else @@ -3188,13 +3273,13 @@ echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:3192: checking size of long" >&5 +echo "configure:3277: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 12 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -3204,7 +3289,7 @@ switch (0) case 0: case (sizeof (long) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:3208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_long=$ac_size else @@ -3227,13 +3312,13 @@ echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:3231: checking size of long long" >&5 +echo "configure:3316: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 12 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -3243,7 +3328,7 @@ switch (0) case 0: case (sizeof (long long) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:3247: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_long_long=$ac_size else @@ -3266,13 +3351,13 @@ echo $ac_n "checking size of float""... $ac_c" 1>&6 -echo "configure:3270: checking size of float" >&5 +echo "configure:3355: checking size of float" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 12 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -3282,7 +3367,7 @@ switch (0) case 0: case (sizeof (float) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:3286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3371: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_float=$ac_size else @@ -3305,13 +3390,13 @@ echo $ac_n "checking size of double""... $ac_c" 1>&6 -echo "configure:3309: checking size of double" >&5 +echo "configure:3394: checking size of double" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 12 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -3321,7 +3406,7 @@ switch (0) case 0: case (sizeof (double) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:3325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_double=$ac_size else @@ -3344,13 +3429,13 @@ echo $ac_n "checking size of long double""... $ac_c" 1>&6 -echo "configure:3348: checking size of long double" >&5 +echo "configure:3433: checking size of long double" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 12 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -3360,7 +3445,7 @@ switch (0) case 0: case (sizeof (long double) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:3364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_long_double=$ac_size else @@ -3384,13 +3469,13 @@ echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:3388: checking size of void *" >&5 +echo "configure:3473: checking size of void *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_void_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 12 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -3400,7 +3485,7 @@ switch (0) case 0: case (sizeof (void *) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:3404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3489: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_void_p=$ac_size else @@ -3423,14 +3508,14 @@ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:3427: checking whether byte ordering is bigendian" >&5 +echo "configure:3512: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -3441,11 +3526,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:3445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -3456,7 +3541,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:3460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -3476,7 +3561,7 @@ echo $ac_n "cross-compiling... " 2>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -3507,7 +3592,7 @@ echo "$ac_t""$ac_cv_c_bigendian" 1>&6 if test $ac_cv_c_bigendian = unknown; then echo $ac_n "checking to probe for byte ordering""... $ac_c" 1>&6 -echo "configure:3511: checking to probe for byte ordering" >&5 +echo "configure:3596: checking to probe for byte ordering" >&5 cat >conftest.c <&6 -echo "configure:3561: checking assembler and linker support unaligned pc related relocs" >&5 +echo "configure:3646: checking assembler and linker support unaligned pc related relocs" >&5 if eval "test \"`echo '$''{'libffi_cv_as_sparc_ua_pcrel'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3567,14 +3652,14 @@ CFLAGS="$CFLAGS -fpic" LDFLAGS="$LDFLAGS -shared" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* libffi_cv_as_sparc_ua_pcrel=yes else @@ -3597,7 +3682,7 @@ fi echo $ac_n "checking assembler .register pseudo-op support""... $ac_c" 1>&6 -echo "configure:3601: checking assembler .register pseudo-op support" >&5 +echo "configure:3686: checking assembler .register pseudo-op support" >&5 if eval "test \"`echo '$''{'libffi_cv_as_register_pseudo_op'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3605,14 +3690,14 @@ libffi_cv_as_register_pseudo_op=unknown # Check if we have .register cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libffi_cv_as_register_pseudo_op=yes else @@ -3780,6 +3865,9 @@ # Generated automatically by configure. # Run this file to recreate the current configuration. # This directory was configured as follows, +EOF +echo ': ${CONFIG_SHELL='"${CONFIG_SHELL-/bin/sh}"'}' >> $CONFIG_STATUS +cat >> $CONFIG_STATUS </dev/null | sed 1q`: # # $0 $ac_configure_args @@ -3805,6 +3893,7 @@ ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" +PATHIFS="$PATH_IFS" trap 'rm -fr `echo "include/Makefile include/ffi.h Makefile fficonfig.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF @@ -3815,6 +3904,7 @@ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub +s,\([^a-zA-Z0-9:]\)/bin/sh\(.exe\),\1${CONFIG_SHELL-/bin/sh}\2,g s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g @@ -3838,6 +3928,8 @@ s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g +s%@PATH_IFS@%$PATH_IFS%g +s%@EXEEXT@%$EXEEXT%g s%@libffi_basedir@%$libffi_basedir%g s%@host@%$host%g s%@host_alias@%$host_alias%g @@ -3852,7 +3944,6 @@ s%@CC@%$CC%g s%@LN_S@%$LN_S%g s%@OBJEXT@%$OBJEXT%g -s%@EXEEXT@%$EXEEXT%g s%@RANLIB@%$RANLIB%g s%@STRIP@%$STRIP%g s%@LIBTOOL@%$LIBTOOL%g @@ -3978,14 +4069,15 @@ .) srcdir=. if test -z "$ac_dots"; then top_srcdir=. else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + [/\\]* | [a-zA-Z]:*) + srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; *) # Relative path. srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" top_srcdir="$ac_dots$ac_given_srcdir" ;; esac case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; + [/$\\]* | [A-Za-z]:*) INSTALL="$ac_given_INSTALL" ;; *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac @@ -3998,7 +4090,7 @@ *) ac_comsub= ;; esac - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%$PATHIFS% $ac_given_srcdir/%g"` sed -e "$ac_comsub s%@configure_input@%$configure_input%g s%@srcdir@%$srcdir%g @@ -4045,7 +4137,9 @@ echo creating $ac_file rm -f conftest.frag conftest.in conftest.out - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` +# kso the other way around might work better with drive letters and such. +# ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + ac_file_inputs=`echo $ac_file_in|sed -e "s%:% $ac_given_srcdir/%g" -e "s%^%$ac_given_srcdir/%" ` cat $ac_file_inputs > conftest.in EOF Index: src/gcc/libiberty/Makefile.in =================================================================== RCS file: /gccos2/src/gcc/libiberty/Makefile.in,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -w -u -r1.1.1.2 -r1.3 Index: src/gcc/libiberty/basename.c =================================================================== RCS file: /gccos2/src/gcc/libiberty/basename.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -w -u -r1.1.1.1 -r1.2 --- src/gcc/libiberty/basename.c 16 Apr 2003 10:11:07 -0000 1.1.1.1 +++ src/gcc/libiberty/basename.c 16 Apr 2003 14:03:38 -0000 1.2 @@ -21,7 +21,7 @@ #endif #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) + defined (__OS2__) || defined (__EMX__) #define HAVE_DOS_BASED_FILE_SYSTEM #ifndef DIR_SEPARATOR_2 #define DIR_SEPARATOR_2 '\\' Index: src/gcc/libiberty/config.table =================================================================== RCS file: /gccos2/src/gcc/libiberty/config.table,v retrieving revision 1.1.1.2 retrieving revision 1.4 diff -w -u -r1.1.1.2 -r1.4 --- src/gcc/libiberty/config.table 27 Apr 2004 18:38:59 -0000 1.1.1.2 +++ src/gcc/libiberty/config.table 28 Apr 2004 04:57:55 -0000 1.4 @@ -12,6 +12,7 @@ *-*-freebsd2.2.[012]) frag=mh-fbsd21 ;; i370-*-opened*) frag=mh-openedition ;; i[345]86-*-windows*) frag=mh-windows ;; + *-*-*emx) frag=mh-emx ;; esac if [ -n "${frag}" ]; then @@ -31,6 +32,7 @@ frag= case "${host}" in *-*-cygwin*) ;; + *-*-*emx) ;; alpha*-*-linux*) frag=mh-elfalphapic ;; arm*-*-*) frag=mh-armpic ;; hppa*-*-*) frag=mh-papic ;; Index: src/gcc/libiberty/configure =================================================================== RCS file: /gccos2/src/gcc/libiberty/configure,v retrieving revision 1.1.1.2 retrieving revision 1.5 diff -w -u -r1.1.1.2 -r1.5 --- src/gcc/libiberty/configure 27 Apr 2004 18:38:59 -0000 1.1.1.2 +++ src/gcc/libiberty/configure 28 Apr 2004 04:57:56 -0000 1.5 @@ -534,6 +534,157 @@ ac_n= ac_c='\c' ac_t= fi +echo $ac_n "checking for path separator""... $ac_c" 1>&6 +echo "configure:539: checking for path separator" >&5 +# Filter path to get backslahes into forwardslashes +case "`uname -s 2> /dev/null`" in +OS/2) + PATH=`echo -E "$PATH" | sed 's+\\\\+/+g'` + PATH_IFS=';' + ;; +*) + PATH_IFS=':' + ;; +esac +echo "$ac_t""${PATH_IFS}" 1>&6 + +echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 +echo "configure:553: checking for Cygwin environment" >&5 +if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cygwin=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cygwin=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_cygwin" 1>&6 +CYGWIN= +test "$ac_cv_cygwin" = yes && CYGWIN=yes +echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 +echo "configure:586: checking for mingw32 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_mingw32=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_mingw32=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_mingw32" 1>&6 +MINGW32= +test "$ac_cv_mingw32" = yes && MINGW32=yes +echo $ac_n "checking for EMX/OS2 environment""... $ac_c" 1>&6 +echo "configure:615: checking for EMX/OS2 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_emxos2'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + : ${CC=gcc.exe} +cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_emxos2=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_emxos2=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_emxos2" 1>&6 +if eval "test \"`echo '$''{'ac_cv_libpre'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$ac_cv_emxos2" = yes ; then + ac_cv_libpre= +else + ac_cv_libpre=lib +fi + +fi + +EMXOS2= +test "$ac_cv_emxos2" = yes && EMXOS2=yes + + + +echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 +echo "configure:659: checking for executable suffix" >&5 +if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then + ac_cv_exeext=.exe +else + rm -f conftest* + echo 'int main () { return 0; }' > conftest.$ac_ext + ac_cv_exeext= + if { (eval echo configure:669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + for file in conftest.*; do + case $file in + *.c | *.o | *.obj) ;; + *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; + esac + done + else + { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } + fi + rm -f conftest* + test x"${ac_cv_exeext}" = x && ac_cv_exeext=no +fi +fi + +EXEEXT="" +test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} +echo "$ac_t""${ac_cv_exeext}" 1>&6 +ac_exeext=$EXEEXT + # This works around the fact that libtool configuration may change LD @@ -606,7 +757,7 @@ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:610: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:761: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -631,18 +782,19 @@ # Extract the first word of "makeinfo", so it can be a program name with args. set dummy makeinfo; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:635: checking for $ac_word" >&5 +echo "configure:786: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$MAKEINFO"; then ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_MAKEINFO="makeinfo" break fi @@ -677,18 +829,19 @@ # 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:681: checking for $ac_word" >&5 +echo "configure:833: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$PERL"; then ac_cv_prog_PERL="$PERL" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_PERL="perl" break fi @@ -717,7 +870,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:721: checking host system type" >&5 +echo "configure:874: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -740,7 +893,7 @@ echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:744: checking build system type" >&5 +echo "configure:897: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -766,18 +919,19 @@ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:770: checking for $ac_word" >&5 +echo "configure:923: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_AR="${ac_tool_prefix}ar" break fi @@ -798,18 +952,19 @@ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:802: checking for $ac_word" >&5 +echo "configure:956: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" break fi @@ -830,18 +985,19 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:834: checking for $ac_word" >&5 +echo "configure:989: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="ranlib" break fi @@ -867,18 +1023,19 @@ # 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:871: checking for $ac_word" >&5 +echo "configure:1027: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_CC="gcc" break fi @@ -897,20 +1054,22 @@ # 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:901: checking for $ac_word" >&5 +echo "configure:1058: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_prog_rejected=no ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc" -o \ + "$ac_dir/$ac_word$ac_exeext" = "/usr/ucb/cc" ; then ac_prog_rejected=yes continue fi @@ -946,7 +1105,7 @@ fi echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:950: checking whether we are using GNU C" >&5 +echo "configure:1109: 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 @@ -955,7 +1114,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:959: \"$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:1118: \"$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 @@ -971,7 +1130,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:975: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1134: 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 @@ -1003,10 +1162,10 @@ if test "x$CC" != xcc; then echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6 -echo "configure:1007: checking whether $CC and cc understand -c and -o together" >&5 +echo "configure:1166: checking whether $CC and cc understand -c and -o together" >&5 else echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6 -echo "configure:1010: checking whether cc understands -c and -o together" >&5 +echo "configure:1169: checking whether cc understands -c and -o together" >&5 fi set dummy $CC; ac_cc="`echo $2 | sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" @@ -1018,16 +1177,16 @@ # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5' -if { (eval echo configure:1022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:1023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; +if { (eval echo configure:1181: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:1182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then eval ac_cv_prog_cc_${ac_cc}_c_o=yes if test "x$CC" != xcc; then # Test first that cc exists at all. - if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:1028: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:1187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then ac_try='cc -c conftest.c -o conftest.o 1>&5' - if { (eval echo configure:1030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:1031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + if { (eval echo configure:1189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:1190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then # cc works too. : @@ -1063,7 +1222,7 @@ echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:1067: checking for POSIXized ISC" >&5 +echo "configure:1226: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -1084,12 +1243,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1088: checking for working const" >&5 +echo "configure:1247: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1159,21 +1318,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1163: checking for inline" >&5 +echo "configure:1322: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1336: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1216,28 +1375,30 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1220: checking for a BSD compatible install" >&5 +echo "configure:1379: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="$PATH_IFS" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + # We reject the install program from OS/2 or W3.1 + */OS2|*/OS2/*|*/WINDOWS|*/WINDOWS/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. # Don't use installbsd from OSF since it installs stuff as root # by default. for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then + if test -f $ac_dir/$ac_prog$ac_exeext; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : else - ac_cv_path_install="$ac_dir/$ac_prog -c" + ac_cv_path_install="$ac_dir/$ac_prog$ac_exeext -c" break 2 fi fi @@ -1277,7 +1438,7 @@ # able to link anything, it had better be able to at least compile # something. echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1281: checking how to run the C preprocessor" >&5 +echo "configure:1442: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1292,13 +1453,14 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < +#line 1458 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1464: \"$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 : @@ -1309,13 +1471,14 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < +#line 1476 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1482: \"$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 : @@ -1326,13 +1489,14 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < +#line 1494 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1336: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1500: \"$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 : @@ -1360,17 +1524,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1364: checking for $ac_hdr" >&5 +echo "configure:1528: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 1534 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1374: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1539: \"$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* @@ -1397,12 +1562,12 @@ done echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:1401: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:1566: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1418,7 +1583,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:1422: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1587: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -1439,12 +1604,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:1443: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:1608: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1453,7 +1618,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -1475,19 +1640,19 @@ echo $ac_n "checking whether errno must be declared""... $ac_c" 1>&6 -echo "configure:1479: checking whether errno must be declared" >&5 +echo "configure:1644: checking whether errno must be declared" >&5 if eval "test \"`echo '$''{'libiberty_cv_declare_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { int x = errno; ; return 0; } EOF -if { (eval echo configure:1491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libiberty_cv_declare_errno=no else @@ -1509,12 +1674,13 @@ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1513: checking for ANSI C header files" >&5 +echo "configure:1678: 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 < +#line 1684 "configure" #include "confdefs.h" #include #include @@ -1522,7 +1688,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1526: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1692: \"$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* @@ -1539,7 +1705,7 @@ 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 @@ -1557,7 +1723,7 @@ 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 @@ -1578,7 +1744,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1589,7 +1755,7 @@ exit (0); } EOF -if { (eval echo configure:1593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1613,12 +1779,12 @@ fi echo $ac_n "checking for uintptr_t""... $ac_c" 1>&6 -echo "configure:1617: checking for uintptr_t" >&5 +echo "configure:1783: checking for uintptr_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_uintptr_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1654,12 +1820,12 @@ echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:1658: checking for pid_t" >&5 +echo "configure:1824: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1746,12 +1912,12 @@ for ac_func in asprintf atexit basename bcmp bcopy bsearch bzero calloc clock do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1750: checking for $ac_func" >&5 +echo "configure:1916: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1801,12 +1967,12 @@ for ac_func in getcwd getpagesize index insque mkstemps memchr memcmp memcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1805: checking for $ac_func" >&5 +echo "configure:1971: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1856,12 +2022,12 @@ for ac_func in memmove memset putenv random rename rindex sigsetmask do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1860: checking for $ac_func" >&5 +echo "configure:2026: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1911,12 +2077,12 @@ for ac_func in strcasecmp setenv strchr strdup strncasecmp strrchr strstr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1915: checking for $ac_func" >&5 +echo "configure:2081: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1966,12 +2132,12 @@ for ac_func in strtod strtol strtoul tmpnam vasprintf vfprintf vprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1970: checking for $ac_func" >&5 +echo "configure:2136: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2021,12 +2187,12 @@ for ac_func in vsprintf waitpid getrusage on_exit psignal strerror strsignal do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2025: checking for $ac_func" >&5 +echo "configure:2191: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2076,12 +2242,12 @@ for ac_func in sysconf times sbrk gettimeofday ffs do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2080: checking for $ac_func" >&5 +echo "configure:2246: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2131,12 +2297,12 @@ for ac_func in realpath canonicalize_file_name do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2135: checking for $ac_func" >&5 +echo "configure:2301: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2186,12 +2352,12 @@ for ac_func in pstat_getstatic pstat_getdynamic sysmp getsysinfo table sysctl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2190: checking for $ac_func" >&5 +echo "configure:2356: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2444,7 +2610,7 @@ # We haven't set the list of objects yet. Use the standard autoconf # tests. This will only work if the compiler works. echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2448: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2614: 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. @@ -2455,12 +2621,12 @@ cat > conftest.$ac_ext << EOF -#line 2459 "configure" +#line 2625 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2630: \"$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 @@ -2486,19 +2652,19 @@ { 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:2490: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2656: 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 for ac_func in $funcs do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2497: checking for $ac_func" >&5 +echo "configure:2663: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2548,12 +2714,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:2552: checking whether alloca needs Cray hooks" >&5 +echo "configure:2718: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:2582: checking for $ac_func" >&5 +echo "configure:2748: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2632,7 +2798,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:2636: checking stack direction for C alloca" >&5 +echo "configure:2802: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2640,7 +2806,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -2681,17 +2847,18 @@ ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:2685: checking for vfork.h" >&5 +echo "configure:2851: checking for vfork.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 2857 "configure" #include "confdefs.h" #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2862: \"$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* @@ -2716,18 +2883,18 @@ fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:2720: checking for working vfork" >&5 +echo "configure:2887: checking for working vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then echo $ac_n "checking for vfork""... $ac_c" 1>&6 -echo "configure:2726: checking for vfork" >&5 +echo "configure:2893: checking for vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&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_func_vfork=yes" else @@ -2772,7 +2939,7 @@ ac_cv_func_vfork_works=$ac_cv_func_vfork else cat > conftest.$ac_ext < @@ -2867,7 +3034,7 @@ } } EOF -if { (eval echo configure:2871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_vfork_works=yes else @@ -2899,12 +3066,12 @@ for ac_func in _doprnt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2903: checking for $ac_func" >&5 +echo "configure:3070: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2957,12 +3124,12 @@ for ac_func in _doprnt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2961: checking for $ac_func" >&5 +echo "configure:3128: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3013,19 +3180,19 @@ for v in $vars; do echo $ac_n "checking for $v""... $ac_c" 1>&6 -echo "configure:3017: checking for $v" >&5 +echo "configure:3184: checking for $v" >&5 if eval "test \"`echo '$''{'libiberty_cv_var_$v'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "libiberty_cv_var_$v=yes" else @@ -3052,16 +3219,16 @@ # special check for _system_configuration because AIX <4.3.2 do not # contain the `physmem' member. echo $ac_n "checking for external symbol _system_configuration""... $ac_c" 1>&6 -echo "configure:3056: checking for external symbol _system_configuration" >&5 +echo "configure:3223: checking for external symbol _system_configuration" >&5 cat > conftest.$ac_ext < int main() { double x = _system_configuration.physmem; ; return 0; } EOF -if { (eval echo configure:3065: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -3077,12 +3244,12 @@ rm -f conftest* echo $ac_n "checking whether canonicalize_file_name must be declared""... $ac_c" 1>&6 -echo "configure:3081: checking whether canonicalize_file_name must be declared" >&5 +echo "configure:3248: checking whether canonicalize_file_name must be declared" >&5 if eval "test \"`echo '$''{'libiberty_cv_decl_needed_canonicalize_file_name'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libiberty_cv_decl_needed_canonicalize_file_name=no else @@ -3127,12 +3294,12 @@ for ac_func in $checkfuncs do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3131: checking for $ac_func" >&5 +echo "configure:3298: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3185,17 +3352,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3189: checking for $ac_hdr" >&5 +echo "configure:3356: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 3362 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3199: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3367: \"$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* @@ -3224,12 +3392,12 @@ for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3228: checking for $ac_func" >&5 +echo "configure:3396: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3277,7 +3445,7 @@ done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:3281: checking for working mmap" >&5 +echo "configure:3449: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3285,7 +3453,7 @@ ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -3449,7 +3617,7 @@ echo $ac_n "checking for working strncmp""... $ac_c" 1>&6 -echo "configure:3453: checking for working strncmp" >&5 +echo "configure:3621: checking for working strncmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_strncmp_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3457,7 +3625,7 @@ ac_cv_func_strncmp_works=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_strncmp_works=yes else @@ -3627,6 +3795,9 @@ # Generated automatically by configure. # Run this file to recreate the current configuration. # This directory was configured as follows, +EOF +echo ': ${CONFIG_SHELL='"${CONFIG_SHELL-/bin/sh}"'}' >> $CONFIG_STATUS +cat >> $CONFIG_STATUS </dev/null | sed 1q`: # # $0 $ac_configure_args @@ -3652,6 +3823,7 @@ ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" +PATHIFS="$PATH_IFS" trap 'rm -fr `echo "Makefile testsuite/Makefile config.h:config.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF @@ -3662,6 +3834,7 @@ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub +s,\([^a-zA-Z0-9:]\)/bin/sh\(.exe\),\1${CONFIG_SHELL-/bin/sh}\2,g s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g @@ -3685,6 +3858,8 @@ s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g +s%@PATH_IFS@%$PATH_IFS%g +s%@EXEEXT@%$EXEEXT%g s%@libiberty_topdir@%$libiberty_topdir%g s%@MAINT@%$MAINT%g s%@NOTMAINT@%$NOTMAINT%g @@ -3788,14 +3963,15 @@ .) srcdir=. if test -z "$ac_dots"; then top_srcdir=. else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + [/\\]* | [a-zA-Z]:*) + srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; *) # Relative path. srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" top_srcdir="$ac_dots$ac_given_srcdir" ;; esac case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; + [/$\\]* | [A-Za-z]:*) INSTALL="$ac_given_INSTALL" ;; *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac @@ -3808,7 +3984,7 @@ *) ac_comsub= ;; esac - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%$PATHIFS% $ac_given_srcdir/%g"` sed -e "$ac_comsub s%@configure_input@%$configure_input%g s%@srcdir@%$srcdir%g @@ -3855,7 +4031,9 @@ echo creating $ac_file rm -f conftest.frag conftest.in conftest.out - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` +# kso the other way around might work better with drive letters and such. +# ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + ac_file_inputs=`echo $ac_file_in|sed -e "s%:% $ac_given_srcdir/%g" -e "s%^%$ac_given_srcdir/%" ` cat $ac_file_inputs > conftest.in EOF Index: src/gcc/libiberty/getpwd.c =================================================================== RCS file: /gccos2/src/gcc/libiberty/getpwd.c,v retrieving revision 1.1.1.1 retrieving revision 1.3 diff -w -u -r1.1.1.1 -r1.3 --- src/gcc/libiberty/getpwd.c 16 Apr 2003 10:11:08 -0000 1.1.1.1 +++ src/gcc/libiberty/getpwd.c 28 Apr 2003 16:47:08 -0000 1.3 @@ -56,7 +56,7 @@ #define GUESSPATHLEN 100 #endif -#if !(defined (VMS) || (defined(_WIN32) && !defined(__CYGWIN__))) +#if !(defined (VMS) || (defined(_WIN32) && !defined(__CYGWIN__)) || defined(__EMX__)) /* Get the working directory. Use the PWD environment variable if it's set correctly, since this is faster and gives more uniform answers @@ -104,7 +104,7 @@ return p; } -#else /* VMS || _WIN32 && !__CYGWIN__ */ +#else /* VMS || _WIN32 && !__CYGWIN__ || __EMX__ */ #ifndef MAXPATHLEN #define MAXPATHLEN 255 @@ -124,4 +124,4 @@ return pwd; } -#endif /* VMS || _WIN32 && !__CYGWIN__ */ +#endif /* VMS || _WIN32 && !__CYGWIN__ || __EMX__ */ Index: src/gcc/libiberty/lbasename.c =================================================================== RCS file: /gccos2/src/gcc/libiberty/lbasename.c,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -w -u -r1.1.1.2 -r1.3 --- src/gcc/libiberty/lbasename.c 27 Apr 2004 18:38:59 -0000 1.1.1.2 +++ src/gcc/libiberty/lbasename.c 28 Apr 2004 04:57:56 -0000 1.3 @@ -46,7 +46,7 @@ #endif #if defined (_WIN32) || defined (__MSDOS__) \ - || defined (__DJGPP__) || defined (__OS2__) + || defined (__DJGPP__) || defined (__OS2__) || defined (__EMX__) # define HAVE_DOS_BASED_FILE_SYSTEM # ifndef DIR_SEPARATOR_2 # define DIR_SEPARATOR_2 '\\' Index: src/gcc/libiberty/make-temp-file.c =================================================================== RCS file: /gccos2/src/gcc/libiberty/make-temp-file.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -w -u -r1.1.1.1 -r1.2 --- src/gcc/libiberty/make-temp-file.c 16 Apr 2003 10:11:08 -0000 1.1.1.1 +++ src/gcc/libiberty/make-temp-file.c 6 Feb 2004 11:13:15 -0000 1.2 @@ -126,7 +126,14 @@ len = strlen (base); tmpdir = xmalloc (len + 2); strcpy (tmpdir, base); +#ifdef __EMX__ + if (tmpdir[len - 1] == '\\' || tmpdir[len - 1] == '/') + tmpdir[--len] = DIR_SEPARATOR; + else tmpdir[len] = DIR_SEPARATOR; +#else + tmpdir[len] = DIR_SEPARATOR; +#endif tmpdir[len+1] = '\0'; memoized_tmpdir = tmpdir; Index: src/gcc/libiberty/pexecute.c =================================================================== RCS file: /gccos2/src/gcc/libiberty/pexecute.c,v retrieving revision 1.1.1.1 retrieving revision 1.4 diff -w -u -r1.1.1.1 -r1.4 --- src/gcc/libiberty/pexecute.c 16 Apr 2003 10:11:08 -0000 1.1.1.1 +++ src/gcc/libiberty/pexecute.c 27 May 2003 18:14:42 -0000 1.4 @@ -81,7 +81,7 @@ (@code{@var{flags} & PEXECUTE_SEARCH}) is non-zero if @env{PATH} should be searched (??? It's not clear that GCC passes this flag correctly). (@code{@var{flags} & PEXECUTE_FIRST}) is nonzero for the first process in chain. -(@code{@var{flags} & PEXECUTE_FIRST}) is nonzero for the last process +(@code{@var{flags} & PEXECUTE_LAST}) is nonzero for the last process in chain. The first/last flags could be simplified to only mark the last of a chain of processes but that requires the caller to always mark the last one (and not give up early if some error occurs). @@ -483,6 +483,7 @@ #ifdef OS2 +/* This is for non-EMX OS/2 port (is it floating around anyway?) */ /* ??? Does OS2 have process.h? */ extern int spawnv (); extern int spawnvp (); @@ -662,7 +663,7 @@ /* include for Unix-like environments but not for Dos-like environments */ #if ! defined (__MSDOS__) && ! defined (OS2) && ! defined (MPW) \ - && ! (defined (_WIN32) && ! defined (_UWIN)) + && ! (defined (_WIN32) && ! defined (_UWIN)) && ! defined (__EMX__) extern int execv (); extern int execvp (); @@ -789,4 +790,132 @@ return pid; } -#endif /* ! __MSDOS__ && ! OS2 && ! MPW && ! (_WIN32 && ! _UWIN) */ +#endif /* ! __MSDOS__ && ! OS2 && ! MPW && ! (_WIN32 && ! _UWIN) && ! __EMX__ */ + +#ifdef __EMX__ + +#undef abort +#include +#include +#define INCL_DOSPROCESS +#include + +int +pexecute (program, argv, this_pname, temp_base, errmsg_fmt, errmsg_arg, flags) + const char *program; + char * const *argv; + const char *this_pname; + const char *temp_base; + char **errmsg_fmt, **errmsg_arg; + int flags; +{ + static int last_pipe_input = STDIN_FILE_NO; + int pid; + int pdes[2], org_stdin, org_stdout; + int input_desc = last_pipe_input; + int output_desc = STDOUT_FILE_NO; +#ifdef __OS2__ +#define pipes_supported 1 +#else + int pipes_supported = _osmode != DOS_MODE || (_emx_env & 0x1000); +#endif + + /* Since the function can reside in a DLL, we should take care + environ to not be NULL. Unfortunately this involves os2.h :-( - A.Z. */ + if (!environ) + { + PTIB tib; + PPIB pib; + if (!DosGetInfoBlocks (&tib, &pib)) + { + int count = 1; + char *env = pib->pib_pchenv; + char **cur; + while (*env++) + if (!*env) + count++, env++; + cur = environ = malloc (sizeof (char *) * count); + env = pib->pib_pchenv; + *cur++ = env; + while (*env++) + if (!*env) + env++, *cur++ = env; + cur [-1] = NULL; + } + } + + if (!pipes_supported && (flags & PEXECUTE_ONE) != PEXECUTE_ONE) + { + static char *errtpl = "%s: exec %s (pipes not supported)"; + *errmsg_fmt = (char *) xmalloc (strlen(errtpl) + \ + strlen(this_pname) + strlen(program)); + sprintf (*errmsg_fmt, errtpl, this_pname, program); + *errmsg_arg = NULL; + return -1; + } + /* If this isn't the last process, make a pipe for its output, + and record it as waiting to be the input to the next process. */ + if (!(flags & PEXECUTE_LAST)) + { + if (pipe (pdes) < 0) + { + static char *errtpl = "%s: pipe to/from %s"; + *errmsg_fmt = (char *) xmalloc (strlen(errtpl) + \ + strlen(this_pname) + strlen(program)); + sprintf (*errmsg_fmt, errtpl, this_pname, program); + *errmsg_arg = NULL; + return -1; + } + output_desc = pdes[WRITE_PORT]; + last_pipe_input = pdes[READ_PORT]; + } + else + last_pipe_input = STDIN_FILE_NO; + if (pipes_supported && input_desc != STDIN_FILE_NO) + { + org_stdin = dup (STDIN_FILE_NO); + dup2 (input_desc, STDIN_FILE_NO); + close (input_desc); + } + if (pipes_supported && output_desc != STDOUT_FILE_NO) + { + org_stdout = dup (STDOUT_FILE_NO); + dup2 (output_desc, STDOUT_FILE_NO); + close (output_desc); + } + pid = (flags & PEXECUTE_SEARCH ? spawnvp : spawnv) (P_NOWAIT, program, argv); + if (pipes_supported && input_desc != STDIN_FILE_NO) + { + dup2 (org_stdin, STDIN_FILE_NO); + close (org_stdin); + } + if (pipes_supported && output_desc != STDOUT_FILE_NO) + { + dup2 (org_stdout, STDOUT_FILE_NO); + close (org_stdout); + } + if (pid == -1) + { + static char *errtpl = "%s: error executing %s"; + *errmsg_fmt = (char *) xmalloc (strlen(errtpl) + \ + strlen(this_pname) + strlen(program)); + sprintf (*errmsg_fmt, errtpl, this_pname, program); + *errmsg_arg = NULL; + } + return pid; +} + +int +pwait (pid, status, flags) + int pid; + int *status; + int flags; +{ + int rc; + do + rc = waitpid (pid, status, flags); + while (rc < 0 && errno == EINTR); + return rc; +} + +#endif /* __EMX__ */ Index: src/gcc/libiberty/config/mh-emx =================================================================== RCS file: src/gcc/libiberty/config/mh-emx diff -N src/gcc/libiberty/config/mh-emx --- nul 1 Jan 1970 00:00:00 -0000 +++ src/gcc/libiberty/config/mh-emx 4 May 2003 06:59:40 -0000 1.6 @@ -0,0 +1,13 @@ +# r=bird: why this here? Should be sufficient to do -s when linking. +#CFLAGS = -s -O2 +INSTALL = cp + +# Add the "s" flag to AR_FLAGS to add an archive index instead of RANLIB +AR_FLAGS = rcs + +# hack: Instead of ranlib run dllar which will make a shared library (dll) +# TODO: Don't use RANLIB because it f**ks up install. +# TODO: Pass the correct -g/-s flag without using non-standard stuff. +# bird: Forget this it breaks the install. We'll need a better hack. +# override RANLIB = kRx.exe dllar.cmd -cc '$(CC)' -d 'The GNU -liberty library' -o iberty -lgcc + Index: src/gcc/libjava/Makefile.am =================================================================== RCS file: /gccos2/src/gcc/libjava/Makefile.am,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -w -u -r1.1.1.2 -r1.3 Index: src/gcc/libjava/Makefile.in =================================================================== RCS file: /gccos2/src/gcc/libjava/Makefile.in,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -w -u -r1.1.1.2 -r1.3 Index: src/gcc/libjava/configure =================================================================== RCS file: /gccos2/src/gcc/libjava/configure,v retrieving revision 1.1.1.3 retrieving revision 1.6 diff -w -u -r1.1.1.3 -r1.6 --- src/gcc/libjava/configure 7 Sep 2004 02:34:11 -0000 1.1.1.3 +++ src/gcc/libjava/configure 8 Sep 2004 00:03:18 -0000 1.6 @@ -574,6 +574,157 @@ ac_n= ac_c='\c' ac_t= fi +echo $ac_n "checking for path separator""... $ac_c" 1>&6 +echo "configure:579: checking for path separator" >&5 +# Filter path to get backslahes into forwardslashes +case "`uname -s 2> /dev/null`" in +OS/2) + PATH=`echo -E "$PATH" | sed 's+\\\\+/+g'` + PATH_IFS=';' + ;; +*) + PATH_IFS=':' + ;; +esac +echo "$ac_t""${PATH_IFS}" 1>&6 + +echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 +echo "configure:593: checking for Cygwin environment" >&5 +if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cygwin=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cygwin=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_cygwin" 1>&6 +CYGWIN= +test "$ac_cv_cygwin" = yes && CYGWIN=yes +echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 +echo "configure:626: checking for mingw32 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_mingw32=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_mingw32=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_mingw32" 1>&6 +MINGW32= +test "$ac_cv_mingw32" = yes && MINGW32=yes +echo $ac_n "checking for EMX/OS2 environment""... $ac_c" 1>&6 +echo "configure:655: checking for EMX/OS2 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_emxos2'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + : ${CC=gcc.exe} +cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_emxos2=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_emxos2=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_emxos2" 1>&6 +if eval "test \"`echo '$''{'ac_cv_libpre'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$ac_cv_emxos2" = yes ; then + ac_cv_libpre= +else + ac_cv_libpre=lib +fi + +fi + +EMXOS2= +test "$ac_cv_emxos2" = yes && EMXOS2=yes + + + +echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 +echo "configure:699: checking for executable suffix" >&5 +if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then + ac_cv_exeext=.exe +else + rm -f conftest* + echo 'int main () { return 0; }' > conftest.$ac_ext + ac_cv_exeext= + if { (eval echo configure:709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + for file in conftest.*; do + case $file in + *.c | *.o | *.obj) ;; + *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; + esac + done + else + { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } + fi + rm -f conftest* + test x"${ac_cv_exeext}" = x && ac_cv_exeext=no +fi +fi + +EXEEXT="" +test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} +echo "$ac_t""${ac_cv_exeext}" 1>&6 +ac_exeext=$EXEEXT + # This works around the fact that libtool configuration may change LD @@ -583,7 +734,7 @@ ORIGINAL_LD_FOR_MULTILIBS=$LD echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:587: checking whether ln -s works" >&5 +echo "configure:738: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -593,8 +744,14 @@ rm -f conftestdata ac_cv_prog_LN_S="ln -s" else + echo A > conftestdata; + if ln conftestdata conftestdata2 2>/dev/null; then ac_cv_prog_LN_S=ln + else + ac_cv_prog_LN_S=cp + fi fi +rm -f conftestdata* fi LN_S="$ac_cv_prog_LN_S" if test "$ac_cv_prog_LN_S" = "ln -s"; then @@ -636,28 +793,30 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:640: checking for a BSD compatible install" >&5 +echo "configure:797: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="$PATH_IFS" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + # We reject the install program from OS/2 or W3.1 + */OS2|*/OS2/*|*/WINDOWS|*/WINDOWS/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. # Don't use installbsd from OSF since it installs stuff as root # by default. for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then + if test -f $ac_dir/$ac_prog$ac_exeext; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : else - ac_cv_path_install="$ac_dir/$ac_prog -c" + ac_cv_path_install="$ac_dir/$ac_prog$ac_exeext -c" break 2 fi fi @@ -689,7 +848,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:693: checking whether build environment is sane" >&5 +echo "configure:852: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -746,7 +905,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:750: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:909: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -778,68 +937,6 @@ ac_tool_prefix= fi -echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:783: checking for Cygwin environment" >&5 -if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cygwin=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_cygwin=no -fi -rm -f conftest* -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_cygwin" 1>&6 -CYGWIN= -test "$ac_cv_cygwin" = yes && CYGWIN=yes -echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:816: checking for mingw32 environment" >&5 -if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_mingw32=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_mingw32=no -fi -rm -f conftest* -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_mingw32" 1>&6 -MINGW32= -test "$ac_cv_mingw32" = yes && MINGW32=yes # Check whether --enable-multilib or --disable-multilib was given. if test "${enable_multilib+set}" = set; then @@ -951,7 +1048,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:955: checking host system type" >&5 +echo "configure:1052: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -972,7 +1069,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:976: checking target system type" >&5 +echo "configure:1073: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -990,7 +1087,7 @@ echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:994: checking build system type" >&5 +echo "configure:1091: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1019,18 +1116,19 @@ # 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:1023: checking for $ac_word" >&5 +echo "configure:1120: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_CC="gcc" break fi @@ -1049,20 +1147,22 @@ # 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:1053: checking for $ac_word" >&5 +echo "configure:1151: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_prog_rejected=no ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc" -o \ + "$ac_dir/$ac_word$ac_exeext" = "/usr/ucb/cc" ; then ac_prog_rejected=yes continue fi @@ -1100,18 +1200,19 @@ # 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:1104: checking for $ac_word" >&5 +echo "configure:1204: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_CC="cl" break fi @@ -1133,7 +1234,7 @@ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1137: checking whether we are using GNU C" >&5 +echo "configure:1238: 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 @@ -1142,7 +1243,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1146: \"$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:1247: \"$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 @@ -1161,7 +1262,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1165: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1266: 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 @@ -1210,18 +1311,19 @@ # 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:1214: checking for $ac_word" >&5 +echo "configure:1315: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_glibjava_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$glibjava_CXX"; then ac_cv_prog_glibjava_CXX="$glibjava_CXX" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_glibjava_CXX="$ac_prog" break fi @@ -1245,7 +1347,7 @@ test -z "$glibjava_CXX" && { echo "configure: error: no acceptable c++ found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1249: checking whether we are using GNU C++" >&5 +echo "configure:1351: 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 @@ -1254,7 +1356,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1258: \"$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:1360: \"$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 @@ -1269,7 +1371,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1273: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1375: 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 @@ -1318,7 +1420,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:1322: checking for working aclocal" >&5 +echo "configure:1424: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1331,7 +1433,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:1335: checking for working autoconf" >&5 +echo "configure:1437: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1344,7 +1446,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:1348: checking for working automake" >&5 +echo "configure:1450: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1357,7 +1459,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1361: checking for working autoheader" >&5 +echo "configure:1463: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1370,7 +1472,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1374: checking for working makeinfo" >&5 +echo "configure:1476: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1389,7 +1491,7 @@ # LIBGCJ_CONFIGURE, which doesn't work because that means that it will # be run before AC_CANONICAL_HOST. echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1393: checking build system type" >&5 +echo "configure:1495: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1410,18 +1512,19 @@ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1414: checking for $ac_word" >&5 +echo "configure:1516: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AS"; then ac_cv_prog_AS="$AS" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_AS="${ac_tool_prefix}as" break fi @@ -1442,18 +1545,19 @@ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1446: checking for $ac_word" >&5 +echo "configure:1549: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_AR="${ac_tool_prefix}ar" break fi @@ -1474,18 +1578,19 @@ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1478: checking for $ac_word" >&5 +echo "configure:1582: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" break fi @@ -1506,18 +1611,19 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1510: checking for $ac_word" >&5 +echo "configure:1615: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="ranlib" break fi @@ -1551,28 +1657,30 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1555: checking for a BSD compatible install" >&5 +echo "configure:1661: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="$PATH_IFS" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + # We reject the install program from OS/2 or W3.1 + */OS2|*/OS2/*|*/WINDOWS|*/WINDOWS/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. # Don't use installbsd from OSF since it installs stuff as root # by default. for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then + if test -f $ac_dir/$ac_prog$ac_exeext; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : else - ac_cv_path_install="$ac_dir/$ac_prog -c" + ac_cv_path_install="$ac_dir/$ac_prog$ac_exeext -c" break 2 fi fi @@ -1605,7 +1713,7 @@ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1609: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1717: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1630,18 +1738,19 @@ + echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1635: checking for executable suffix" >&5 +echo "configure:1744: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test "$CYGWIN" = yes || test "$MINGW32" = yes; then + if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then ac_cv_exeext=.exe else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1791,7 +1900,7 @@ if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1795: checking for ld used by GCC" >&5 +echo "configure:1904: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1821,10 +1930,10 @@ esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1825: checking for GNU ld" >&5 +echo "configure:1934: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1828: checking for non-GNU ld" >&5 +echo "configure:1937: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1859,7 +1968,7 @@ fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1863: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1972: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1876,7 +1985,7 @@ echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1880: checking for $LD option to reload object files" >&5 +echo "configure:1989: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1888,7 +1997,7 @@ test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1892: checking for BSD-compatible nm" >&5 +echo "configure:2001: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1926,7 +2035,7 @@ echo "$ac_t""$NM" 1>&6 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:1930: checking how to recognise dependant libraries" >&5 +echo "configure:2039: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2059,6 +2168,10 @@ lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; + osf3* | osf4* | osf5*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' @@ -2099,13 +2212,13 @@ deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2103: checking for object suffix" >&5 +echo "configure:2216: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2129,7 +2242,7 @@ file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2133: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2246: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2191,7 +2304,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2195: checking for file" >&5 +echo "configure:2308: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2262,18 +2375,19 @@ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2266: checking for $ac_word" >&5 +echo "configure:2379: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" break fi @@ -2294,18 +2408,19 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2298: checking for $ac_word" >&5 +echo "configure:2412: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="ranlib" break fi @@ -2329,18 +2444,19 @@ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2333: checking for $ac_word" >&5 +echo "configure:2448: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" break fi @@ -2361,18 +2477,19 @@ # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2365: checking for $ac_word" >&5 +echo "configure:2481: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_STRIP="strip" break fi @@ -2428,8 +2545,8 @@ case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2432 "configure"' > conftest.$ac_ext - if { (eval echo configure:2433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2549 "configure"' > conftest.$ac_ext + if { (eval echo configure:2550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) @@ -2462,7 +2579,7 @@ ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2466: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2583: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2478,7 +2595,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) case $host in @@ -2522,7 +2639,7 @@ SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2526: checking whether the C compiler needs -belf" >&5 +echo "configure:2643: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2535,14 +2652,14 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2572,7 +2689,7 @@ esac echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:2576: checking how to run the C++ preprocessor" >&5 +echo "configure:2693: 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 @@ -2585,12 +2702,13 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < +#line 2707 "configure" #include "confdefs.h" #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2712: \"$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 : @@ -2826,7 +2944,7 @@ echo $ac_n "checking for exception model to use""... $ac_c" 1>&6 -echo "configure:2830: checking for exception model to use" >&5 +echo "configure:2948: checking for exception model to use" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2841,7 +2959,7 @@ : else cat > conftest.$ac_ext << EOF -#line 2845 "configure" +#line 2963 "configure" struct S { ~S(); }; void bar(); void foo() @@ -2852,7 +2970,7 @@ EOF old_CXXFLAGS="$CXXFLAGS" CXXFLAGS=-S -if { (eval echo configure:2856: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if grep _Unwind_SjLj_Resume conftest.s >/dev/null 2>&1 ; then enable_sjlj_exceptions=yes elif grep _Unwind_Resume conftest.s >/dev/null 2>&1 ; then @@ -2962,7 +3080,7 @@ PLATFORMH=win32.h echo $ac_n "checking whether 'ld' is at least 2.13""... $ac_c" 1>&6 -echo "configure:2966: checking whether 'ld' is at least 2.13" >&5 +echo "configure:3084: checking whether 'ld' is at least 2.13" >&5 LD_PROG=`$CC --print-prog-name=ld` LD_VERSION=`$LD_PROG --version` LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 4` @@ -3006,7 +3124,7 @@ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:3010: checking how to run the C preprocessor" >&5 +echo "configure:3128: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -3021,13 +3139,14 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < +#line 3144 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3150: \"$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 : @@ -3038,13 +3157,14 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < +#line 3162 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3168: \"$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 : @@ -3055,13 +3175,14 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < +#line 3180 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3065: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3186: \"$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 : @@ -3086,7 +3207,7 @@ echo "$ac_t""$CPP" 1>&6 cat > conftest.$ac_ext < EOF @@ -3101,7 +3222,7 @@ rm -f conftest* cat > conftest.$ac_ext < EOF @@ -3116,7 +3237,7 @@ rm -f conftest* cat > conftest.$ac_ext < EOF @@ -3131,7 +3252,7 @@ rm -f conftest* cat > conftest.$ac_ext < EOF @@ -3148,7 +3269,7 @@ cat > conftest.$ac_ext < EOF @@ -3163,7 +3284,7 @@ rm -f conftest* cat > conftest.$ac_ext < EOF @@ -3215,7 +3336,7 @@ libsubdir=.libs echo $ac_n "checking for garbage collector to use""... $ac_c" 1>&6 -echo "configure:3219: checking for garbage collector to use" >&5 +echo "configure:3340: checking for garbage collector to use" >&5 # Check whether --enable-java-gc or --disable-java-gc was given. if test "${enable_java_gc+set}" = set; then enableval="$enable_java_gc" @@ -3268,7 +3389,7 @@ echo $ac_n "checking for thread model used by GCC""... $ac_c" 1>&6 -echo "configure:3272: checking for thread model used by GCC" >&5 +echo "configure:3393: checking for thread model used by GCC" >&5 THREADS=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'` echo "$ac_t""$THREADS" 1>&6 @@ -3476,12 +3597,12 @@ for ac_func in strerror ioctl select fstat open fsync sleep opendir do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3480: checking for $ac_func" >&5 +echo "configure:3601: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3531,12 +3652,12 @@ for ac_func in gmtime_r localtime_r readdir_r getpwuid_r getcwd do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3535: checking for $ac_func" >&5 +echo "configure:3656: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3586,12 +3707,12 @@ for ac_func in access stat mkdir rename rmdir unlink realpath utime chmod do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3590: checking for $ac_func" >&5 +echo "configure:3711: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3641,12 +3762,12 @@ for ac_func in nl_langinfo setlocale do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3645: checking for $ac_func" >&5 +echo "configure:3766: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3696,12 +3817,12 @@ for ac_func in inet_aton inet_addr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3700: checking for $ac_func" >&5 +echo "configure:3821: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3751,12 +3872,12 @@ for ac_func in inet_pton uname inet_ntoa do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3755: checking for $ac_func" >&5 +echo "configure:3876: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3806,12 +3927,12 @@ for ac_func in fork execvp pipe sigaction ftruncate do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3810: checking for $ac_func" >&5 +echo "configure:3931: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3862,17 +3983,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3866: checking for $ac_hdr" >&5 +echo "configure:3987: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 3993 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3998: \"$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* @@ -3899,12 +4021,12 @@ done echo $ac_n "checking for backtrace""... $ac_c" 1>&6 -echo "configure:3903: checking for backtrace" >&5 +echo "configure:4025: checking for backtrace" >&5 if eval "test \"`echo '$''{'ac_cv_func_backtrace'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_backtrace=yes" else @@ -3971,7 +4093,7 @@ echo $ac_n "checking for dladdr in -ldl""... $ac_c" 1>&6 -echo "configure:3975: checking for dladdr in -ldl" >&5 +echo "configure:4097: checking for dladdr in -ldl" >&5 ac_lib_var=`echo dl'_'dladdr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3979,7 +4101,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4116: \"$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 @@ -4020,7 +4142,7 @@ ac_safe=`echo "$ac_file" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_file""... $ac_c" 1>&6 -echo "configure:4024: checking for $ac_file" >&5 +echo "configure:4146: checking for $ac_file" >&5 if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4078,7 +4200,7 @@ echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:4082: checking for iconv" >&5 +echo "configure:4204: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4086,7 +4208,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext < #include @@ -4096,7 +4218,7 @@ iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:4100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -4108,7 +4230,7 @@ am_save_LIBS="$LIBS" LIBS="$LIBS $am_cv_libiconv_ldpath -liconv" cat > conftest.$ac_ext < #include @@ -4118,7 +4240,7 @@ iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:4122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_lib_iconv=yes am_cv_func_iconv=yes @@ -4139,13 +4261,13 @@ EOF echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:4143: checking for iconv declaration" >&5 +echo "configure:4265: checking for iconv declaration" >&5 if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -4164,7 +4286,7 @@ ; return 0; } EOF -if { (eval echo configure:4168: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_arg1="" else @@ -4193,19 +4315,19 @@ if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:4197: checking for LC_MESSAGES" >&5 +echo "configure:4319: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:4209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -4226,12 +4348,12 @@ fi fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:4230: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:4352: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4239,7 +4361,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:4243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -4260,12 +4382,12 @@ fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:4264: checking for tm_zone in struct tm" >&5 +echo "configure:4386: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> @@ -4273,7 +4395,7 @@ struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:4277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -4293,12 +4415,12 @@ else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:4297: checking for tzname" >&5 +echo "configure:4419: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifndef tzname /* For SGI. */ @@ -4308,7 +4430,7 @@ atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:4312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -4333,12 +4455,12 @@ for ac_func in gethostbyname_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4337: checking for $ac_func" >&5 +echo "configure:4459: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4388,7 +4510,7 @@ # We look for the one that returns `int'. # Hopefully this check is robust enough. cat > conftest.$ac_ext < EOF @@ -4408,7 +4530,7 @@ *" -D_REENTRANT "*) ;; *) echo $ac_n "checking whether gethostbyname_r declaration requires -D_REENTRANT""... $ac_c" 1>&6 -echo "configure:4412: checking whether gethostbyname_r declaration requires -D_REENTRANT" >&5 +echo "configure:4534: checking whether gethostbyname_r declaration requires -D_REENTRANT" >&5 if eval "test \"`echo '$''{'libjava_cv_gethostbyname_r_needs_reentrant'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4421,14 +4543,14 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < int main() { gethostbyname_r("", 0, 0); ; return 0; } EOF -if { (eval echo configure:4432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libjava_cv_gethostbyname_r_needs_reentrant=no else @@ -4438,14 +4560,14 @@ CPPFLAGS_SAVE="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_REENTRANT" cat > conftest.$ac_ext < int main() { gethostbyname_r("", 0, 0); ; return 0; } EOF -if { (eval echo configure:4449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libjava_cv_gethostbyname_r_needs_reentrant=yes else @@ -4480,12 +4602,12 @@ esac echo $ac_n "checking for struct hostent_data""... $ac_c" 1>&6 -echo "configure:4484: checking for struct hostent_data" >&5 +echo "configure:4606: checking for struct hostent_data" >&5 if eval "test \"`echo '$''{'libjava_cv_struct_hostent_data'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libjava_cv_struct_hostent_data=yes else @@ -4528,7 +4650,7 @@ # to exist where expected. (The root issue: AC_CHECK_FUNCS assumes C # linkage check is enough, yet C++ code requires proper prototypes.) cat > conftest.$ac_ext < EOF @@ -4539,12 +4661,12 @@ for ac_func in gethostbyaddr_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4543: checking for $ac_func" >&5 +echo "configure:4665: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4594,7 +4716,7 @@ # We look for the one that returns `int'. # Hopefully this check is robust enough. cat > conftest.$ac_ext < EOF @@ -4621,12 +4743,12 @@ for ac_func in gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4625: checking for $ac_func" >&5 +echo "configure:4747: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4673,7 +4795,7 @@ EOF cat > conftest.$ac_ext < EOF @@ -4704,12 +4826,12 @@ for ac_func in pthread_mutexattr_settype pthread_mutexattr_setkind_np do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4708: checking for $ac_func" >&5 +echo "configure:4830: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4762,12 +4884,12 @@ for ac_func in sched_yield do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4766: checking for $ac_func" >&5 +echo "configure:4888: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4812,7 +4934,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sched_yield in -lrt""... $ac_c" 1>&6 -echo "configure:4816: checking for sched_yield in -lrt" >&5 +echo "configure:4938: checking for sched_yield in -lrt" >&5 ac_lib_var=`echo rt'_'sched_yield | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4820,7 +4942,7 @@ ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4957: \"$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 @@ -4857,7 +4979,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6 -echo "configure:4861: checking for sched_yield in -lposix4" >&5 +echo "configure:4983: checking for sched_yield in -lposix4" >&5 ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4865,7 +4987,7 @@ ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5002: \"$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 @@ -4912,7 +5034,7 @@ # We can save a little space at runtime if the mutex has m_count # or __m_count. This is a nice hack for Linux. cat > conftest.$ac_ext < int main() { @@ -4921,7 +5043,7 @@ ; return 0; } EOF -if { (eval echo configure:4925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5047: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define PTHREAD_MUTEX_HAVE_M_COUNT 1 @@ -4933,7 +5055,7 @@ rm -rf conftest* cat > conftest.$ac_ext < int main() { @@ -4942,7 +5064,7 @@ ; return 0; } EOF -if { (eval echo configure:4946: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define PTHREAD_MUTEX_HAVE___M_COUNT 1 @@ -4962,12 +5084,12 @@ for ac_func in gettimeofday time ftime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4966: checking for $ac_func" >&5 +echo "configure:5088: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5021,12 +5143,12 @@ for ac_func in memmove do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5025: checking for $ac_func" >&5 +echo "configure:5147: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5079,12 +5201,12 @@ for ac_func in memcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5083: checking for $ac_func" >&5 +echo "configure:5205: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5136,7 +5258,7 @@ fi echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:5140: checking for dlopen in -ldl" >&5 +echo "configure:5262: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5144,7 +5266,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5281: \"$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 @@ -5200,7 +5322,7 @@ #-------------------------------------------------------------------- echo $ac_n "checking for socket libraries""... $ac_c" 1>&6 -echo "configure:5204: checking for socket libraries" >&5 +echo "configure:5326: checking for socket libraries" >&5 if eval "test \"`echo '$''{'gcj_cv_lib_sockets'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5208,12 +5330,12 @@ gcj_checkBoth=0 unset ac_cv_func_connect echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:5212: checking for connect" >&5 +echo "configure:5334: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5362: \"$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 @@ -5259,7 +5381,7 @@ if test "$gcj_checkSocket" = 1; then unset ac_cv_func_connect echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:5263: checking for main in -lsocket" >&5 +echo "configure:5385: checking for main in -lsocket" >&5 ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5267,14 +5389,14 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5400: \"$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 @@ -5301,12 +5423,12 @@ LIBS="$LIBS -lsocket -lnsl" unset ac_cv_func_accept echo $ac_n "checking for accept""... $ac_c" 1>&6 -echo "configure:5305: checking for accept" >&5 +echo "configure:5427: checking for accept" >&5 if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_accept=yes" else @@ -5356,12 +5478,12 @@ gcj_oldLibs=$LIBS LIBS="$LIBS $gcj_cv_lib_sockets" echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:5360: checking for gethostbyname" >&5 +echo "configure:5482: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5510: \"$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 @@ -5402,7 +5524,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:5406: checking for main in -lnsl" >&5 +echo "configure:5528: checking for main in -lnsl" >&5 ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5410,14 +5532,14 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5543: \"$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 @@ -5449,7 +5571,7 @@ if test "$with_system_zlib" = yes; then echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 -echo "configure:5453: checking for deflate in -lz" >&5 +echo "configure:5575: checking for deflate in -lz" >&5 ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5457,7 +5579,7 @@ ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5594: \"$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 @@ -5495,7 +5617,7 @@ # requires -ldl. if test "$GC" = boehm; then echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6 -echo "configure:5499: checking for main in -ldl" >&5 +echo "configure:5621: checking for main in -ldl" >&5 ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5503,14 +5625,14 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5636: \"$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 @@ -5576,18 +5698,19 @@ # Extract the first word of "${ac_tool_prefix}gcj", so it can be a program name with args. set dummy ${ac_tool_prefix}gcj; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5580: checking for $ac_word" >&5 +echo "configure:5702: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_GCJ'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$GCJ"; then ac_cv_prog_GCJ="$GCJ" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_GCJ="${ac_tool_prefix}gcj" break fi @@ -5608,18 +5731,19 @@ # Extract the first word of "gcj", so it can be a program name with args. set dummy gcj; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5612: checking for $ac_word" >&5 +echo "configure:5735: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_GCJ'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$GCJ"; then ac_cv_prog_GCJ="$GCJ" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_GCJ="gcj" break fi @@ -5670,13 +5794,13 @@ CPPFLAGS=$GCJ_SAVE_CPPFLAGS echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:5674: checking size of void *" >&5 +echo "configure:5798: checking size of void *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_void_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 12 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -5686,7 +5810,7 @@ switch (0) case 0: case (sizeof (void *) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:5690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5814: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_void_p=$ac_size else @@ -5792,18 +5916,18 @@ echo $ac_n "checking for g++ -ffloat-store bug""... $ac_c" 1>&6 -echo "configure:5796: checking for g++ -ffloat-store bug" >&5 +echo "configure:5920: checking for g++ -ffloat-store bug" >&5 save_CFLAGS="$CFLAGS" CFLAGS="-x c++ -O2 -ffloat-store" cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:5807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5931: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -5823,17 +5947,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5827: checking for $ac_hdr" >&5 +echo "configure:5951: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 5957 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5962: \"$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* @@ -5863,17 +5988,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5867: checking for $ac_hdr" >&5 +echo "configure:5992: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 5998 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5877: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6003: \"$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* @@ -5903,17 +6029,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5907: checking for $ac_hdr" >&5 +echo "configure:6033: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 6039 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6044: \"$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* @@ -5949,12 +6076,12 @@ done echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:5953: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:6080: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5970,7 +6097,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:5974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -5992,12 +6119,13 @@ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:5996: checking for ANSI C header files" >&5 +echo "configure:6123: 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 < +#line 6129 "configure" #include "confdefs.h" #include #include @@ -6005,7 +6133,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6009: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6137: \"$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* @@ -6022,7 +6150,7 @@ 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 @@ -6040,7 +6168,7 @@ 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 @@ -6061,7 +6189,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -6072,7 +6200,7 @@ exit (0); } EOF -if { (eval echo configure:6076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -6096,12 +6224,12 @@ fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:6100: checking for ssize_t" >&5 +echo "configure:6228: checking for ssize_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6130,9 +6258,9 @@ echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6 -echo "configure:6134: checking for in_addr_t" >&5 +echo "configure:6262: checking for in_addr_t" >&5 cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6146,7 +6274,7 @@ in_addr_t foo; ; return 0; } EOF -if { (eval echo configure:6150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6278: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_IN_ADDR_T 1 @@ -6162,16 +6290,16 @@ rm -f conftest* echo $ac_n "checking whether struct ip_mreq is in netinet/in.h""... $ac_c" 1>&6 -echo "configure:6166: checking whether struct ip_mreq is in netinet/in.h" >&5 +echo "configure:6294: checking whether struct ip_mreq is in netinet/in.h" >&5 cat > conftest.$ac_ext < int main() { struct ip_mreq mreq; ; return 0; } EOF -if { (eval echo configure:6175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6303: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STRUCT_IP_MREQ 1 @@ -6187,16 +6315,16 @@ rm -f conftest* echo $ac_n "checking whether struct ipv6_mreq is in netinet/in.h""... $ac_c" 1>&6 -echo "configure:6191: checking whether struct ipv6_mreq is in netinet/in.h" >&5 +echo "configure:6319: checking whether struct ipv6_mreq is in netinet/in.h" >&5 cat > conftest.$ac_ext < int main() { struct ipv6_mreq mreq6; ; return 0; } EOF -if { (eval echo configure:6200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STRUCT_IPV6_MREQ 1 @@ -6212,16 +6340,16 @@ rm -f conftest* echo $ac_n "checking whether struct sockaddr_in6 is in netinet/in.h""... $ac_c" 1>&6 -echo "configure:6216: checking whether struct sockaddr_in6 is in netinet/in.h" >&5 +echo "configure:6344: checking whether struct sockaddr_in6 is in netinet/in.h" >&5 cat > conftest.$ac_ext < int main() { struct sockaddr_in6 addr6; ; return 0; } EOF -if { (eval echo configure:6225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_INET6 1 @@ -6237,9 +6365,9 @@ rm -f conftest* echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6 -echo "configure:6241: checking for socklen_t in sys/socket.h" >&5 +echo "configure:6369: checking for socklen_t in sys/socket.h" >&5 cat > conftest.$ac_ext < @@ -6248,7 +6376,7 @@ socklen_t x = 5; ; return 0; } EOF -if { (eval echo configure:6252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_SOCKLEN_T 1 @@ -6264,16 +6392,16 @@ rm -f conftest* echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:6268: checking for tm_gmtoff in struct tm" >&5 +echo "configure:6396: checking for tm_gmtoff in struct tm" >&5 cat > conftest.$ac_ext < int main() { struct tm tim; tim.tm_gmtoff = 0; ; return 0; } EOF -if { (eval echo configure:6277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define STRUCT_TM_HAS_GMTOFF 1 @@ -6286,16 +6414,16 @@ rm -rf conftest* echo "$ac_t""no" 1>&6 echo $ac_n "checking for global timezone variable""... $ac_c" 1>&6 -echo "configure:6290: checking for global timezone variable" >&5 +echo "configure:6418: checking for global timezone variable" >&5 cat > conftest.$ac_ext < int main() { void i(){long z2 = 2*timezone;} ; return 0; } EOF -if { (eval echo configure:6299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6427: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TIMEZONE 1 @@ -6308,16 +6436,16 @@ rm -rf conftest* echo "$ac_t""no" 1>&6 echo $ac_n "checking for global _timezone variable""... $ac_c" 1>&6 -echo "configure:6312: checking for global _timezone variable" >&5 +echo "configure:6440: checking for global _timezone variable" >&5 cat > conftest.$ac_ext < int main() { long z2 = _timezone; ; return 0; } EOF -if { (eval echo configure:6321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_UNDERSCORE_TIMEZONE 1 @@ -6339,19 +6467,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:6343: checking for working alloca.h" >&5 +echo "configure:6471: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:6355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -6372,12 +6500,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:6376: checking for alloca" >&5 +echo "configure:6504: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -6437,12 +6565,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:6441: checking whether alloca needs Cray hooks" >&5 +echo "configure:6569: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:6471: checking for $ac_func" >&5 +echo "configure:6599: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6522,7 +6650,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:6526: checking stack direction for C alloca" >&5 +echo "configure:6654: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6530,7 +6658,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -6576,18 +6704,19 @@ # 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:6580: checking for $ac_word" >&5 +echo "configure:6708: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$PERL"; then ac_cv_prog_PERL="$PERL" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_PERL="$ac_prog" break fi @@ -6675,7 +6804,7 @@ # 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:6679: checking for X" >&5 +echo "configure:6808: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -6703,15 +6832,15 @@ # Make sure to not put "make" in the Imakefile rules, since we grep it out. cat > Imakefile <<'EOF' acfindx: - @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' + @sh -c 'echo \'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${DESTDIR}${USRLIBDIR}"; ac_im_libdir="${DESTDIR}${LIBDIR}"\'' EOF if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then # GNU make sometimes prints "make[1]: Entering...", which would confuse us. eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. for ac_extension in a so sl; do - if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then + if test ! -f $ac_im_usrlibdir/${ac_cv_libpre}X11.$ac_extension && + test -f $ac_im_libdir/${ac_cv_libpre}X11.$ac_extension; then ac_im_usrlibdir=$ac_im_libdir; break fi done @@ -6737,12 +6866,13 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext < +#line 6871 "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:6746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6876: \"$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* @@ -6811,14 +6941,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6952: \"$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. @@ -6868,7 +6998,7 @@ ; \ do for ac_extension in a so sl; do - if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then + if test -r $ac_dir/${ac_cv_libpre}${x_direct_test_library}.$ac_extension; then ac_x_libraries=$ac_dir break 2 fi @@ -6915,6 +7045,7 @@ if test -n "$x_includes"; then X_CFLAGS="$X_CFLAGS -I$x_includes" fi + test -n "$x_includes" && CPPFLAGS="$CPPFLAGS -I$x_includes" # It would also be nice to do this for all -L options, not just this one. if test -n "$x_libraries"; then @@ -6924,17 +7055,17 @@ 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:6928: checking whether -R must be followed by a space" >&5 +echo "configure:7059: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -6950,14 +7081,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -6989,7 +7120,7 @@ # 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:6993: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:7124: 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 @@ -6997,7 +7128,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7143: \"$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 @@ -7030,7 +7161,7 @@ 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:7034: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:7165: 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 @@ -7038,7 +7169,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7184: \"$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 @@ -7078,12 +7209,12 @@ # 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:7082: checking for gethostbyname" >&5 +echo "configure:7213: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7241: \"$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 @@ -7127,7 +7258,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:7131: checking for gethostbyname in -lnsl" >&5 +echo "configure:7262: 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 @@ -7135,7 +7266,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7281: \"$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 @@ -7176,12 +7307,12 @@ # -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:7180: checking for connect" >&5 +echo "configure:7311: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7339: \"$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 @@ -7225,7 +7356,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:7229: checking for connect in -lsocket" >&5 +echo "configure:7360: 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 @@ -7233,7 +7364,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7379: \"$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 @@ -7268,12 +7399,12 @@ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:7272: checking for remove" >&5 +echo "configure:7403: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7431: \"$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 @@ -7317,7 +7448,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:7321: checking for remove in -lposix" >&5 +echo "configure:7452: 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 @@ -7325,7 +7456,7 @@ ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7471: \"$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 @@ -7360,12 +7491,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:7364: checking for shmat" >&5 +echo "configure:7495: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7523: \"$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 @@ -7409,7 +7540,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:7413: checking for shmat in -lipc" >&5 +echo "configure:7544: 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 @@ -7417,7 +7548,7 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7563: \"$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 @@ -7449,6 +7580,49 @@ fi fi + # XFree86/OS2 + if test $ac_cv_func_shmat = no; then + echo $ac_n "checking for shmat in -lshm""... $ac_c" 1>&6 +echo "configure:7587: checking for shmat in -lshm" >&5 +ac_lib_var=`echo shm'_'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 +else + ac_save_LIBS="$LIBS" +LIBS="-lshm $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lshm" +else + echo "$ac_t""no" 1>&6 +fi + + fi fi # Check for libraries that X11R6 Xt/Xaw programs need. @@ -7461,7 +7635,7 @@ # 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:7465: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:7639: 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 @@ -7469,7 +7643,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7658: \"$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 @@ -7641,6 +7815,9 @@ # Generated automatically by configure. # Run this file to recreate the current configuration. # This directory was configured as follows, +EOF +echo ': ${CONFIG_SHELL='"${CONFIG_SHELL-/bin/sh}"'}' >> $CONFIG_STATUS +cat >> $CONFIG_STATUS </dev/null | sed 1q`: # # $0 $ac_configure_args @@ -7666,6 +7843,7 @@ ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" +PATHIFS="$PATH_IFS" trap 'rm -fr `echo "Makefile libgcj.spec libgcj-test.spec gnu/classpath/Configuration.java gcj/Makefile include/Makefile testsuite/Makefile include/config.h gcj/libgcj-config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF @@ -7676,6 +7854,7 @@ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub +s,\([^a-zA-Z0-9:]\)/bin/sh\(.exe\),\1${CONFIG_SHELL-/bin/sh}\2,g s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g @@ -7699,6 +7878,8 @@ s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g +s%@PATH_IFS@%$PATH_IFS%g +s%@EXEEXT@%$EXEEXT%g s%@LN_S@%$LN_S%g s%@libgcj_basedir@%$libgcj_basedir%g s%@mkinstalldirs@%$mkinstalldirs%g @@ -7737,7 +7918,6 @@ s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g s%@MAINT@%$MAINT%g -s%@EXEEXT@%$EXEEXT%g s%@LIBGCJ_CFLAGS@%$LIBGCJ_CFLAGS%g s%@LIBGCJ_CXXFLAGS@%$LIBGCJ_CXXFLAGS%g s%@LIBGCJ_JAVAFLAGS@%$LIBGCJ_JAVAFLAGS%g @@ -7886,14 +8066,15 @@ .) srcdir=. if test -z "$ac_dots"; then top_srcdir=. else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + [/\\]* | [a-zA-Z]:*) + srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; *) # Relative path. srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" top_srcdir="$ac_dots$ac_given_srcdir" ;; esac case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; + [/$\\]* | [A-Za-z]:*) INSTALL="$ac_given_INSTALL" ;; *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac @@ -7906,7 +8087,7 @@ *) ac_comsub= ;; esac - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%$PATHIFS% $ac_given_srcdir/%g"` sed -e "$ac_comsub s%@configure_input@%$configure_input%g s%@srcdir@%$srcdir%g @@ -7953,7 +8134,9 @@ echo creating $ac_file rm -f conftest.frag conftest.in conftest.out - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` +# kso the other way around might work better with drive letters and such. +# ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + ac_file_inputs=`echo $ac_file_in|sed -e "s%:% $ac_given_srcdir/%g" -e "s%^%$ac_given_srcdir/%" ` cat $ac_file_inputs > conftest.in EOF @@ -8057,13 +8240,14 @@ fi case "$srcdir" in - [/$]*) ac_rel_source="$srcdir/$ac_source" ;; + [/$\\]* | [A-Za-z]:*) ac_rel_source="$srcdir/$ac_source" ;; *) ac_rel_source="$ac_dots$srcdir/$ac_source" ;; esac # Make a symlink if possible; otherwise try a hard link. if ln -s $ac_rel_source $ac_dest 2>/dev/null || - ln $srcdir/$ac_source $ac_dest; then : + ln $srcdir/$ac_source $ac_dest 2>/dev/null || + cp $srcdir/$ac_source $ac_dest; then : else { echo "configure: error: can not link $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; } fi @@ -8182,7 +8366,7 @@ case "$srcdir" in .) # No --srcdir option. We are building in place. ac_sub_srcdir=$srcdir ;; - /*) # Absolute path. + [/\\]* | [a-zA-Z]:*) # Absolute path. ac_sub_srcdir=$srcdir/$ac_config_dir ;; *) # Relative path. ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;; @@ -8192,7 +8376,11 @@ if test -f $ac_sub_srcdir/configure; then ac_sub_configure=$ac_sub_srcdir/configure elif test -f $ac_sub_srcdir/configure.in; then - ac_sub_configure=$ac_configure + ac_current_dir=`pwd` + cd $ac_sub_srcdir + autoconf + cd $ac_current_dir + ac_sub_configure=$ac_sub_srcdir/configure else echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2 ac_sub_configure= @@ -8203,12 +8391,12 @@ # Make the cache file name correct relative to the subdirectory. case "$cache_file" in - /*) ac_sub_cache_file=$cache_file ;; + [/\\]* | [a-zA-Z]:*) ac_sub_cache_file=$cache_file ;; *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; + [/$\\]* | [A-Za-z]:*) INSTALL="$ac_given_INSTALL" ;; *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac Index: src/gcc/libjava/libltdl/configure =================================================================== RCS file: /gccos2/src/gcc/libjava/libltdl/configure,v retrieving revision 1.1.1.1 retrieving revision 1.4 diff -w -u -r1.1.1.1 -r1.4 --- src/gcc/libjava/libltdl/configure 16 Apr 2003 10:11:14 -0000 1.1.1.1 +++ src/gcc/libjava/libltdl/configure 30 Jan 2004 21:32:09 -0000 1.4 @@ -49,7 +49,6 @@ program_transform_name=s,x,x, silent= site= -sitefile= srcdir= target=NONE verbose= @@ -164,7 +163,6 @@ --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages - --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -335,11 +333,6 @@ -site=* | --site=* | --sit=*) site="$ac_optarg" ;; - -site-file | --site-file | --site-fil | --site-fi | --site-f) - ac_prev=sitefile ;; - -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) - sitefile="$ac_optarg" ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -505,7 +498,6 @@ srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -if test -z "$sitefile"; then if test -z "$CONFIG_SITE"; then if test "x$prefix" != xNONE; then CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" @@ -513,9 +505,6 @@ CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi fi -else - CONFIG_SITE="$sitefile" -fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then echo "loading site script $ac_site_file" @@ -552,13 +541,27 @@ ac_n= ac_c='\c' ac_t= fi +echo $ac_n "checking for path separator""... $ac_c" 1>&6 +echo "configure:546: checking for path separator" >&5 +# Filter path to get backslahes into forwardslashes +case "`uname -s 2> /dev/null`" in +OS/2) + PATH=`echo -E "$PATH" | sed 's+\\\\+/+g'` + PATH_IFS=';' + ;; +*) + PATH_IFS=':' + ;; +esac +echo "$ac_t""${PATH_IFS}" 1>&6 + echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:557: checking for Cygwin environment" >&5 +echo "configure:560: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:576: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -586,19 +589,19 @@ CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:590: checking for mingw32 environment" >&5 +echo "configure:593: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -614,6 +617,81 @@ echo "$ac_t""$ac_cv_mingw32" 1>&6 MINGW32= test "$ac_cv_mingw32" = yes && MINGW32=yes +echo $ac_n "checking for EMX/OS2 environment""... $ac_c" 1>&6 +echo "configure:622: checking for EMX/OS2 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_emxos2'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + : ${CC=gcc.exe} +cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_emxos2=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_emxos2=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_emxos2" 1>&6 +if eval "test \"`echo '$''{'ac_cv_libpre'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$ac_cv_emxos2" = yes ; then + ac_cv_libpre= +else + ac_cv_libpre=lib +fi + +fi + +EMXOS2= +test "$ac_cv_emxos2" = yes && EMXOS2=yes + + + +echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 +echo "configure:666: checking for executable suffix" >&5 +if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then + ac_cv_exeext=.exe +else + rm -f conftest* + echo 'int main () { return 0; }' > conftest.$ac_ext + ac_cv_exeext= + if { (eval echo configure:676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + for file in conftest.*; do + case $file in + *.c | *.o | *.obj) ;; + *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; + esac + done + else + { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } + fi + rm -f conftest* + test x"${ac_cv_exeext}" = x && ac_cv_exeext=no +fi +fi + +EXEEXT="" +test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} +echo "$ac_t""${ac_cv_exeext}" 1>&6 +ac_exeext=$EXEEXT + # Check whether --with-auxdir or --without-auxdir was given. @@ -690,28 +768,30 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:694: checking for a BSD compatible install" >&5 +echo "configure:772: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="$PATH_IFS" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + # We reject the install program from OS/2 or W3.1 + */OS2|*/OS2/*|*/WINDOWS|*/WINDOWS/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. # Don't use installbsd from OSF since it installs stuff as root # by default. for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then + if test -f $ac_dir/$ac_prog$ac_exeext; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : else - ac_cv_path_install="$ac_dir/$ac_prog -c" + ac_cv_path_install="$ac_dir/$ac_prog$ac_exeext -c" break 2 fi fi @@ -743,7 +823,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:747: checking whether build environment is sane" >&5 +echo "configure:827: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -800,7 +880,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:804: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:884: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -839,7 +919,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:843: checking for working aclocal" >&5 +echo "configure:923: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -852,7 +932,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:856: checking for working autoconf" >&5 +echo "configure:936: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -865,7 +945,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:869: checking for working automake" >&5 +echo "configure:949: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -878,7 +958,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:882: checking for working autoheader" >&5 +echo "configure:962: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -891,7 +971,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:895: checking for working makeinfo" >&5 +echo "configure:975: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -908,7 +988,7 @@ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:912: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:992: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -934,18 +1014,19 @@ # 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:938: checking for $ac_word" >&5 +echo "configure:1018: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_CC="gcc" break fi @@ -964,20 +1045,22 @@ # 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:968: checking for $ac_word" >&5 +echo "configure:1049: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_prog_rejected=no ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc" -o \ + "$ac_dir/$ac_word$ac_exeext" = "/usr/ucb/cc" ; then ac_prog_rejected=yes continue fi @@ -1015,18 +1098,19 @@ # 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:1019: checking for $ac_word" >&5 +echo "configure:1102: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_CC="cl" break fi @@ -1047,7 +1131,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1051: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1135: 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. @@ -1058,12 +1142,12 @@ cat > conftest.$ac_ext << EOF -#line 1062 "configure" +#line 1146 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1151: \"$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 @@ -1089,12 +1173,12 @@ { 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:1093: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1177: 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:1098: checking whether we are using GNU C" >&5 +echo "configure:1182: 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 @@ -1103,7 +1187,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1107: \"$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:1191: \"$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 @@ -1122,7 +1206,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1126: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1210: 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 @@ -1154,12 +1238,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1158: checking for working const" >&5 +echo "configure:1242: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1229,21 +1313,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1233: checking for inline" >&5 +echo "configure:1317: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1346,7 +1430,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1350: checking host system type" >&5 +echo "configure:1434: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1367,7 +1451,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1371: checking build system type" >&5 +echo "configure:1455: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1396,7 +1480,7 @@ if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1400: checking for ld used by GCC" >&5 +echo "configure:1484: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1426,10 +1510,10 @@ esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1430: checking for GNU ld" >&5 +echo "configure:1514: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1433: checking for non-GNU ld" >&5 +echo "configure:1517: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1464,7 +1548,7 @@ fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1468: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1552: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1481,7 +1565,7 @@ echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1485: checking for $LD option to reload object files" >&5 +echo "configure:1569: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1493,7 +1577,7 @@ test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1497: checking for BSD-compatible nm" >&5 +echo "configure:1581: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1531,7 +1615,7 @@ echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1535: checking whether ln -s works" >&5 +echo "configure:1619: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1541,9 +1625,15 @@ rm -f conftestdata ac_cv_prog_LN_S="ln -s" else + echo A > conftestdata; + if ln conftestdata conftestdata2 2>/dev/null; then ac_cv_prog_LN_S=ln + else + ac_cv_prog_LN_S=cp fi fi +rm -f conftestdata* +fi LN_S="$ac_cv_prog_LN_S" if test "$ac_cv_prog_LN_S" = "ln -s"; then echo "$ac_t""yes" 1>&6 @@ -1552,7 +1642,7 @@ fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:1556: checking how to recognise dependant libraries" >&5 +echo "configure:1646: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1695,13 +1785,13 @@ deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1699: checking for object suffix" >&5 +echo "configure:1789: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:1705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -1718,39 +1808,6 @@ OBJEXT=$ac_cv_objext ac_objext=$ac_cv_objext - - -echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1725: checking for executable suffix" >&5 -if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$CYGWIN" = yes || test "$MINGW32" = yes; then - ac_cv_exeext=.exe -else - rm -f conftest* - echo 'int main () { return 0; }' > conftest.$ac_ext - ac_cv_exeext= - if { (eval echo configure:1735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then - for file in conftest.*; do - case $file in - *.c | *.o | *.obj | *.ilk | *.pdb) ;; - *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; - esac - done - else - { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } - fi - rm -f conftest* - test x"${ac_cv_exeext}" = x && ac_cv_exeext=no -fi -fi - -EXEEXT="" -test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} -echo "$ac_t""${ac_cv_exeext}" 1>&6 -ac_exeext=$EXEEXT - if test $host != $build; then ac_tool_prefix=${host_alias}- else @@ -1764,7 +1821,7 @@ file_magic*) if test "$file_magic_cmd" = '${MAGIC}'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:1768: checking for ${ac_tool_prefix}file" >&5 +echo "configure:1825: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1826,7 +1883,7 @@ if test -z "$lt_cv_path_MAGIC"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:1830: checking for file" >&5 +echo "configure:1887: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1897,18 +1954,19 @@ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1901: checking for $ac_word" >&5 +echo "configure:1958: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" break fi @@ -1929,18 +1987,19 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1933: checking for $ac_word" >&5 +echo "configure:1991: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="ranlib" break fi @@ -1964,18 +2023,19 @@ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1968: checking for $ac_word" >&5 +echo "configure:2027: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" break fi @@ -1996,18 +2056,19 @@ # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2000: checking for $ac_word" >&5 +echo "configure:2060: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_STRIP="strip" break fi @@ -2063,8 +2124,8 @@ case "$host" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2067 "configure"' > conftest.$ac_ext - if { (eval echo configure:2068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2128 "configure"' > conftest.$ac_ext + if { (eval echo configure:2129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -2085,7 +2146,7 @@ SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2089: checking whether the C compiler needs -belf" >&5 +echo "configure:2150: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2098,14 +2159,14 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2135,18 +2196,19 @@ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2139: checking for $ac_word" >&5 +echo "configure:2200: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$DLLTOOL"; then ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" break fi @@ -2167,18 +2229,19 @@ # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2171: checking for $ac_word" >&5 +echo "configure:2233: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$DLLTOOL"; then ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_DLLTOOL="dlltool" break fi @@ -2202,18 +2265,19 @@ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2206: checking for $ac_word" >&5 +echo "configure:2269: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AS"; then ac_cv_prog_AS="$AS" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_AS="${ac_tool_prefix}as" break fi @@ -2234,18 +2298,19 @@ # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2238: checking for $ac_word" >&5 +echo "configure:2302: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AS"; then ac_cv_prog_AS="$AS" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_AS="as" break fi @@ -2269,18 +2334,19 @@ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2273: checking for $ac_word" >&5 +echo "configure:2338: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$OBJDUMP"; then ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" break fi @@ -2301,18 +2367,19 @@ # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2305: checking for $ac_word" >&5 +echo "configure:2371: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$OBJDUMP"; then ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_OBJDUMP="objdump" break fi @@ -2337,12 +2404,12 @@ # recent cygwin and mingw systems supply a stub DllMain which the user # can override, but on older systems we have to supply one echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6 -echo "configure:2341: checking if libtool should supply DllMain function" >&5 +echo "configure:2408: checking if libtool should supply DllMain function" >&5 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_need_dllmain=no else @@ -2371,19 +2438,19 @@ SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mdll" echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6 -echo "configure:2375: checking how to link DLLs" >&5 +echo "configure:2442: checking how to link DLLs" >&5 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_dll_switch=-mdll else @@ -2495,7 +2562,7 @@ echo $ac_n "checking for garbage collector to use""... $ac_c" 1>&6 -echo "configure:2499: checking for garbage collector to use" >&5 +echo "configure:2566: checking for garbage collector to use" >&5 # Check whether --enable-java-gc or --disable-java-gc was given. if test "${enable_java_gc+set}" = set; then enableval="$enable_java_gc" @@ -2518,7 +2585,7 @@ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2522: checking how to run the C preprocessor" >&5 +echo "configure:2589: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2533,13 +2600,14 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < +#line 2605 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2543: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2611: \"$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 : @@ -2550,13 +2618,14 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < +#line 2623 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2560: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2629: \"$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 : @@ -2567,13 +2636,14 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < +#line 2641 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2577: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2647: \"$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 : @@ -2605,7 +2675,7 @@ # Check for command to grab the raw symbol name followed by C symbol from nm. echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6 -echo "configure:2609: checking command to parse $NM output" >&5 +echo "configure:2679: checking command to parse $NM output" >&5 if eval "test \"`echo '$''{'ac_cv_sys_global_symbol_pipe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2668,11 +2738,11 @@ int main(){nm_test_var='a';nm_test_func;return 0;} EOF - if { (eval echo configure:2672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then # Now try to grab the symbols. ac_nlist=conftest.nm - if { (eval echo configure:2676: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then + if { (eval echo configure:2746: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then # Try sorting and uniquifying the output. if sort "$ac_nlist" | uniq > "$ac_nlist"T; then @@ -2724,7 +2794,7 @@ ac_save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo configure:2728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + if { (eval echo configure:2798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_pipe_works=yes else echo "configure: failed program was:" >&5 @@ -2770,12 +2840,13 @@ echo "$ac_t""$ac_result" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2774: checking for ANSI C header files" >&5 +echo "configure:2844: 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 < +#line 2850 "configure" #include "confdefs.h" #include #include @@ -2783,7 +2854,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2858: \"$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* @@ -2800,7 +2871,7 @@ 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 @@ -2818,7 +2889,7 @@ 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 @@ -2839,7 +2910,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2850,7 +2921,7 @@ exit (0); } EOF -if { (eval echo configure:2854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2900,7 +2971,7 @@ fi echo $ac_n "checking which extension is used for shared libraries""... $ac_c" 1>&6 -echo "configure:2904: checking which extension is used for shared libraries" >&5 +echo "configure:2975: checking which extension is used for shared libraries" >&5 if eval "test \"`echo '$''{'libltdl_cv_shlibext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2927,7 +2998,7 @@ fi echo $ac_n "checking which variable specifies run-time library path""... $ac_c" 1>&6 -echo "configure:2931: checking which variable specifies run-time library path" >&5 +echo "configure:3002: checking which variable specifies run-time library path" >&5 if eval "test \"`echo '$''{'libltdl_cv_shlibpath_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2943,7 +3014,7 @@ fi echo $ac_n "checking for the default library search path""... $ac_c" 1>&6 -echo "configure:2947: checking for the default library search path" >&5 +echo "configure:3018: checking for the default library search path" >&5 if eval "test \"`echo '$''{'libltdl_cv_sys_search_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2971,7 +3042,7 @@ fi echo $ac_n "checking for objdir""... $ac_c" 1>&6 -echo "configure:2975: checking for objdir" >&5 +echo "configure:3046: checking for objdir" >&5 if eval "test \"`echo '$''{'libltdl_cv_objdir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2998,7 +3069,7 @@ echo $ac_n "checking whether libtool supports -dlopen/-dlpreopen""... $ac_c" 1>&6 -echo "configure:3002: checking whether libtool supports -dlopen/-dlpreopen" >&5 +echo "configure:3073: checking whether libtool supports -dlopen/-dlpreopen" >&5 if eval "test \"`echo '$''{'libltdl_cv_preloaded_symbols'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3020,7 +3091,7 @@ LIBADD_DL= echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:3024: checking for dlopen in -ldl" >&5 +echo "configure:3095: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3028,7 +3099,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3114: \"$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 @@ -3061,12 +3132,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:3065: checking for dlopen" >&5 +echo "configure:3136: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -3110,7 +3181,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6 -echo "configure:3114: checking for dlopen in -lsvld" >&5 +echo "configure:3185: checking for dlopen in -lsvld" >&5 ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3118,7 +3189,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsvld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3204: \"$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 @@ -3158,12 +3229,12 @@ fi echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "configure:3162: checking for shl_load" >&5 +echo "configure:3233: checking for shl_load" >&5 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shl_load=yes" else @@ -3207,7 +3278,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:3211: checking for shl_load in -ldld" >&5 +echo "configure:3282: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3215,7 +3286,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3301: \"$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 @@ -3254,7 +3325,7 @@ fi echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 -echo "configure:3258: checking for dld_link in -ldld" >&5 +echo "configure:3329: checking for dld_link in -ldld" >&5 ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3262,7 +3333,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3348: \"$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 @@ -3304,12 +3375,12 @@ for ac_func in dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3308: checking for $ac_func" >&5 +echo "configure:3379: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3360,7 +3431,7 @@ fi echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6 -echo "configure:3364: checking for _ prefix in compiled symbols" >&5 +echo "configure:3435: checking for _ prefix in compiled symbols" >&5 if eval "test \"`echo '$''{'ac_cv_sys_symbol_underscore'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3369,10 +3440,10 @@ void nm_test_func(){} int main(){nm_test_func;return 0;} EOF -if { (eval echo configure:3373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3444: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then # Now try to grab the symbols. ac_nlist=conftest.nm - if { (eval echo configure:3376: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then + if { (eval echo configure:3447: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then # See whether the symbols have a leading underscore. if egrep '^. _nm_test_func' "$ac_nlist" >/dev/null; then ac_cv_sys_symbol_underscore=yes @@ -3399,7 +3470,7 @@ if test x"$ac_cv_func_dlopen" = xyes || test x"$ac_cv_lib_dl_dlopen" = xyes ; then echo $ac_n "checking whether we have to add an underscore for dlsym""... $ac_c" 1>&6 -echo "configure:3403: checking whether we have to add an underscore for dlsym" >&5 +echo "configure:3474: checking whether we have to add an underscore for dlsym" >&5 if eval "test \"`echo '$''{'libltdl_cv_need_uscore'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3408,7 +3479,7 @@ else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then libltdl_cv_need_uscore=no else @@ -3487,17 +3558,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3491: checking for $ac_hdr" >&5 +echo "configure:3562: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 3568 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3501: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3573: \"$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* @@ -3527,17 +3599,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3531: checking for $ac_hdr" >&5 +echo "configure:3603: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 3609 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3541: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3614: \"$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* @@ -3566,12 +3639,12 @@ for ac_func in strchr index do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3570: checking for $ac_func" >&5 +echo "configure:3643: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3621,12 +3694,12 @@ for ac_func in strrchr rindex do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3625: checking for $ac_func" >&5 +echo "configure:3698: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3676,12 +3749,12 @@ for ac_func in strcmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3680: checking for $ac_func" >&5 +echo "configure:3753: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3806,6 +3879,9 @@ # Generated automatically by configure. # Run this file to recreate the current configuration. # This directory was configured as follows, +EOF +echo ': ${CONFIG_SHELL='"${CONFIG_SHELL-/bin/sh}"'}' >> $CONFIG_STATUS +cat >> $CONFIG_STATUS </dev/null | sed 1q`: # # $0 $ac_configure_args @@ -3831,6 +3907,7 @@ ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" +PATHIFS="$PATH_IFS" trap 'rm -fr `echo "Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF @@ -3841,6 +3918,7 @@ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub +s,\([^a-zA-Z0-9:]\)/bin/sh\(.exe\),\1${CONFIG_SHELL-/bin/sh}\2,g s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g @@ -3864,6 +3942,8 @@ s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g +s%@PATH_IFS@%$PATH_IFS%g +s%@EXEEXT@%$EXEEXT%g s%@mkinstalldirs@%$mkinstalldirs%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g @@ -3892,7 +3972,6 @@ s%@build_os@%$build_os%g s%@LN_S@%$LN_S%g s%@OBJEXT@%$OBJEXT%g -s%@EXEEXT@%$EXEEXT%g s%@RANLIB@%$RANLIB%g s%@STRIP@%$STRIP%g s%@DLLTOOL@%$DLLTOOL%g @@ -3977,14 +4056,15 @@ .) srcdir=. if test -z "$ac_dots"; then top_srcdir=. else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + [/\\]* | [a-zA-Z]:*) + srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; *) # Relative path. srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" top_srcdir="$ac_dots$ac_given_srcdir" ;; esac case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; + [/$\\]* | [A-Za-z]:*) INSTALL="$ac_given_INSTALL" ;; *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac @@ -3997,7 +4077,7 @@ *) ac_comsub= ;; esac - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%$PATHIFS% $ac_given_srcdir/%g"` sed -e "$ac_comsub s%@configure_input@%$configure_input%g s%@srcdir@%$srcdir%g @@ -4044,7 +4124,9 @@ echo creating $ac_file rm -f conftest.frag conftest.in conftest.out - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` +# kso the other way around might work better with drive letters and such. +# ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + ac_file_inputs=`echo $ac_file_in|sed -e "s%:% $ac_given_srcdir/%g" -e "s%^%$ac_given_srcdir/%" ` cat $ac_file_inputs > conftest.in EOF Index: src/gcc/libobjc/Makefile.in =================================================================== RCS file: /gccos2/src/gcc/libobjc/Makefile.in,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -w -u -r1.1.1.2 -r1.3 Index: src/gcc/libobjc/cfg.sh =================================================================== RCS file: src/gcc/libobjc/cfg.sh diff -N src/gcc/libobjc/cfg.sh --- nul 1 Jan 1970 00:00:00 -0000 +++ src/gcc/libobjc/cfg.sh 16 Apr 2003 14:03:38 -0000 1.1 @@ -0,0 +1,5 @@ +#!/bin/sh + +export r=../ +export with_target_subdir=. +exec ./configure --prefix=/usr --srcdir=. Index: src/gcc/libobjc/configure =================================================================== RCS file: /gccos2/src/gcc/libobjc/configure,v retrieving revision 1.1.1.3 retrieving revision 1.6 diff -w -u -r1.1.1.3 -r1.6 --- src/gcc/libobjc/configure 7 Sep 2004 02:42:41 -0000 1.1.1.3 +++ src/gcc/libobjc/configure 8 Sep 2004 00:03:18 -0000 1.6 @@ -544,6 +544,157 @@ ac_n= ac_c='\c' ac_t= fi +echo $ac_n "checking for path separator""... $ac_c" 1>&6 +echo "configure:549: checking for path separator" >&5 +# Filter path to get backslahes into forwardslashes +case "`uname -s 2> /dev/null`" in +OS/2) + PATH=`echo -E "$PATH" | sed 's+\\\\+/+g'` + PATH_IFS=';' + ;; +*) + PATH_IFS=':' + ;; +esac +echo "$ac_t""${PATH_IFS}" 1>&6 + +echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 +echo "configure:563: checking for Cygwin environment" >&5 +if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cygwin=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cygwin=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_cygwin" 1>&6 +CYGWIN= +test "$ac_cv_cygwin" = yes && CYGWIN=yes +echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 +echo "configure:596: checking for mingw32 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_mingw32=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_mingw32=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_mingw32" 1>&6 +MINGW32= +test "$ac_cv_mingw32" = yes && MINGW32=yes +echo $ac_n "checking for EMX/OS2 environment""... $ac_c" 1>&6 +echo "configure:625: checking for EMX/OS2 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_emxos2'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + : ${CC=gcc.exe} +cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_emxos2=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_emxos2=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_emxos2" 1>&6 +if eval "test \"`echo '$''{'ac_cv_libpre'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$ac_cv_emxos2" = yes ; then + ac_cv_libpre= +else + ac_cv_libpre=lib +fi + +fi + +EMXOS2= +test "$ac_cv_emxos2" = yes && EMXOS2=yes + + + +echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 +echo "configure:669: checking for executable suffix" >&5 +if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then + ac_cv_exeext=.exe +else + rm -f conftest* + echo 'int main () { return 0; }' > conftest.$ac_ext + ac_cv_exeext= + if { (eval echo configure:679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + for file in conftest.*; do + case $file in + *.c | *.o | *.obj) ;; + *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; + esac + done + else + { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } + fi + rm -f conftest* + test x"${ac_cv_exeext}" = x && ac_cv_exeext=no +fi +fi + +EXEEXT="" +test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} +echo "$ac_t""${ac_cv_exeext}" 1>&6 +ac_exeext=$EXEEXT + @@ -635,7 +786,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:639: checking host system type" >&5 +echo "configure:790: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -656,7 +807,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:660: checking target system type" >&5 +echo "configure:811: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -674,7 +825,7 @@ echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:678: checking build system type" >&5 +echo "configure:829: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -705,68 +856,6 @@ ac_tool_prefix= fi -echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:710: checking for Cygwin environment" >&5 -if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cygwin=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_cygwin=no -fi -rm -f conftest* -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_cygwin" 1>&6 -CYGWIN= -test "$ac_cv_cygwin" = yes && CYGWIN=yes -echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:743: checking for mingw32 environment" >&5 -if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_mingw32=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_mingw32=no -fi -rm -f conftest* -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_mingw32" 1>&6 -MINGW32= -test "$ac_cv_mingw32" = yes && MINGW32=yes # Export build and source directories. # These need to be absolute paths, yet at the same time need to @@ -786,7 +875,7 @@ # be 'cp -p' if linking isn't available. #ac_cv_prog_LN_S='cp -p' echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:790: checking whether ln -s works" >&5 +echo "configure:879: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -796,8 +885,14 @@ rm -f conftestdata ac_cv_prog_LN_S="ln -s" else + echo A > conftestdata; + if ln conftestdata conftestdata2 2>/dev/null; then ac_cv_prog_LN_S=ln + else + ac_cv_prog_LN_S=cp + fi fi +rm -f conftestdata* fi LN_S="$ac_cv_prog_LN_S" if test "$ac_cv_prog_LN_S" = "ln -s"; then @@ -842,18 +937,19 @@ # 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:846: checking for $ac_word" >&5 +echo "configure:941: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_CC="gcc" break fi @@ -872,20 +968,22 @@ # 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:876: checking for $ac_word" >&5 +echo "configure:972: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_prog_rejected=no ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc" -o \ + "$ac_dir/$ac_word$ac_exeext" = "/usr/ucb/cc" ; then ac_prog_rejected=yes continue fi @@ -921,7 +1019,7 @@ fi echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:925: checking whether we are using GNU C" >&5 +echo "configure:1023: 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 @@ -930,7 +1028,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:934: \"$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:1032: \"$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 @@ -945,7 +1043,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:949: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1047: 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 @@ -976,18 +1074,19 @@ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:980: checking for $ac_word" >&5 +echo "configure:1078: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AS"; then ac_cv_prog_AS="$AS" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_AS="${ac_tool_prefix}as" break fi @@ -1008,18 +1107,19 @@ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1012: checking for $ac_word" >&5 +echo "configure:1111: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_AR="${ac_tool_prefix}ar" break fi @@ -1040,18 +1140,19 @@ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1044: checking for $ac_word" >&5 +echo "configure:1144: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" break fi @@ -1072,18 +1173,19 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1076: checking for $ac_word" >&5 +echo "configure:1177: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="ranlib" break fi @@ -1116,28 +1218,30 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1120: checking for a BSD compatible install" >&5 +echo "configure:1222: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="$PATH_IFS" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + # We reject the install program from OS/2 or W3.1 + */OS2|*/OS2/*|*/WINDOWS|*/WINDOWS/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. # Don't use installbsd from OSF since it installs stuff as root # by default. for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then + if test -f $ac_dir/$ac_prog$ac_exeext; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : else - ac_cv_path_install="$ac_dir/$ac_prog -c" + ac_cv_path_install="$ac_dir/$ac_prog$ac_exeext -c" break 2 fi fi @@ -1183,18 +1287,19 @@ : + echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1188: checking for executable suffix" >&5 +echo "configure:1293: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test "$CYGWIN" = yes || test "$MINGW32" = yes; then + if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then ac_cv_exeext=.exe else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1224,13 +1329,13 @@ glibcpp_prefixdir=${prefix} echo $ac_n "checking for interface version number""... $ac_c" 1>&6 -echo "configure:1228: checking for interface version number" >&5 +echo "configure:1333: checking for interface version number" >&5 libstdcxx_interface=$INTERFACE echo "$ac_t""$libstdcxx_interface" 1>&6 # Process the option "--enable-version-specific-runtime-libs" echo $ac_n "checking for --enable-version-specific-runtime-libs""... $ac_c" 1>&6 -echo "configure:1234: checking for --enable-version-specific-runtime-libs" >&5 +echo "configure:1339: checking for --enable-version-specific-runtime-libs" >&5 # Check whether --enable-version-specific-runtime-libs or --disable-version-specific-runtime-libs was given. if test "${enable_version_specific_runtime_libs+set}" = set; then enableval="$enable_version_specific_runtime_libs" @@ -1285,7 +1390,7 @@ compiler_name=cc1obj rm -f skip-this-dir echo $ac_n "checking if compiler $compiler_name has been built""... $ac_c" 1>&6 -echo "configure:1289: checking if compiler $compiler_name has been built" >&5 +echo "configure:1394: checking if compiler $compiler_name has been built" >&5 if eval "test \"`echo '$''{'objc_cv_compiler_exists'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1397,7 +1502,7 @@ if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1401: checking for ld used by GCC" >&5 +echo "configure:1506: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1427,10 +1532,10 @@ esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1431: checking for GNU ld" >&5 +echo "configure:1536: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1434: checking for non-GNU ld" >&5 +echo "configure:1539: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1465,7 +1570,7 @@ fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1469: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1574: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1482,7 +1587,7 @@ echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1486: checking for $LD option to reload object files" >&5 +echo "configure:1591: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1494,7 +1599,7 @@ test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1498: checking for BSD-compatible nm" >&5 +echo "configure:1603: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1532,7 +1637,7 @@ echo "$ac_t""$NM" 1>&6 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:1536: checking how to recognise dependant libraries" >&5 +echo "configure:1641: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1665,6 +1770,10 @@ lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; + osf3* | osf4* | osf5*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' @@ -1705,13 +1814,13 @@ deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1709: checking for object suffix" >&5 +echo "configure:1818: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:1715: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -1735,7 +1844,7 @@ file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:1739: checking for ${ac_tool_prefix}file" >&5 +echo "configure:1848: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1797,7 +1906,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:1801: checking for file" >&5 +echo "configure:1910: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1868,18 +1977,19 @@ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1872: checking for $ac_word" >&5 +echo "configure:1981: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" break fi @@ -1900,18 +2010,19 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1904: checking for $ac_word" >&5 +echo "configure:2014: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="ranlib" break fi @@ -1935,18 +2046,19 @@ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1939: checking for $ac_word" >&5 +echo "configure:2050: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" break fi @@ -1967,18 +2079,19 @@ # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1971: checking for $ac_word" >&5 +echo "configure:2083: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_STRIP="strip" break fi @@ -2034,8 +2147,8 @@ case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2038 "configure"' > conftest.$ac_ext - if { (eval echo configure:2039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2151 "configure"' > conftest.$ac_ext + if { (eval echo configure:2152: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) @@ -2068,7 +2181,7 @@ ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2084,7 +2197,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2088: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) case $host in @@ -2128,7 +2241,7 @@ SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2132: checking whether the C compiler needs -belf" >&5 +echo "configure:2245: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2141,14 +2254,14 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2178,18 +2291,19 @@ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2182: checking for $ac_word" >&5 +echo "configure:2295: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$DLLTOOL"; then ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" break fi @@ -2210,18 +2324,19 @@ # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2214: checking for $ac_word" >&5 +echo "configure:2328: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$DLLTOOL"; then ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_DLLTOOL="dlltool" break fi @@ -2245,18 +2360,19 @@ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2249: checking for $ac_word" >&5 +echo "configure:2364: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AS"; then ac_cv_prog_AS="$AS" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_AS="${ac_tool_prefix}as" break fi @@ -2277,18 +2393,19 @@ # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2281: checking for $ac_word" >&5 +echo "configure:2397: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AS"; then ac_cv_prog_AS="$AS" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_AS="as" break fi @@ -2312,18 +2429,19 @@ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2316: checking for $ac_word" >&5 +echo "configure:2433: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$OBJDUMP"; then ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" break fi @@ -2344,18 +2462,19 @@ # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2348: checking for $ac_word" >&5 +echo "configure:2466: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$OBJDUMP"; then ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_OBJDUMP="objdump" break fi @@ -2380,12 +2499,12 @@ # recent cygwin and mingw systems supply a stub DllMain which the user # can override, but on older systems we have to supply one echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6 -echo "configure:2384: checking if libtool should supply DllMain function" >&5 +echo "configure:2503: checking if libtool should supply DllMain function" >&5 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_need_dllmain=no else @@ -2414,19 +2533,19 @@ SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mdll" echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6 -echo "configure:2418: checking how to link DLLs" >&5 +echo "configure:2537: checking how to link DLLs" >&5 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_dll_switch=-mdll else @@ -2544,18 +2663,19 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2548: checking for $ac_word" >&5 +echo "configure:2667: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="ranlib" break fi @@ -2584,28 +2704,30 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:2588: checking for a BSD compatible install" >&5 +echo "configure:2708: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="$PATH_IFS" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + # We reject the install program from OS/2 or W3.1 + */OS2|*/OS2/*|*/WINDOWS|*/WINDOWS/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. # Don't use installbsd from OSF since it installs stuff as root # by default. for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then + if test -f $ac_dir/$ac_prog$ac_exeext; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : else - ac_cv_path_install="$ac_dir/$ac_prog -c" + ac_cv_path_install="$ac_dir/$ac_prog$ac_exeext -c" break 2 fi fi @@ -2637,7 +2759,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:2641: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:2763: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2666,7 +2788,7 @@ # Sanity check for the cross-compilation case: echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2670: checking how to run the C preprocessor" >&5 +echo "configure:2792: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2681,13 +2803,14 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < +#line 2808 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2814: \"$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 : @@ -2698,13 +2821,14 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < +#line 2826 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2708: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2832: \"$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 : @@ -2715,13 +2839,14 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < +#line 2844 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2725: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2850: \"$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 : @@ -2747,17 +2872,18 @@ ac_safe=`echo "stdio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for stdio.h""... $ac_c" 1>&6 -echo "configure:2751: checking for stdio.h" >&5 +echo "configure:2876: checking for stdio.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 2882 "configure" #include "confdefs.h" #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2887: \"$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* @@ -2785,12 +2911,13 @@ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2789: checking for ANSI C header files" >&5 +echo "configure:2915: 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 < +#line 2921 "configure" #include "confdefs.h" #include #include @@ -2798,7 +2925,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2802: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2929: \"$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* @@ -2815,7 +2942,7 @@ 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 @@ -2833,7 +2960,7 @@ 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 @@ -2854,7 +2981,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2865,7 +2992,7 @@ exit (0); } EOF -if { (eval echo configure:2869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2893,17 +3020,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2897: checking for $ac_hdr" >&5 +echo "configure:3024: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 3030 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3035: \"$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* @@ -2933,7 +3061,7 @@ # Determine CFLAGS for gthread. echo $ac_n "checking for gthread cflags""... $ac_c" 1>&6 -echo "configure:2937: checking for gthread cflags" >&5 +echo "configure:3065: checking for gthread cflags" >&5 if eval "test \"`echo '$''{'objc_cv_gthread_flags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3040,6 +3168,9 @@ # Generated automatically by configure. # Run this file to recreate the current configuration. # This directory was configured as follows, +EOF +echo ': ${CONFIG_SHELL='"${CONFIG_SHELL-/bin/sh}"'}' >> $CONFIG_STATUS +cat >> $CONFIG_STATUS </dev/null | sed 1q`: # # $0 $ac_configure_args @@ -3065,6 +3196,7 @@ ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" +PATHIFS="$PATH_IFS" trap 'rm -fr `echo "Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF @@ -3075,6 +3207,7 @@ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub +s,\([^a-zA-Z0-9:]\)/bin/sh\(.exe\),\1${CONFIG_SHELL-/bin/sh}\2,g s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g @@ -3098,6 +3231,8 @@ s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g +s%@PATH_IFS@%$PATH_IFS%g +s%@EXEEXT@%$EXEEXT%g s%@toplevel_srcdir@%$toplevel_srcdir%g s%@host@%$host%g s%@host_alias@%$host_alias%g @@ -3124,7 +3259,6 @@ s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g -s%@EXEEXT@%$EXEEXT%g s%@gcc_version@%$gcc_version%g s%@gcc_version_trigger@%$gcc_version_trigger%g s%@glibcpp_prefixdir@%$glibcpp_prefixdir%g @@ -3209,14 +3343,15 @@ .) srcdir=. if test -z "$ac_dots"; then top_srcdir=. else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + [/\\]* | [a-zA-Z]:*) + srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; *) # Relative path. srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" top_srcdir="$ac_dots$ac_given_srcdir" ;; esac case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; + [/$\\]* | [A-Za-z]:*) INSTALL="$ac_given_INSTALL" ;; *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac @@ -3229,7 +3364,7 @@ *) ac_comsub= ;; esac - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%$PATHIFS% $ac_given_srcdir/%g"` sed -e "$ac_comsub s%@configure_input@%$configure_input%g s%@srcdir@%$srcdir%g @@ -3276,7 +3411,9 @@ echo creating $ac_file rm -f conftest.frag conftest.in conftest.out - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` +# kso the other way around might work better with drive letters and such. +# ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + ac_file_inputs=`echo $ac_file_in|sed -e "s%:% $ac_given_srcdir/%g" -e "s%^%$ac_given_srcdir/%" ` cat $ac_file_inputs > conftest.in EOF Index: src/gcc/libobjc/thr-os2.c =================================================================== RCS file: /gccos2/src/gcc/libobjc/thr-os2.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -w -u -r1.1.1.1 -r1.2 --- src/gcc/libobjc/thr-os2.c 16 Apr 2003 10:11:16 -0000 1.1.1.1 +++ src/gcc/libobjc/thr-os2.c 16 Apr 2003 14:03:38 -0000 1.2 @@ -42,6 +42,7 @@ #undef SEL #undef BOOL +#define __MT__ #include /* Backend initialization functions */ @@ -178,7 +179,7 @@ int __objc_mutex_allocate(objc_mutex_t mutex) { - if (DosCreateMutexSem (NULL, (HMTX)(&(mutex->backend)),0L,0) > 0) + if (DosCreateMutexSem (NULL, (PHMTX)(&(mutex->backend)),0L,0) > 0) return -1; else return 0; Index: src/gcc/libstdc++-v3/Makefile.am =================================================================== RCS file: /gccos2/src/gcc/libstdc++-v3/Makefile.am,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -w -u -r1.1.1.2 -r1.3 Index: src/gcc/libstdc++-v3/Makefile.in =================================================================== RCS file: /gccos2/src/gcc/libstdc++-v3/Makefile.in,v retrieving revision 1.1.1.2 retrieving revision 1.3 diff -w -u -r1.1.1.2 -r1.3 Index: src/gcc/libstdc++-v3/cfg.sh =================================================================== RCS file: src/gcc/libstdc++-v3/cfg.sh diff -N src/gcc/libstdc++-v3/cfg.sh --- nul 1 Jan 1970 00:00:00 -0000 +++ src/gcc/libstdc++-v3/cfg.sh 16 Apr 2003 14:03:38 -0000 1.1 @@ -0,0 +1,4 @@ +export CFLAGS="-s -O2 -fomit-frame-pointer" +export CXX=g++ +export CXXFLAGS="${CFLAGS}" +exec ./configure --disable-multilib --disable-shared --prefix=/usr Index: src/gcc/libstdc++-v3/configure =================================================================== RCS file: /gccos2/src/gcc/libstdc++-v3/configure,v retrieving revision 1.1.1.4 retrieving revision 1.8 diff -w -u -r1.1.1.4 -r1.8 --- src/gcc/libstdc++-v3/configure 3 Nov 2004 06:14:21 -0000 1.1.1.4 +++ src/gcc/libstdc++-v3/configure 4 Nov 2004 04:34:36 -0000 1.8 @@ -582,6 +582,157 @@ ac_n= ac_c='\c' ac_t= fi +echo $ac_n "checking for path separator""... $ac_c" 1>&6 +echo "configure:587: checking for path separator" >&5 +# Filter path to get backslahes into forwardslashes +case "`uname -s 2> /dev/null`" in +OS/2) + PATH=`echo -E "$PATH" | sed 's+\\\\+/+g'` + PATH_IFS=';' + ;; +*) + PATH_IFS=':' + ;; +esac +echo "$ac_t""${PATH_IFS}" 1>&6 + +echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 +echo "configure:601: checking for Cygwin environment" >&5 +if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cygwin=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cygwin=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_cygwin" 1>&6 +CYGWIN= +test "$ac_cv_cygwin" = yes && CYGWIN=yes +echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 +echo "configure:634: checking for mingw32 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_mingw32=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_mingw32=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_mingw32" 1>&6 +MINGW32= +test "$ac_cv_mingw32" = yes && MINGW32=yes +echo $ac_n "checking for EMX/OS2 environment""... $ac_c" 1>&6 +echo "configure:663: checking for EMX/OS2 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_emxos2'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + : ${CC=gcc.exe} +cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_emxos2=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_emxos2=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_emxos2" 1>&6 +if eval "test \"`echo '$''{'ac_cv_libpre'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$ac_cv_emxos2" = yes ; then + ac_cv_libpre= +else + ac_cv_libpre=lib +fi + +fi + +EMXOS2= +test "$ac_cv_emxos2" = yes && EMXOS2=yes + + + +echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 +echo "configure:707: checking for executable suffix" >&5 +if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then + ac_cv_exeext=.exe +else + rm -f conftest* + echo 'int main () { return 0; }' > conftest.$ac_ext + ac_cv_exeext= + if { (eval echo configure:717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + for file in conftest.*; do + case $file in + *.c | *.o | *.obj) ;; + *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; + esac + done + else + { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } + fi + rm -f conftest* + test x"${ac_cv_exeext}" = x && ac_cv_exeext=no +fi +fi + +EXEEXT="" +test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} +echo "$ac_t""${ac_cv_exeext}" 1>&6 +ac_exeext=$EXEEXT + # This works around the fact that libtool configuration may change LD @@ -693,7 +844,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:697: checking host system type" >&5 +echo "configure:848: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -714,7 +865,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:718: checking target system type" >&5 +echo "configure:869: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -732,7 +883,7 @@ echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:736: checking build system type" >&5 +echo "configure:887: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -765,68 +916,6 @@ ac_tool_prefix= fi -echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:770: checking for Cygwin environment" >&5 -if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cygwin=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_cygwin=no -fi -rm -f conftest* -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_cygwin" 1>&6 -CYGWIN= -test "$ac_cv_cygwin" = yes && CYGWIN=yes -echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:803: checking for mingw32 environment" >&5 -if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_mingw32=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_mingw32=no -fi -rm -f conftest* -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_mingw32" 1>&6 -MINGW32= -test "$ac_cv_mingw32" = yes && MINGW32=yes # Export build and source directories. # These need to be absolute paths, yet at the same time need to @@ -842,23 +931,24 @@ - for ac_prog in gawk mawk nawk awk + for ac_prog in mawk gawk nawk awk 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:851: checking for $ac_word" >&5 +echo "configure:940: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_AWK="$ac_prog" break fi @@ -881,7 +971,7 @@ # force a particular method. #ac_cv_prog_LN_S='cp -p' echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:885: checking whether ln -s works" >&5 +echo "configure:975: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -891,8 +981,14 @@ rm -f conftestdata ac_cv_prog_LN_S="ln -s" else + echo A > conftestdata; + if ln conftestdata conftestdata2 2>/dev/null; then ac_cv_prog_LN_S=ln + else + ac_cv_prog_LN_S=cp + fi fi +rm -f conftestdata* fi LN_S="$ac_cv_prog_LN_S" if test "$ac_cv_prog_LN_S" = "ln -s"; then @@ -944,18 +1040,19 @@ # 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:948: checking for $ac_word" >&5 +echo "configure:1044: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_CC="gcc" break fi @@ -974,20 +1071,22 @@ # 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:978: checking for $ac_word" >&5 +echo "configure:1075: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_prog_rejected=no ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc" -o \ + "$ac_dir/$ac_word$ac_exeext" = "/usr/ucb/cc" ; then ac_prog_rejected=yes continue fi @@ -1023,7 +1122,7 @@ fi echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1027: checking whether we are using GNU C" >&5 +echo "configure:1126: 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 @@ -1032,7 +1131,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1036: \"$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:1135: \"$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 @@ -1047,7 +1146,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1051: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1150: 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 @@ -1090,18 +1189,19 @@ # 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:1094: checking for $ac_word" >&5 +echo "configure:1193: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_glibcpp_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$glibcpp_CXX"; then ac_cv_prog_glibcpp_CXX="$glibcpp_CXX" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_glibcpp_CXX="$ac_prog" break fi @@ -1125,7 +1225,7 @@ test -z "$glibcpp_CXX" && { echo "configure: error: no acceptable c++ found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1129: checking whether we are using GNU C++" >&5 +echo "configure:1229: 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 @@ -1134,7 +1234,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1138: \"$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:1238: \"$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 @@ -1149,7 +1249,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1153: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1253: 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 @@ -1179,14 +1279,14 @@ # For directory versioning (e.g., headers) and other variables. echo $ac_n "checking for GCC version number""... $ac_c" 1>&6 -echo "configure:1183: checking for GCC version number" >&5 +echo "configure:1283: checking for GCC version number" >&5 gcc_version=`$glibcpp_CXX -dumpversion` echo "$ac_t""$gcc_version" 1>&6 # For some reason, gettext needs this. echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 -echo "configure:1190: checking for strerror in -lcposix" >&5 +echo "configure:1290: checking for strerror in -lcposix" >&5 ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1194,7 +1294,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1309: \"$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 @@ -1231,18 +1331,19 @@ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1235: checking for $ac_word" >&5 +echo "configure:1335: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AS"; then ac_cv_prog_AS="$AS" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_AS="${ac_tool_prefix}as" break fi @@ -1263,18 +1364,19 @@ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1267: checking for $ac_word" >&5 +echo "configure:1368: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_AR="${ac_tool_prefix}ar" break fi @@ -1295,18 +1397,19 @@ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1299: checking for $ac_word" >&5 +echo "configure:1401: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" break fi @@ -1327,18 +1430,19 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1331: checking for $ac_word" >&5 +echo "configure:1434: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="ranlib" break fi @@ -1371,28 +1475,30 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1375: checking for a BSD compatible install" >&5 +echo "configure:1479: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="$PATH_IFS" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + # We reject the install program from OS/2 or W3.1 + */OS2|*/OS2/*|*/WINDOWS|*/WINDOWS/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. # Don't use installbsd from OSF since it installs stuff as root # by default. for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then + if test -f $ac_dir/$ac_prog$ac_exeext; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : else - ac_cv_path_install="$ac_dir/$ac_prog -c" + ac_cv_path_install="$ac_dir/$ac_prog$ac_exeext -c" break 2 fi fi @@ -1425,7 +1531,7 @@ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1429: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1535: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1462,18 +1568,19 @@ : + echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1467: checking for executable suffix" >&5 +echo "configure:1574: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test "$CYGWIN" = yes || test "$MINGW32" = yes; then + if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then ac_cv_exeext=.exe else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1510,7 +1617,7 @@ echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:1514: checking whether build environment is sane" >&5 +echo "configure:1621: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -1567,7 +1674,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1571: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1678: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1613,7 +1720,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:1617: checking for working aclocal" >&5 +echo "configure:1724: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1626,7 +1733,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:1630: checking for working autoconf" >&5 +echo "configure:1737: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1639,7 +1746,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:1643: checking for working automake" >&5 +echo "configure:1750: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1652,7 +1759,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1656: checking for working autoheader" >&5 +echo "configure:1763: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1665,7 +1772,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1669: checking for working makeinfo" >&5 +echo "configure:1776: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1764,7 +1871,7 @@ if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1768: checking for ld used by GCC" >&5 +echo "configure:1875: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1794,10 +1901,10 @@ esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1798: checking for GNU ld" >&5 +echo "configure:1905: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1801: checking for non-GNU ld" >&5 +echo "configure:1908: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1832,7 +1939,7 @@ fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1836: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1943: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1849,7 +1956,7 @@ echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1853: checking for $LD option to reload object files" >&5 +echo "configure:1960: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1861,7 +1968,7 @@ test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1865: checking for BSD-compatible nm" >&5 +echo "configure:1972: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1899,7 +2006,7 @@ echo "$ac_t""$NM" 1>&6 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:1903: checking how to recognise dependant libraries" >&5 +echo "configure:2010: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2032,6 +2139,10 @@ lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; + osf3* | osf4* | osf5*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' @@ -2072,13 +2183,13 @@ deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2076: checking for object suffix" >&5 +echo "configure:2187: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2102,7 +2213,7 @@ file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2106: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2217: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2164,7 +2275,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2168: checking for file" >&5 +echo "configure:2279: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2235,18 +2346,19 @@ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2239: checking for $ac_word" >&5 +echo "configure:2350: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" break fi @@ -2267,18 +2379,19 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2271: checking for $ac_word" >&5 +echo "configure:2383: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_RANLIB="ranlib" break fi @@ -2302,18 +2415,19 @@ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2306: checking for $ac_word" >&5 +echo "configure:2419: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" break fi @@ -2334,18 +2448,19 @@ # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2338: checking for $ac_word" >&5 +echo "configure:2452: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_STRIP="strip" break fi @@ -2401,8 +2516,8 @@ case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2405 "configure"' > conftest.$ac_ext - if { (eval echo configure:2406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2520 "configure"' > conftest.$ac_ext + if { (eval echo configure:2521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) @@ -2435,7 +2550,7 @@ ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2439: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2451,7 +2566,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2455: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) case $host in @@ -2495,7 +2610,7 @@ SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2499: checking whether the C compiler needs -belf" >&5 +echo "configure:2614: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2508,14 +2623,14 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2545,7 +2660,7 @@ esac echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:2549: checking how to run the C++ preprocessor" >&5 +echo "configure:2664: 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 @@ -2558,12 +2673,13 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < +#line 2678 "configure" #include "confdefs.h" #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2683: \"$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 : @@ -2701,7 +2817,7 @@ # Check for c++ or library specific bits that don't require linking. #GLIBCPP_CHECK_COMPILER_VERSION echo $ac_n "checking for GNU make""... $ac_c" 1>&6 -echo "configure:2705: checking for GNU make" >&5 +echo "configure:2821: checking for GNU make" >&5 if eval "test \"`echo '$''{'_cv_gnu_make_command'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2727,7 +2843,7 @@ # Enable all the variable C++ stuff. C_MBCHAR must come early. echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2731: checking how to run the C preprocessor" >&5 +echo "configure:2847: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2742,13 +2858,14 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < +#line 2863 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2869: \"$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 : @@ -2759,13 +2876,14 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < +#line 2881 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2769: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2887: \"$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 : @@ -2776,13 +2894,14 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < +#line 2899 "configure" #include "confdefs.h" #include Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2905: \"$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 : @@ -2808,7 +2927,7 @@ echo $ac_n "checking for cstdio to use""... $ac_c" 1>&6 -echo "configure:2812: checking for cstdio to use" >&5 +echo "configure:2931: checking for cstdio to use" >&5 # Check whether --enable-cstdio or --disable-cstdio was given. if test "${enable_cstdio+set}" = set; then enableval="$enable_cstdio" @@ -2832,17 +2951,18 @@ # see if we are on a system with libio native (ie, linux) ac_safe=`echo "libio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libio.h""... $ac_c" 1>&6 -echo "configure:2836: checking for libio.h" >&5 +echo "configure:2955: checking for libio.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 2961 "configure" #include "confdefs.h" #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2846: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2966: \"$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* @@ -2872,9 +2992,9 @@ case "$target" in *-*-linux*) echo $ac_n "checking for glibc version >= 2.2""... $ac_c" 1>&6 -echo "configure:2876: checking for glibc version >= 2.2" >&5 +echo "configure:2996: checking for glibc version >= 2.2" >&5 cat > conftest.$ac_ext < @@ -2988,7 +3108,7 @@ echo $ac_n "checking for clocale to use""... $ac_c" 1>&6 -echo "configure:2992: checking for clocale to use" >&5 +echo "configure:3112: checking for clocale to use" >&5 # Check whether --enable-clocale or --disable-clocale was given. if test "${enable_clocale+set}" = set; then enableval="$enable_clocale" @@ -3006,7 +3126,7 @@ case x${target_os} in xlinux* | xgnu*) cat > conftest.$ac_ext < @@ -3032,7 +3152,7 @@ enable_clocale_flag=generic else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then enable_clocale_flag=gnu else @@ -3121,18 +3241,19 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3125: checking for $ac_word" >&5 +echo "configure:3245: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_check_msgfmt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$check_msgfmt"; then ac_cv_prog_check_msgfmt="$check_msgfmt" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o \ + -f $ac_dir/$ac_word$ac_exeext ; then ac_cv_prog_check_msgfmt="yes" break fi @@ -3217,7 +3338,7 @@ echo $ac_n "checking for c header strategy to use""... $ac_c" 1>&6 -echo "configure:3221: checking for c header strategy to use" >&5 +echo "configure:3342: checking for c header strategy to use" >&5 # Check whether --enable-cheaders or --disable-cheaders was given. if test "${enable_cheaders+set}" = set; then enableval="$enable_cheaders" @@ -3313,16 +3434,16 @@ # Check for the existence of functions used if C99 is enabled. ac_c99_math=yes; echo $ac_n "checking for ISO C99 support in ""... $ac_c" 1>&6 -echo "configure:3317: checking for ISO C99 support in " >&5 +echo "configure:3438: checking for ISO C99 support in " >&5 cat > conftest.$ac_ext < int main() { fpclassify(0.0); ; return 0; } EOF -if { (eval echo configure:3326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3332,14 +3453,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { isfinite(0.0); ; return 0; } EOF -if { (eval echo configure:3343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3349,14 +3470,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { isinf(0.0); ; return 0; } EOF -if { (eval echo configure:3360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3366,14 +3487,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { isnan(0.0); ; return 0; } EOF -if { (eval echo configure:3377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3383,14 +3504,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { isnormal(0.0); ; return 0; } EOF -if { (eval echo configure:3394: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3515: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3400,14 +3521,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { signbit(0.0); ; return 0; } EOF -if { (eval echo configure:3411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3417,14 +3538,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { isgreater(0.0,0.0); ; return 0; } EOF -if { (eval echo configure:3428: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3434,14 +3555,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { isgreaterequal(0.0,0.0); ; return 0; } EOF -if { (eval echo configure:3445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3451,14 +3572,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { isless(0.0,0.0); ; return 0; } EOF -if { (eval echo configure:3462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3583: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3468,14 +3589,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { islessequal(0.0,0.0); ; return 0; } EOF -if { (eval echo configure:3479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3485,14 +3606,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { islessgreater(0.0,0.0); ; return 0; } EOF -if { (eval echo configure:3496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3502,14 +3623,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { isunordered(0.0,0.0); ; return 0; } EOF -if { (eval echo configure:3513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3523,16 +3644,16 @@ # Check for the existence in of vscanf, et. al. ac_c99_stdio=yes; echo $ac_n "checking for ISO C99 support in ""... $ac_c" 1>&6 -echo "configure:3527: checking for ISO C99 support in " >&5 +echo "configure:3648: checking for ISO C99 support in " >&5 cat > conftest.$ac_ext < int main() { snprintf("12", 0, "%i"); ; return 0; } EOF -if { (eval echo configure:3536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3657: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3542,7 +3663,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < #include @@ -3553,7 +3674,7 @@ ; return 0; } EOF -if { (eval echo configure:3557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3678: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3563,7 +3684,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < #include @@ -3574,7 +3695,7 @@ ; return 0; } EOF -if { (eval echo configure:3578: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3584,7 +3705,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < #include @@ -3595,7 +3716,7 @@ ; return 0; } EOF -if { (eval echo configure:3599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3720: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3605,7 +3726,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < #include @@ -3616,7 +3737,7 @@ ; return 0; } EOF -if { (eval echo configure:3620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3741: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3630,20 +3751,20 @@ # Check for the existence in of lldiv_t, et. al. ac_c99_stdlib=yes; echo $ac_n "checking for lldiv_t declaration""... $ac_c" 1>&6 -echo "configure:3634: checking for lldiv_t declaration" >&5 +echo "configure:3755: checking for lldiv_t declaration" >&5 if eval "test \"`echo '$''{'ac_c99_lldiv_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { lldiv_t mydivt; ; return 0; } EOF -if { (eval echo configure:3647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_c99_lldiv_t=yes else @@ -3659,16 +3780,16 @@ echo "$ac_t""$ac_c99_lldiv_t" 1>&6 echo $ac_n "checking for ISO C99 support in ""... $ac_c" 1>&6 -echo "configure:3663: checking for ISO C99 support in " >&5 +echo "configure:3784: checking for ISO C99 support in " >&5 cat > conftest.$ac_ext < int main() { char* tmp; strtof("gnu", &tmp); ; return 0; } EOF -if { (eval echo configure:3672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3793: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3678,14 +3799,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { char* tmp; strtold("gnu", &tmp); ; return 0; } EOF -if { (eval echo configure:3689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3695,14 +3816,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { llabs(10); ; return 0; } EOF -if { (eval echo configure:3706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3712,14 +3833,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { lldiv(10,1); ; return 0; } EOF -if { (eval echo configure:3723: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3844: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3729,14 +3850,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { atoll("10"); ; return 0; } EOF -if { (eval echo configure:3740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3861: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3746,14 +3867,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { _Exit(0); ; return 0; } EOF -if { (eval echo configure:3757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3771,16 +3892,16 @@ # XXX the wchar.h checks should be rolled into the general C99 bits. ac_c99_wchar=yes; echo $ac_n "checking for additional ISO C99 support in ""... $ac_c" 1>&6 -echo "configure:3775: checking for additional ISO C99 support in " >&5 +echo "configure:3896: checking for additional ISO C99 support in " >&5 cat > conftest.$ac_ext < int main() { wcstold(L"10.0", NULL); ; return 0; } EOF -if { (eval echo configure:3784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3790,14 +3911,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { wcstoll(L"10", NULL, 10); ; return 0; } EOF -if { (eval echo configure:3801: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3807,14 +3928,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { wcstoull(L"10", NULL, 10); ; return 0; } EOF -if { (eval echo configure:3818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3826,7 +3947,7 @@ echo "$ac_t""$ac_c99_wchar" 1>&6 echo $ac_n "checking for enabled ISO C99 support""... $ac_c" 1>&6 -echo "configure:3830: checking for enabled ISO C99 support" >&5 +echo "configure:3951: checking for enabled ISO C99 support" >&5 if test x"$ac_c99_math" = x"no" || test x"$ac_c99_stdio" = x"no" || test x"$ac_c99_stdlib" = x"no" || @@ -3874,17 +3995,17 @@ echo $ac_n "checking for enabled long long I/O support""... $ac_c" 1>&6 -echo "configure:3878: checking for enabled long long I/O support" >&5 +echo "configure:3999: checking for enabled long long I/O support" >&5 # iostreams require strtoll, strtoull to compile cat > conftest.$ac_ext < int main() { char* tmp; strtoll("gnu", &tmp, 10); ; return 0; } EOF -if { (eval echo configure:3888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4009: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3894,14 +4015,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { char* tmp; strtoull("gnu", &tmp, 10); ; return 0; } EOF -if { (eval echo configure:3905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3930,7 +4051,7 @@ echo $ac_n "checking for thread model used by GCC""... $ac_c" 1>&6 -echo "configure:3934: checking for thread model used by GCC" >&5 +echo "configure:4055: checking for thread model used by GCC" >&5 target_thread_file=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'` echo "$ac_t""$target_thread_file" 1>&6 @@ -3950,7 +4071,7 @@ echo $ac_n "checking for exception model to use""... $ac_c" 1>&6 -echo "configure:3954: checking for exception model to use" >&5 +echo "configure:4075: checking for exception model to use" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -3965,7 +4086,7 @@ : else cat > conftest.$ac_ext << EOF -#line 3969 "configure" +#line 4090 "configure" struct S { ~S(); }; void bar(); void foo() @@ -3976,7 +4097,7 @@ EOF old_CXXFLAGS="$CXXFLAGS" CXXFLAGS=-S - if { (eval echo configure:3980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:4101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if grep _Unwind_SjLj_Resume conftest.s >/dev/null 2>&1 ; then enable_sjlj_exceptions=yes elif grep _Unwind_Resume conftest.s >/dev/null 2>&1 ; then @@ -4009,7 +4130,7 @@ echo $ac_n "checking for use of libunwind""... $ac_c" 1>&6 -echo "configure:4013: checking for use of libunwind" >&5 +echo "configure:4134: checking for use of libunwind" >&5 # Check whether --enable-libunwind-exceptions or --disable-libunwind-exceptions was given. if test "${enable_libunwind_exceptions+set}" = set; then enableval="$enable_libunwind_exceptions" @@ -4045,7 +4166,7 @@ fi echo $ac_n "checking for extra compiler flags for building""... $ac_c" 1>&6 -echo "configure:4049: checking for extra compiler flags for building" >&5 +echo "configure:4170: checking for extra compiler flags for building" >&5 # Check whether --enable-cxx_flags or --disable-cxx_flags was given. if test "${enable_cxx_flags+set}" = set; then enableval="$enable_cxx_flags" @@ -4088,7 +4209,7 @@ enable_debug=no fi echo $ac_n "checking for additional debug build""... $ac_c" 1>&6 -echo "configure:4092: checking for additional debug build" >&5 +echo "configure:4213: checking for additional debug build" >&5 echo "$ac_t""$enable_debug" 1>&6 @@ -4128,7 +4249,7 @@ echo $ac_n "checking for debug build flags""... $ac_c" 1>&6 -echo "configure:4132: checking for debug build flags" >&5 +echo "configure:4253: checking for debug build flags" >&5 echo "$ac_t""$DEBUG_FLAGS" 1>&6 @@ -4137,17 +4258,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4141: checking for $ac_hdr" >&5 +echo "configure:4262: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 4268 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4151: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4273: \"$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* @@ -4228,17 +4350,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4232: checking for $ac_hdr" >&5 +echo "configure:4354: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 4360 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4365: \"$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* @@ -4316,12 +4439,12 @@ # used sections, first .eh_frame and now some of the glibc sections for # iconv). Bzzzzt. Thanks for playing, maybe next time. echo $ac_n "checking for ld that supports -Wl,--gc-sections""... $ac_c" 1>&6 -echo "configure:4320: checking for ld that supports -Wl,--gc-sections" >&5 +echo "configure:4443: checking for ld that supports -Wl,--gc-sections" >&5 if test "$cross_compiling" = yes; then ac_sectionLDflags=yes else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_sectionLDflags=yes else @@ -4366,7 +4489,7 @@ echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:4370: checking for main in -lm" >&5 +echo "configure:4493: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4374,14 +4497,14 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4508: \"$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 @@ -4411,12 +4534,12 @@ for ac_func in nan copysignf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4415: checking for $ac_func" >&5 +echo "configure:4538: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4468,12 +4591,12 @@ for ac_func in __signbit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4472: checking for $ac_func" >&5 +echo "configure:4595: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4524,12 +4647,12 @@ for ac_func in __signbitf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4528: checking for $ac_func" >&5 +echo "configure:4651: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4582,12 +4705,12 @@ for ac_func in __signbitl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4586: checking for $ac_func" >&5 +echo "configure:4709: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4655,16 +4778,16 @@ enable_wchar_t=no echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 -echo "configure:4659: checking for mbstate_t" >&5 +echo "configure:4782: checking for mbstate_t" >&5 cat > conftest.$ac_ext < int main() { mbstate_t teststate; ; return 0; } EOF -if { (eval echo configure:4668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_mbstate_t=yes else @@ -4686,17 +4809,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4690: checking for $ac_hdr" >&5 +echo "configure:4813: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 4819 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4824: \"$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* @@ -4727,17 +4851,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4731: checking for $ac_hdr" >&5 +echo "configure:4855: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 4861 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4741: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4866: \"$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* @@ -4770,16 +4895,16 @@ test x"$enable_c_mbchar" != xno; then echo $ac_n "checking for WCHAR_MIN and WCHAR_MAX""... $ac_c" 1>&6 -echo "configure:4774: checking for WCHAR_MIN and WCHAR_MAX" >&5 +echo "configure:4899: checking for WCHAR_MIN and WCHAR_MAX" >&5 cat > conftest.$ac_ext < int main() { int i = WCHAR_MIN; int j = WCHAR_MAX; ; return 0; } EOF -if { (eval echo configure:4783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* has_wchar_minmax=yes else @@ -4792,9 +4917,9 @@ echo "$ac_t""$has_wchar_minmax" 1>&6 echo $ac_n "checking for WEOF""... $ac_c" 1>&6 -echo "configure:4796: checking for WEOF" >&5 +echo "configure:4921: checking for WEOF" >&5 cat > conftest.$ac_ext < @@ -4803,7 +4928,7 @@ wint_t i = WEOF; ; return 0; } EOF -if { (eval echo configure:4807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* has_weof=yes else @@ -4819,12 +4944,12 @@ for ac_func in wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4823: checking for $ac_func" >&5 +echo "configure:4948: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4882,12 +5007,12 @@ wcscspn wcsspn wcstok wcsftime wcschr wcspbrk wcsrchr wcsstr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4886: checking for $ac_func" >&5 +echo "configure:5011: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4938,7 +5063,7 @@ echo $ac_n "checking for ISO C99 wchar_t support""... $ac_c" 1>&6 -echo "configure:4942: checking for ISO C99 wchar_t support" >&5 +echo "configure:5067: checking for ISO C99 wchar_t support" >&5 if test x"$has_weof" = xyes && test x"$has_wchar_minmax" = xyes && test x"$ac_wfuncs" = xyes; then @@ -4950,17 +5075,18 @@ ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 -echo "configure:4954: checking for iconv.h" >&5 +echo "configure:5079: checking for iconv.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 5085 "configure" #include "confdefs.h" #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4964: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5090: \"$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* @@ -4984,17 +5110,18 @@ ac_safe=`echo "langinfo.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for langinfo.h""... $ac_c" 1>&6 -echo "configure:4988: checking for langinfo.h" >&5 +echo "configure:5114: checking for langinfo.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 5120 "configure" #include "confdefs.h" #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5125: \"$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* @@ -5018,7 +5145,7 @@ echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 -echo "configure:5022: checking for iconv in -liconv" >&5 +echo "configure:5149: checking for iconv in -liconv" >&5 ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5026,7 +5153,7 @@ ac_save_LIBS="$LIBS" LIBS="-liconv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5168: \"$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 @@ -5063,12 +5190,12 @@ for ac_func in iconv_open iconv_close iconv nl_langinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5067: checking for $ac_func" >&5 +echo "configure:5194: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5121,7 +5248,7 @@ LIBS="$ac_save_LIBS" echo $ac_n "checking for XPG2 wchar_t support""... $ac_c" 1>&6 -echo "configure:5125: checking for XPG2 wchar_t support" >&5 +echo "configure:5252: checking for XPG2 wchar_t support" >&5 if test x"$ac_has_iconv_h" = xyes && test x"$ac_has_langinfo_h" = xyes && test x"$ac_XPG2funcs" = xyes; then @@ -5141,7 +5268,7 @@ fi fi echo $ac_n "checking for enabled wchar_t specializations""... $ac_c" 1>&6 -echo "configure:5145: checking for enabled wchar_t specializations" >&5 +echo "configure:5272: checking for enabled wchar_t specializations" >&5 echo "$ac_t""$enable_wchar_t" 1>&6 @@ -5159,17 +5286,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5163: checking for $ac_hdr" >&5 +echo "configure:5290: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 5296 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5301: \"$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* @@ -5201,14 +5329,14 @@ else cat > conftest.$ac_ext < int main() { struct pollfd pfd[1]; pfd[0].events = POLLIN; poll(pfd, 1, 0); ; return 0; } EOF -if { (eval echo configure:5212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_POLL=yes else @@ -5234,14 +5362,14 @@ else cat > conftest.$ac_ext < int main() { struct stat buffer; fstat(0, &buffer); S_ISREG(buffer.st_mode); ; return 0; } EOF -if { (eval echo configure:5245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* glibcpp_cv_S_ISREG=yes else @@ -5259,14 +5387,14 @@ else cat > conftest.$ac_ext < int main() { struct stat buffer; fstat(0, &buffer); S_IFREG & buffer.st_mode; ; return 0; } EOF -if { (eval echo configure:5270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* glibcpp_cv_S_IFREG=yes else @@ -5367,17 +5495,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5371: checking for $ac_hdr" >&5 +echo "configure:5499: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 5505 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5510: \"$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* @@ -5455,12 +5584,12 @@ # used sections, first .eh_frame and now some of the glibc sections for # iconv). Bzzzzt. Thanks for playing, maybe next time. echo $ac_n "checking for ld that supports -Wl,--gc-sections""... $ac_c" 1>&6 -echo "configure:5459: checking for ld that supports -Wl,--gc-sections" >&5 +echo "configure:5588: checking for ld that supports -Wl,--gc-sections" >&5 if test "$cross_compiling" = yes; then ac_sectionLDflags=yes else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_sectionLDflags=yes else @@ -5505,7 +5634,7 @@ echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:5509: checking for main in -lm" >&5 +echo "configure:5638: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5513,14 +5642,14 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5653: \"$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 @@ -5550,12 +5679,12 @@ for ac_func in nan copysignf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5554: checking for $ac_func" >&5 +echo "configure:5683: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5607,12 +5736,12 @@ for ac_func in __signbit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5611: checking for $ac_func" >&5 +echo "configure:5740: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5663,12 +5792,12 @@ for ac_func in __signbitf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5667: checking for $ac_func" >&5 +echo "configure:5796: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5721,12 +5850,12 @@ for ac_func in __signbitl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5725: checking for $ac_func" >&5 +echo "configure:5854: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5794,16 +5923,16 @@ enable_wchar_t=no echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 -echo "configure:5798: checking for mbstate_t" >&5 +echo "configure:5927: checking for mbstate_t" >&5 cat > conftest.$ac_ext < int main() { mbstate_t teststate; ; return 0; } EOF -if { (eval echo configure:5807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5936: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_mbstate_t=yes else @@ -5825,17 +5954,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5829: checking for $ac_hdr" >&5 +echo "configure:5958: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 5964 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5969: \"$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* @@ -5866,17 +5996,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5870: checking for $ac_hdr" >&5 +echo "configure:6000: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 6006 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6011: \"$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* @@ -5909,16 +6040,16 @@ test x"$enable_c_mbchar" != xno; then echo $ac_n "checking for WCHAR_MIN and WCHAR_MAX""... $ac_c" 1>&6 -echo "configure:5913: checking for WCHAR_MIN and WCHAR_MAX" >&5 +echo "configure:6044: checking for WCHAR_MIN and WCHAR_MAX" >&5 cat > conftest.$ac_ext < int main() { int i = WCHAR_MIN; int j = WCHAR_MAX; ; return 0; } EOF -if { (eval echo configure:5922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6053: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* has_wchar_minmax=yes else @@ -5931,9 +6062,9 @@ echo "$ac_t""$has_wchar_minmax" 1>&6 echo $ac_n "checking for WEOF""... $ac_c" 1>&6 -echo "configure:5935: checking for WEOF" >&5 +echo "configure:6066: checking for WEOF" >&5 cat > conftest.$ac_ext < @@ -5942,7 +6073,7 @@ wint_t i = WEOF; ; return 0; } EOF -if { (eval echo configure:5946: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* has_weof=yes else @@ -5958,12 +6089,12 @@ for ac_func in wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5962: checking for $ac_func" >&5 +echo "configure:6093: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6021,12 +6152,12 @@ wcscspn wcsspn wcstok wcsftime wcschr wcspbrk wcsrchr wcsstr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6025: checking for $ac_func" >&5 +echo "configure:6156: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6077,7 +6208,7 @@ echo $ac_n "checking for ISO C99 wchar_t support""... $ac_c" 1>&6 -echo "configure:6081: checking for ISO C99 wchar_t support" >&5 +echo "configure:6212: checking for ISO C99 wchar_t support" >&5 if test x"$has_weof" = xyes && test x"$has_wchar_minmax" = xyes && test x"$ac_wfuncs" = xyes; then @@ -6089,17 +6220,18 @@ ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 -echo "configure:6093: checking for iconv.h" >&5 +echo "configure:6224: checking for iconv.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 6230 "configure" #include "confdefs.h" #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6103: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6235: \"$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* @@ -6123,17 +6255,18 @@ ac_safe=`echo "langinfo.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for langinfo.h""... $ac_c" 1>&6 -echo "configure:6127: checking for langinfo.h" >&5 +echo "configure:6259: checking for langinfo.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 6265 "configure" #include "confdefs.h" #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6137: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6270: \"$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* @@ -6157,7 +6290,7 @@ echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 -echo "configure:6161: checking for iconv in -liconv" >&5 +echo "configure:6294: checking for iconv in -liconv" >&5 ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6165,7 +6298,7 @@ ac_save_LIBS="$LIBS" LIBS="-liconv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6313: \"$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 @@ -6202,12 +6335,12 @@ for ac_func in iconv_open iconv_close iconv nl_langinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6206: checking for $ac_func" >&5 +echo "configure:6339: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6260,7 +6393,7 @@ LIBS="$ac_save_LIBS" echo $ac_n "checking for XPG2 wchar_t support""... $ac_c" 1>&6 -echo "configure:6264: checking for XPG2 wchar_t support" >&5 +echo "configure:6397: checking for XPG2 wchar_t support" >&5 if test x"$ac_has_iconv_h" = xyes && test x"$ac_has_langinfo_h" = xyes && test x"$ac_XPG2funcs" = xyes; then @@ -6280,7 +6413,7 @@ fi fi echo $ac_n "checking for enabled wchar_t specializations""... $ac_c" 1>&6 -echo "configure:6284: checking for enabled wchar_t specializations" >&5 +echo "configure:6417: checking for enabled wchar_t specializations" >&5 echo "$ac_t""$enable_wchar_t" 1>&6 @@ -6347,17 +6480,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6351: checking for $ac_hdr" >&5 +echo "configure:6484: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 6490 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6361: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6495: \"$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* @@ -6435,12 +6569,12 @@ # used sections, first .eh_frame and now some of the glibc sections for # iconv). Bzzzzt. Thanks for playing, maybe next time. echo $ac_n "checking for ld that supports -Wl,--gc-sections""... $ac_c" 1>&6 -echo "configure:6439: checking for ld that supports -Wl,--gc-sections" >&5 +echo "configure:6573: checking for ld that supports -Wl,--gc-sections" >&5 if test "$cross_compiling" = yes; then ac_sectionLDflags=yes else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_sectionLDflags=yes else @@ -6485,7 +6619,7 @@ echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:6489: checking for main in -lm" >&5 +echo "configure:6623: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6493,14 +6627,14 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6638: \"$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 @@ -6530,12 +6664,12 @@ for ac_func in nan copysignf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6534: checking for $ac_func" >&5 +echo "configure:6668: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6587,12 +6721,12 @@ for ac_func in __signbit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6591: checking for $ac_func" >&5 +echo "configure:6725: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6643,12 +6777,12 @@ for ac_func in __signbitf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6647: checking for $ac_func" >&5 +echo "configure:6781: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6701,12 +6835,12 @@ for ac_func in __signbitl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6705: checking for $ac_func" >&5 +echo "configure:6839: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6774,16 +6908,16 @@ enable_wchar_t=no echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 -echo "configure:6778: checking for mbstate_t" >&5 +echo "configure:6912: checking for mbstate_t" >&5 cat > conftest.$ac_ext < int main() { mbstate_t teststate; ; return 0; } EOF -if { (eval echo configure:6787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6921: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_mbstate_t=yes else @@ -6805,17 +6939,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6809: checking for $ac_hdr" >&5 +echo "configure:6943: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 6949 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6954: \"$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* @@ -6846,17 +6981,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6850: checking for $ac_hdr" >&5 +echo "configure:6985: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 6991 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6996: \"$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* @@ -6889,16 +7025,16 @@ test x"$enable_c_mbchar" != xno; then echo $ac_n "checking for WCHAR_MIN and WCHAR_MAX""... $ac_c" 1>&6 -echo "configure:6893: checking for WCHAR_MIN and WCHAR_MAX" >&5 +echo "configure:7029: checking for WCHAR_MIN and WCHAR_MAX" >&5 cat > conftest.$ac_ext < int main() { int i = WCHAR_MIN; int j = WCHAR_MAX; ; return 0; } EOF -if { (eval echo configure:6902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7038: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* has_wchar_minmax=yes else @@ -6911,9 +7047,9 @@ echo "$ac_t""$has_wchar_minmax" 1>&6 echo $ac_n "checking for WEOF""... $ac_c" 1>&6 -echo "configure:6915: checking for WEOF" >&5 +echo "configure:7051: checking for WEOF" >&5 cat > conftest.$ac_ext < @@ -6922,7 +7058,7 @@ wint_t i = WEOF; ; return 0; } EOF -if { (eval echo configure:6926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* has_weof=yes else @@ -6938,12 +7074,12 @@ for ac_func in wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6942: checking for $ac_func" >&5 +echo "configure:7078: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7001,12 +7137,12 @@ wcscspn wcsspn wcstok wcsftime wcschr wcspbrk wcsrchr wcsstr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7005: checking for $ac_func" >&5 +echo "configure:7141: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7057,7 +7193,7 @@ echo $ac_n "checking for ISO C99 wchar_t support""... $ac_c" 1>&6 -echo "configure:7061: checking for ISO C99 wchar_t support" >&5 +echo "configure:7197: checking for ISO C99 wchar_t support" >&5 if test x"$has_weof" = xyes && test x"$has_wchar_minmax" = xyes && test x"$ac_wfuncs" = xyes; then @@ -7069,17 +7205,18 @@ ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 -echo "configure:7073: checking for iconv.h" >&5 +echo "configure:7209: checking for iconv.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 7215 "configure" #include "confdefs.h" #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7083: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7220: \"$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* @@ -7103,17 +7240,18 @@ ac_safe=`echo "langinfo.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for langinfo.h""... $ac_c" 1>&6 -echo "configure:7107: checking for langinfo.h" >&5 +echo "configure:7244: checking for langinfo.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 7250 "configure" #include "confdefs.h" #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7255: \"$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* @@ -7137,7 +7275,7 @@ echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 -echo "configure:7141: checking for iconv in -liconv" >&5 +echo "configure:7279: checking for iconv in -liconv" >&5 ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7145,7 +7283,7 @@ ac_save_LIBS="$LIBS" LIBS="-liconv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7298: \"$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 @@ -7182,12 +7320,12 @@ for ac_func in iconv_open iconv_close iconv nl_langinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7186: checking for $ac_func" >&5 +echo "configure:7324: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7240,7 +7378,7 @@ LIBS="$ac_save_LIBS" echo $ac_n "checking for XPG2 wchar_t support""... $ac_c" 1>&6 -echo "configure:7244: checking for XPG2 wchar_t support" >&5 +echo "configure:7382: checking for XPG2 wchar_t support" >&5 if test x"$ac_has_iconv_h" = xyes && test x"$ac_has_langinfo_h" = xyes && test x"$ac_XPG2funcs" = xyes; then @@ -7260,7 +7398,7 @@ fi fi echo $ac_n "checking for enabled wchar_t specializations""... $ac_c" 1>&6 -echo "configure:7264: checking for enabled wchar_t specializations" >&5 +echo "configure:7402: checking for enabled wchar_t specializations" >&5 echo "$ac_t""$enable_wchar_t" 1>&6 @@ -7337,17 +7475,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7341: checking for $ac_hdr" >&5 +echo "configure:7479: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 7485 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7351: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7490: \"$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* @@ -7425,12 +7564,12 @@ # used sections, first .eh_frame and now some of the glibc sections for # iconv). Bzzzzt. Thanks for playing, maybe next time. echo $ac_n "checking for ld that supports -Wl,--gc-sections""... $ac_c" 1>&6 -echo "configure:7429: checking for ld that supports -Wl,--gc-sections" >&5 +echo "configure:7568: checking for ld that supports -Wl,--gc-sections" >&5 if test "$cross_compiling" = yes; then ac_sectionLDflags=yes else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_sectionLDflags=yes else @@ -7475,7 +7614,7 @@ echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:7479: checking for main in -lm" >&5 +echo "configure:7618: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7483,14 +7622,14 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7633: \"$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 @@ -7520,12 +7659,12 @@ for ac_func in nan copysignf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7524: checking for $ac_func" >&5 +echo "configure:7663: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7577,12 +7716,12 @@ for ac_func in __signbit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7581: checking for $ac_func" >&5 +echo "configure:7720: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7633,12 +7772,12 @@ for ac_func in __signbitf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7637: checking for $ac_func" >&5 +echo "configure:7776: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7691,12 +7830,12 @@ for ac_func in __signbitl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7695: checking for $ac_func" >&5 +echo "configure:7834: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7764,16 +7903,16 @@ enable_wchar_t=no echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 -echo "configure:7768: checking for mbstate_t" >&5 +echo "configure:7907: checking for mbstate_t" >&5 cat > conftest.$ac_ext < int main() { mbstate_t teststate; ; return 0; } EOF -if { (eval echo configure:7777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_mbstate_t=yes else @@ -7795,17 +7934,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7799: checking for $ac_hdr" >&5 +echo "configure:7938: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 7944 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7809: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7949: \"$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* @@ -7836,17 +7976,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7840: checking for $ac_hdr" >&5 +echo "configure:7980: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 7986 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7991: \"$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* @@ -7879,16 +8020,16 @@ test x"$enable_c_mbchar" != xno; then echo $ac_n "checking for WCHAR_MIN and WCHAR_MAX""... $ac_c" 1>&6 -echo "configure:7883: checking for WCHAR_MIN and WCHAR_MAX" >&5 +echo "configure:8024: checking for WCHAR_MIN and WCHAR_MAX" >&5 cat > conftest.$ac_ext < int main() { int i = WCHAR_MIN; int j = WCHAR_MAX; ; return 0; } EOF -if { (eval echo configure:7892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* has_wchar_minmax=yes else @@ -7901,9 +8042,9 @@ echo "$ac_t""$has_wchar_minmax" 1>&6 echo $ac_n "checking for WEOF""... $ac_c" 1>&6 -echo "configure:7905: checking for WEOF" >&5 +echo "configure:8046: checking for WEOF" >&5 cat > conftest.$ac_ext < @@ -7912,7 +8053,7 @@ wint_t i = WEOF; ; return 0; } EOF -if { (eval echo configure:7916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* has_weof=yes else @@ -7928,12 +8069,12 @@ for ac_func in wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7932: checking for $ac_func" >&5 +echo "configure:8073: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7991,12 +8132,12 @@ wcscspn wcsspn wcstok wcsftime wcschr wcspbrk wcsrchr wcsstr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7995: checking for $ac_func" >&5 +echo "configure:8136: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8047,7 +8188,7 @@ echo $ac_n "checking for ISO C99 wchar_t support""... $ac_c" 1>&6 -echo "configure:8051: checking for ISO C99 wchar_t support" >&5 +echo "configure:8192: checking for ISO C99 wchar_t support" >&5 if test x"$has_weof" = xyes && test x"$has_wchar_minmax" = xyes && test x"$ac_wfuncs" = xyes; then @@ -8059,17 +8200,18 @@ ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 -echo "configure:8063: checking for iconv.h" >&5 +echo "configure:8204: checking for iconv.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 8210 "configure" #include "confdefs.h" #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8215: \"$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* @@ -8093,17 +8235,18 @@ ac_safe=`echo "langinfo.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for langinfo.h""... $ac_c" 1>&6 -echo "configure:8097: checking for langinfo.h" >&5 +echo "configure:8239: checking for langinfo.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 8245 "configure" #include "confdefs.h" #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8107: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8250: \"$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* @@ -8127,7 +8270,7 @@ echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 -echo "configure:8131: checking for iconv in -liconv" >&5 +echo "configure:8274: checking for iconv in -liconv" >&5 ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8135,7 +8278,7 @@ ac_save_LIBS="$LIBS" LIBS="-liconv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8293: \"$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 @@ -8172,12 +8315,12 @@ for ac_func in iconv_open iconv_close iconv nl_langinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8176: checking for $ac_func" >&5 +echo "configure:8319: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8230,7 +8373,7 @@ LIBS="$ac_save_LIBS" echo $ac_n "checking for XPG2 wchar_t support""... $ac_c" 1>&6 -echo "configure:8234: checking for XPG2 wchar_t support" >&5 +echo "configure:8377: checking for XPG2 wchar_t support" >&5 if test x"$ac_has_iconv_h" = xyes && test x"$ac_has_langinfo_h" = xyes && test x"$ac_XPG2funcs" = xyes; then @@ -8250,7 +8393,7 @@ fi fi echo $ac_n "checking for enabled wchar_t specializations""... $ac_c" 1>&6 -echo "configure:8254: checking for enabled wchar_t specializations" >&5 +echo "configure:8397: checking for enabled wchar_t specializations" >&5 echo "$ac_t""$enable_wchar_t" 1>&6 @@ -8343,17 +8486,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8347: checking for $ac_hdr" >&5 +echo "configure:8490: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#line 8496 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8357: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8501: \"$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* @@ -8429,12 +8573,12 @@ # used sections, first .eh_frame and now some of the glibc sections for # iconv). Bzzzzt. Thanks for playing, maybe next time. echo $ac_n "checking for ld that supports -Wl,--gc-sections""... $ac_c" 1>&6 -echo "configure:8433: checking for ld that supports -Wl,--gc-sections" >&5 +echo "configure:8577: checking for ld that supports -Wl,--gc-sections" >&5 if test "$cross_compiling" = yes; then ac_sectionLDflags=yes else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_sectionLDflags=yes else @@ -8479,7 +8623,7 @@ echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:8483: checking for main in -lm" >&5 +echo "configure:8627: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8487,14 +8631,14 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8642: \"$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 @@ -8524,12 +8668,12 @@ for ac_func in nan copysignf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8528: checking for $ac_func" >&5 +echo "configure:8672: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8581,12 +8725,12 @@ for ac_func in __signbit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8585: checking for $ac_func" >&5 +echo "configure:8729: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8637,12 +8781,12 @@ for ac_func in __signbitf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8641: checking for $ac_func" >&5 +echo "configure:8785: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8695,12 +8839,12 @@ for ac_func in __signbitl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8699: checking for $ac_func" >&5 +echo "configure:8843: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8768,16 +8912,16 @@ enable_wchar_t=no echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 -echo "configure:8772: checking for mbstate_t" >&5 +echo "configure:8916: checking for mbstate_t" >&5 cat > conftest.$ac_ext < int main() { mbstate_t teststate; ; return 0; } EOF -if { (eval echo configure:8781: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_mbstate_t=yes else @@ -8799,17 +8943,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8803: checking for $ac_hdr" >&5 +echo "configure:8947: checking for $ac_