? .configure.swp ? 029599 ? autom4te.cache ? config.h.in ? config.log ? config.parms ? config.status ? gcc29 ? gcc295 ? gcc30 ? gcc31 ? gcc32 ? gcc33 ? gccborken ? ooconfig.h ? ooconfig.h.in ? set_soenv ? warn Index: configure =================================================================== RCS file: /cvs/tools/config_office/configure,v retrieving revision 1.30.2.2.4.1 diff -u -b -B -p -r1.30.2.2.4.1 configure --- configure 12 Mar 2003 11:34:54 -0000 1.30.2.2.4.1 +++ configure 18 Mar 2003 13:36:32 -0000 @@ -271,7 +271,7 @@ PACKAGE_VERSION= PACKAGE_STRING= PACKAGE_BUGREPORT= -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH _cc CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXCPP JAVA PERL TCSH X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS BISON FLEX PATCH CYGWIN ML_EXE ZIP_EXE ANT ANT_HOME GCC_INCLUDE_PATH GXX_INCLUDE_PATH GCC_HOME GNUMAKE JAVA_HOME XLIB XINC LOCAL_SOLENV LOCAL_SOLVER UPD STLPORT4 WITH_LANG PSDK_HOME ASM_HOME UNZIP_HOME WITH_MINGWIN USE_SHELL EXCEPTIONS OSVERSION USE_GCC3 PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_DEBUG LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH _cc CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXCPP JAVA PERL TCSH X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS BISON FLEX PATCH CYGWIN ML_EXE ZIP_EXE ANT ANT_HOME GCC_INCLUDE_PATH GXX_INCLUDE_PATH GCC_HOME GNUMAKE JAVA_HOME XLIB XINC LOCAL_SOLENV LOCAL_SOLVER UPD STLPORT4 WITH_LANG PSDK_HOME ASM_HOME UNZIP_HOME WITH_MINGWIN USE_SHELL EXCEPTIONS OSVERSION USE_GCC3 PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_DEBUG ENVCFLAGSCXX LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -820,7 +820,13 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-gcc3 Deprecated: Now has no effect, checks compiler version. - --enable-debug if you like to build with debug symbols + --enable-symbols if you like to build with symbols in the final build. + Warning: This creates a large build of about 8 gig. + + Usage: --enable-symbols + + --enable-debug if you like to build with debug symbols and extra + debugging code. This creates a LARGE build (8 gig) Usage: --enable-debug @@ -1352,6 +1358,11 @@ if test "${enable_gcc3+set}" = set; then enableval="$enable_gcc3" fi; +# Check whether --enable-symbols or --disable-symbols was given. +if test "${enable_symbols+set}" = set; then + enableval="$enable_symbols" + +fi; # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then enableval="$enable_debug" @@ -1660,6 +1671,11 @@ esac echo "$as_me:$LINENO: result: checked ($_os)" >&5 echo "${ECHO_T}checked ($_os)" >&6 +if test "$enable_symbols" = "yes"; then + ENVCFLAGSCXX="-g" +else + ENVCFLAGSCXX="" +fi if test $_os = "WINNT" -a $CygwinVer = "true"; then if test "$with_use_shell" = "0"; then @@ -2654,43 +2670,33 @@ if test "$GCC" = "yes"; then echo $ECHO_N "checking the GNU gcc compiler version... $ECHO_C" >&6 _gcc_version=`$CC -dumpversion` _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - if test "$_gcc_major" = "3"; then + _gcc_middle=`echo $_gcc_version | $AWK -F. '{ print \$2 }'` + _gcc_longver=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` - USE_GCC3="TRUE" + if test "$_gcc_longver" -lt "030200" ; then + ENVCFLAGSCXX="$ENVCFLAGSCXX -fno-rtti" + fi + + if test "$_gcc_major" = "3"; then + USE_GCC3="TRUE" else USE_GCC3="FALSE" - - if test "$_gcc_major" != "2"; then - { echo "$as_me:$LINENO: WARNING: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&5 -echo "$as_me: WARNING: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&2;} - { echo "$as_me:$LINENO: WARNING: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&5 -echo "$as_me: WARNING: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&2;} >> warn - COMPATH="NO_GCC" - else - _gcc_middle=`$CC -dumpversion | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` - if test "$_gcc_middle" = "false"; then - { echo "$as_me:$LINENO: WARNING: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&5 -echo "$as_me: WARNING: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&2;} - { echo "$as_me:$LINENO: WARNING: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&5 -echo "$as_me: WARNING: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&2;} >> warn - COMPATH="NO_GCC" - else - _gcc_minor=`$CC -dumpversion | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` - if test "$_gcc_minor" = "false"; then - { echo "$as_me:$LINENO: WARNING: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&5 -echo "$as_me: WARNING: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&2;} - { echo "$as_me:$LINENO: WARNING: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&5 -echo "$as_me: WARNING: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&2;} >> warn - COMPATH="NO_GCC" - fi + if test "$_gcc_longver" -lt "029502"; then + { { echo "$as_me:$LINENO: error: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&5 +echo "$as_me: error: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&2;} + { (exit 1); exit 1; }; } + else + if test "$_gcc_longver" -gt "029599"; then + { { echo "$as_me:$LINENO: error: found version \"$_gcc_version\", Not supported. Upgrade to gcc 3" >&5 +echo "$as_me: error: found version \"$_gcc_version\", Not supported. Upgrade to gcc 3" >&2;} + { (exit 1); exit 1; }; } fi fi + echo "gcc 2.95 support is not perfect, suggest upgrade to gcc 3" >>warn fi - if test "$COMPATH" != "NO_GCC"; then echo "$as_me:$LINENO: result: checked (gcc $_gcc_version)" >&5 echo "${ECHO_T}checked (gcc $_gcc_version)" >&6 - fi _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include if test "$_gcc_include_path" = "/usr/libexec/(null)/include"; then @@ -2710,7 +2716,8 @@ done ; if test -z "$GNUMAKE"; then { echo "$as_me:$LINENO: WARNING: not found build may fail" >&5 -echo "$as_me: WARNING: not found build may fail" >&2;} >> warn +echo "$as_me: WARNING: not found build may fail" >&2;} + echo "gnu make not found build may fail" >> warn else _make_version=`$GNUMAKE --version | grep GNU | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'`; _make_major=`echo $_make_version | $AWK -F. '{print $1;}'` @@ -2731,6 +2738,7 @@ echo "${ECHO_T}checked ($GNUMAKE $_make_ if test "$_os" = "Darwin"; then { echo "$as_me:$LINENO: WARNING: failed ($GNUMAKE $_make_version need 3.79.1+)" >&5 echo "$as_me: WARNING: failed ($GNUMAKE $_make_version need 3.79.1+)" >&2;} + echo "$GNUMAKE $_make_version may cause problems need 3.79.1+" >> warn else { { echo "$as_me:$LINENO: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&5 echo "$as_me: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&2;} @@ -2798,16 +2806,14 @@ echo $ECHO_N "checking the SUN Workshop if test "$_workshop_major" != "5"; then { echo "$as_me:$LINENO: WARNING: found version \"$_workshop_version\", use version 5.0 or 5.2 of the Sun Workshop C compiler" >&5 echo "$as_me: WARNING: found version \"$_workshop_version\", use version 5.0 or 5.2 of the Sun Workshop C compiler" >&2;} - { echo "$as_me:$LINENO: WARNING: found version \"$_workshop_version\", use version 5.0 or 5.2 of the Sun Workshop C compiler" >&5 -echo "$as_me: WARNING: found version \"$_workshop_version\", use version 5.0 or 5.2 of the Sun Workshop C compiler" >&2;} >> warn + echo "found version "$_workshop_version", use version 5.0 or 5.2 of the Sun Workshop C compiler" >> warn COMPATH="NO_COMPATH" else _workshop_minor=`echo $_workshop_version | $AWK -F. '{ if ($2 == 0) print "true"; else if ($2 == 2) print "true"; else print "false" }'` if test "$_workshop_minor" = "false"; then { echo "$as_me:$LINENO: WARNING: found version \"$_workshop_version\", use version 5.0 or 5.2 of the Sun Workshop C compiler" >&5 echo "$as_me: WARNING: found version \"$_workshop_version\", use version 5.0 or 5.2 of the Sun Workshop C compiler" >&2;} - { echo "$as_me:$LINENO: WARNING: found version \"$_workshop_version\", use version 5.0 or 5.2 of the Sun Workshop C compiler" >&5 -echo "$as_me: WARNING: found version \"$_workshop_version\", use version 5.0 or 5.2 of the Sun Workshop C compiler" >&2;} >> warn + echo "found version "$_workshop_version", use version 5.0 or 5.2 of the Sun Workshop C compiler" >> warn COMPATH="NO_COMPATH" else echo "$as_me:$LINENO: result: checked" >&5 @@ -2871,16 +2877,14 @@ echo $ECHO_N "checking the SGI MIPSpro C if test "$_mipspro_major" != "7"; then { echo "$as_me:$LINENO: WARNING: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&5 echo "$as_me: WARNING: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;} - { echo "$as_me:$LINENO: WARNING: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&5 -echo "$as_me: WARNING: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;} >> warn + echo "found version $_mipspro_version, use version 7.2+ of the SGI MIPSpro C compiler" >> warn COMPATH="NO_COMPATH" else _mipspro_minor=`echo $_mipspro_version | $AWK -F. '{ if ($2 <= 1) print "false"; else print "true" }'` if test "$_mipspro_minor" = "false"; then { echo "$as_me:$LINENO: WARNING: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&5 echo "$as_me: WARNING: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;} - { echo "$as_me:$LINENO: WARNING: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&5 -echo "$as_me: WARNING: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;} >> warn + echo "found version $_mipspro_version, use version 7.2+ of the SGI MIPSpro C compiler" >> warn COMPATH="NO_COMPATH" else echo "$as_me:$LINENO: result: checked" >&5 @@ -2946,8 +2950,7 @@ echo $ECHO_N "checking the Compaq C comp if test "$_compaqc_major" != "T6"; then { echo "$as_me:$LINENO: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&5 echo "$as_me: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&2;} - { echo "$as_me:$LINENO: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&5 -echo "$as_me: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&2;} >> warn + echo "found version "$_compaqc_version", use version 6 of the Compaq C compiler" >> warn COMPATH="NO_COMPATH" else echo "$as_me:$LINENO: result: checked" >&5 @@ -3450,8 +3453,7 @@ echo "${ECHO_T}yes" >&6 else { echo "$as_me:$LINENO: WARNING: pam_appl.h could not be found in /usr/include/security" >&5 echo "$as_me: WARNING: pam_appl.h could not be found in /usr/include/security" >&2;} - { echo "$as_me:$LINENO: WARNING: pam_appl.h could not be found in /usr/include/security" >&5 -echo "$as_me: WARNING: pam_appl.h could not be found in /usr/include/security" >&2;} >> warn + echo "pam_appl.h could not be found in /usr/include/security" >> warn fi fi @@ -3805,8 +3807,7 @@ echo $ECHO_N "checking Sun Workshop C++ if test "$CXX" != "CC"; then { echo "$as_me:$LINENO: WARNING: Sun Workshop C++ was not found" >&5 echo "$as_me: WARNING: Sun Workshop C++ was not found" >&2;} - { echo "$as_me:$LINENO: WARNING: Sun Worlshop C++ was not found" >&5 -echo "$as_me: WARNING: Sun Worlshop C++ was not found" >&2;} >> warn + echo "Sun Workshop C++ was not found" >> warn else echo "$as_me:$LINENO: result: checked" >&5 echo "${ECHO_T}checked" >&6 @@ -3820,8 +3821,7 @@ echo $ECHO_N "checking Macosx c++ Compil if test "$CXX" != "c++"; then { echo "$as_me:$LINENO: WARNING: Macosx C++ was not found" >&5 echo "$as_me: WARNING: Macosx C++ was not found" >&2;} - { echo "$as_me:$LINENO: WARNING: Macosx C++ was not found" >&5 -echo "$as_me: WARNING: Macosx C++ was not found" >&2;} >> warn + echo "Macosx C++ was not found" >> warn else echo "$as_me:$LINENO: result: checked" >&5 echo "${ECHO_T}checked" >&6 @@ -3835,8 +3835,7 @@ echo $ECHO_N "checking SGI MIPSpro C++ C if test "$CXX" != "CC"; then { echo "$as_me:$LINENO: WARNING: SGI MIPSpro C++ was not found" >&5 echo "$as_me: WARNING: SGI MIPSpro C++ was not found" >&2;} - { echo "$as_me:$LINENO: WARNING: SGI MIPSpro C++ was not found" >&5 -echo "$as_me: WARNING: SGI MIPSpro C++ was not found" >&2;} >> warn + echo "SGI MIPSpro C++ was not found" >> warn else echo "$as_me:$LINENO: result: checked" >&5 echo "${ECHO_T}checked" >&6 @@ -3851,8 +3850,7 @@ echo $ECHO_N "checking Compaq C++ compil if test "$_compaqcxx_major" != "V6"; then { echo "$as_me:$LINENO: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&5 echo "$as_me: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&2;} - { echo "$as_me:$LINENO: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&5 -echo "$as_me: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&2;} >> warn + echo "found version $_compaqc_version, use version 6 of the Compaq C++ compiler" >> warn else echo "$as_me:$LINENO: result: checked" >&5 echo "${ECHO_T}checked" >&6 @@ -3949,8 +3947,7 @@ echo "${ECHO_T}found" >&6 else { echo "$as_me:$LINENO: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&5 echo "$as_me: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&2;} - { echo "$as_me:$LINENO: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&5 -echo "$as_me: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&2;} >> warn + echo "patch 106327-06 not found, please install compiler patch 106327-06 or greater" >> warn fi echo "$as_me:$LINENO: checking for patch 106950-11 or greater" >&5 echo $ECHO_N "checking for patch 106950-11 or greater... $ECHO_C" >&6 @@ -3972,8 +3969,7 @@ echo "${ECHO_T}found" >&6 else { echo "$as_me:$LINENO: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&5 echo "$as_me: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&2;} - { echo "$as_me:$LINENO: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&5 -echo "$as_me: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&2;} >> warn + echo "patch 106950-11 not found, please install linker patch 106950-11 or greater" >> warn fi else if test "$_os_release" = "6"; then @@ -3997,8 +3993,7 @@ echo "${ECHO_T}found" >&6 else { echo "$as_me:$LINENO: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&5 echo "$as_me: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&2;} - { echo "$as_me:$LINENO: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&5 -echo "$as_me: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&2;} >> warn + echo "patch 105591-09 not found, please install compiler patch 105591-09 or greater" >> warn fi echo "$as_me:$LINENO: checking for patch 107733-08 or greater" >&5 echo $ECHO_N "checking for patch 107733-08 or greater... $ECHO_C" >&6 @@ -4020,8 +4015,7 @@ echo "${ECHO_T}found" >&6 else { echo "$as_me:$LINENO: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&5 echo "$as_me: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&2;} - { echo "$as_me:$LINENO: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&5 -echo "$as_me: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&2;} >> warn + echo "patch 107733-06 not found, please install linker patch 107733-08 or greater" >> warn fi fi fi @@ -4478,30 +4472,23 @@ fi echo "$as_me:$LINENO: checking the installed JDK" >&5 echo $ECHO_N "checking the installed JDK... $ECHO_C" >&6 if test "$JAVA"; then - _correct_jdk_exists="false" _jdk=`$JAVA -J-version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/-A-Za-z*//` _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'` if test "$_jdk_ver" -lt 10300; then - { echo "$as_me:$LINENO: WARNING: You need at least jdk-1.3" >&5 -echo "$as_me: WARNING: You need at least jdk-1.3" >&2;} - _correct_jdk_exists="false" + { { echo "$as_me:$LINENO: error: You need at least jdk-1.3" >&5 +echo "$as_me: error: You need at least jdk-1.3" >&2;} + { (exit 1); exit 1; }; } else - _correct_jdk_exists="true" JAVA_HOME=`echo $JAVA | $SED -n "s/\/bin\/javac//p"` echo "$as_me:$LINENO: result: checked (JDK $_jdk)" >&5 echo "${ECHO_T}checked (JDK $_jdk)" >&6 fi else - _correct_jdk_exists="false" -fi -if test "$_correct_jdk_exists" = "false"; then - JAVA_HOME="NO_JAVA_HOME" - { echo "$as_me:$LINENO: WARNING: Correct jdk not found" >&5 -echo "$as_me: WARNING: Correct jdk not found" >&2;} - { echo "$as_me:$LINENO: WARNING: Correct jdk not found" >&5 -echo "$as_me: WARNING: Correct jdk not found" >&2;} >> warn + { { echo "$as_me:$LINENO: error: JAVA not found. You need at least jdk-1.3" >&5 +echo "$as_me: error: JAVA not found. You need at least jdk-1.3" >&2;} + { (exit 1); exit 1; }; } fi if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then ac_ext=c @@ -6534,8 +6521,9 @@ echo "${ECHO_T}no" >&6 fi if test -z "$BISON"; then - { echo "$as_me:$LINENO: WARNING: no bison found in \$PATH, install bison" >&5 -echo "$as_me: WARNING: no bison found in \$PATH, install bison" >&2;} >> warn + { { echo "$as_me:$LINENO: error: no bison found in \$PATH, install bison" >&5 +echo "$as_me: error: no bison found in \$PATH, install bison" >&2;} + { (exit 1); exit 1; }; } fi # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 @@ -6577,8 +6565,9 @@ echo "${ECHO_T}no" >&6 fi if test -z "$FLEX"; then - { echo "$as_me:$LINENO: WARNING: no flex found in \$PATH, install flex" >&5 -echo "$as_me: WARNING: no flex found in \$PATH, install flex" >&2;} >> warn + { { echo "$as_me:$LINENO: error: no flex found in \$PATH, install flex" >&5 +echo "$as_me: error: no flex found in \$PATH, install flex" >&2;} + { (exit 1); exit 1; }; } fi # Extract the first word of "patch", so it can be a program name with args. set dummy patch; ac_word=$2 @@ -6620,8 +6609,9 @@ echo "${ECHO_T}no" >&6 fi if test -z "$PATCH"; then - { echo "$as_me:$LINENO: WARNING: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&5 -echo "$as_me: WARNING: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&2;} >> warn + { { echo "$as_me:$LINENO: error: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&5 +echo "$as_me: error: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&2;} + { (exit 1); exit 1; }; } fi if test "$_os" = "WINNT"; then # Extract the first word of "bash", so it can be a program name with args. @@ -6902,8 +6892,9 @@ fi if test -z "$ANT"; then - echo "$as_me:$LINENO: result: Ant not found - Some Java projects will not build" >&5 -echo "${ECHO_T}Ant not found - Some Java projects will not build" >&6 + { echo "$as_me:$LINENO: WARNING: Ant not found - Some Java projects will not build" >&5 +echo "$as_me: WARNING: Ant not found - Some Java projects will not build" >&2;} + echo "Ant not found - Some Java projects will not build" >>warn else echo "$as_me:$LINENO: checking if $ANT works" >&5 echo $ECHO_N "checking if $ANT works... $ECHO_C" >&6 @@ -6940,6 +6931,7 @@ echo "${ECHO_T}Ant works" >&6 cat conftest.xml >&5 { echo "$as_me:$LINENO: WARNING: Ant does not work - Some Java projects will not build!" >&5 echo "$as_me: WARNING: Ant does not work - Some Java projects will not build!" >&2;} + echo "Ant does not work - Some Java projects will not build!" >>warn fi rm -f conftest* core core.* *.core @@ -7740,6 +7733,7 @@ s,@USE_GCC3@,$USE_GCC3,;t t s,@PTHREAD_CFLAGS@,$PTHREAD_CFLAGS,;t t s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t s,@ENABLE_DEBUG@,$ENABLE_DEBUG,;t t +s,@ENVCFLAGSCXX@,$ENVCFLAGSCXX,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF Index: configure.in =================================================================== RCS file: /cvs/tools/config_office/configure.in,v retrieving revision 1.49.2.2.4.1 diff -u -b -B -p -r1.49.2.2.4.1 configure.in --- configure.in 12 Mar 2003 11:31:06 -0000 1.49.2.2.4.1 +++ configure.in 18 Mar 2003 13:36:35 -0000 @@ -19,8 +19,15 @@ echo "$@" >config.parms AC_ARG_ENABLE(gcc3, [ --enable-gcc3 Deprecated: Now has no effect, checks compiler version. ],,) +AC_ARG_ENABLE(symbols, +[ --enable-symbols if you like to build with symbols in the final build. + Warning: This creates a large build of about 8 gig. + + Usage: --enable-symbols +],,) AC_ARG_ENABLE(debug, -[ --enable-debug if you like to build with debug symbols +[ --enable-debug if you like to build with debug symbols and extra + debugging code. This creates a LARGE build (8 gig) Usage: --enable-debug ],,) @@ -226,6 +233,14 @@ esac AC_MSG_RESULT([checked ($_os)]) +dnl =================================================================== +dnl First setting is whether to include symbols into final build. +dnl =================================================================== +if test "$enable_symbols" = "yes"; then + ENVCFLAGSCXX="-g" +else + ENVCFLAGSCXX="" +fi dnl =================================================================== dnl WINNT uses either 4nt or tcsh, all other O/S use tcsh. @@ -321,36 +336,27 @@ if test "$GCC" = "yes"; then AC_MSG_CHECKING([the GNU gcc compiler version]) _gcc_version=`$CC -dumpversion` _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - if test "$_gcc_major" = "3"; then + _gcc_longver=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` - USE_GCC3="TRUE" - else - USE_GCC3="FALSE" + if test "$_gcc_longver" -lt "030200" ; then + ENVCFLAGSCXX="$ENVCFLAGSCXX -fno-rtti" + fi - if test "$_gcc_major" != "2"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" + if test "$_gcc_major" = "3"; then + USE_GCC3="TRUE" else - _gcc_middle=`$CC -dumpversion | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` - if test "$_gcc_middle" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" + USE_GCC3="FALSE" + if test "$_gcc_longver" -lt "029502"; then + AC_MSG_ERROR([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) else - _gcc_minor=`$CC -dumpversion | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` - if test "$_gcc_minor" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" + if test "$_gcc_longver" -gt "029599"; then + AC_MSG_ERROR([found version "$_gcc_version", Not supported. Upgrade to gcc 3]) fi fi + echo "gcc 2.95 support is not perfect, suggest upgrade to gcc 3" >>warn fi - fi - if test "$COMPATH" != "NO_GCC"; then AC_MSG_RESULT([checked (gcc $_gcc_version)]) - fi dnl Set the include paths _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include @@ -373,7 +379,8 @@ done ; dnl Change empty GNUMAKE from warning to error, pending testing. if test -z "$GNUMAKE"; then - AC_MSG_WARN([not found build may fail]) >> warn + AC_MSG_WARN([not found build may fail]) + echo "gnu make not found build may fail" >> warn else _make_version=`$GNUMAKE --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`; _make_major=`echo $_make_version | $AWK -F. '{print $1;}'` @@ -390,6 +397,7 @@ else else if test "$_os" = "Darwin"; then AC_MSG_WARN([failed ($GNUMAKE $_make_version need 3.79.1+)]) + echo "$GNUMAKE $_make_version may cause problems need 3.79.1+" >> warn else AC_MSG_ERROR([failed ($GNUMAKE $_make_version need 3.79.1+)]) fi @@ -414,13 +422,13 @@ if test "$_os" = "SunOS"; then _workshop_major=`echo $_workshop_version | $AWK -F. '{ print $1 }'` if test "$_workshop_major" != "5"; then AC_MSG_WARN([found version "$_workshop_version", use version 5.0 or 5.2 of the Sun Workshop C compiler]) - AC_MSG_WARN([found version "$_workshop_version", use version 5.0 or 5.2 of the Sun Workshop C compiler]) >> warn + echo "found version "$_workshop_version", use version 5.0 or 5.2 of the Sun Workshop C compiler" >> warn COMPATH="NO_COMPATH" else _workshop_minor=`echo $_workshop_version | $AWK -F. '{ if ($2 == 0) print "true"; else if ($2 == 2) print "true"; else print "false" }'` if test "$_workshop_minor" = "false"; then AC_MSG_WARN([found version "$_workshop_version", use version 5.0 or 5.2 of the Sun Workshop C compiler]) - AC_MSG_WARN([found version "$_workshop_version", use version 5.0 or 5.2 of the Sun Workshop C compiler]) >> warn + echo "found version "$_workshop_version", use version 5.0 or 5.2 of the Sun Workshop C compiler" >> warn COMPATH="NO_COMPATH" else dnl compiler will do @@ -443,13 +451,13 @@ if test "$_os" = "IRIX" -o "$_os" = "IRI _mipspro_major=`echo $_mipspro_version | $AWK -F. '{ print $1 }'` if test "$_mipspro_major" != "7"; then AC_MSG_WARN([found version "$_mipspro_version", use version 7.2+ of the SGI MIPSpro C compiler]) - AC_MSG_WARN([found version "$_mipspro_version", use version 7.2+ of the SGI MIPSpro C compiler]) >> warn + echo "found version $_mipspro_version, use version 7.2+ of the SGI MIPSpro C compiler" >> warn COMPATH="NO_COMPATH" else _mipspro_minor=`echo $_mipspro_version | $AWK -F. '{ if ($2 <= 1) print "false"; else print "true" }'` if test "$_mipspro_minor" = "false"; then AC_MSG_WARN([found version "$_mipspro_version", use version 7.2+ of the SGI MIPSpro C compiler]) - AC_MSG_WARN([found version "$_mipspro_version", use version 7.2+ of the SGI MIPSpro C compiler]) >> warn + echo "found version $_mipspro_version, use version 7.2+ of the SGI MIPSpro C compiler" >> warn COMPATH="NO_COMPATH" else dnl compiler will do @@ -473,7 +481,7 @@ if test "$_os" = "OSF1"; then _compaqc_major=`echo $_compaqc_version | $AWK -F. '{ print $1 }'` if test "$_compaqc_major" != "T6"; then AC_MSG_WARN([found version "$_compaqc_version", use version 6 of the Compaq C compiler]) - AC_MSG_WARN([found version "$_compaqc_version", use version 6 of the Compaq C compiler]) >> warn + echo "found version "$_compaqc_version", use version 6 of the Compaq C compiler" >> warn COMPATH="NO_COMPATH" else dnl compiler will do @@ -530,7 +538,7 @@ if test "$_os" = "Linux" -o "$_os" = "Fr AC_MSG_RESULT([yes]) else AC_MSG_WARN([pam_appl.h could not be found in /usr/include/security]) - AC_MSG_WARN([pam_appl.h could not be found in /usr/include/security]) >> warn + echo "pam_appl.h could not be found in /usr/include/security" >> warn fi fi @@ -576,7 +584,7 @@ if test "$_os" = "SunOS"; then AC_MSG_CHECKING([Sun Workshop C++ Compiler]) if test "$CXX" != "CC"; then AC_MSG_WARN([Sun Workshop C++ was not found]) - AC_MSG_WARN([Sun Worlshop C++ was not found]) >> warn + echo "Sun Workshop C++ was not found" >> warn else AC_MSG_RESULT([checked]) fi @@ -591,7 +599,7 @@ if test "$_os" = "Darwin"; then AC_MSG_CHECKING([Macosx c++ Compiler]) if test "$CXX" != "c++"; then AC_MSG_WARN([Macosx C++ was not found]) - AC_MSG_WARN([Macosx C++ was not found]) >> warn + echo "Macosx C++ was not found" >> warn else AC_MSG_RESULT([checked]) fi @@ -606,7 +614,7 @@ if test "$_os" = "IRIX" -o "$_os" = "IRI AC_MSG_CHECKING([SGI MIPSpro C++ Compiler]) if test "$CXX" != "CC"; then AC_MSG_WARN([SGI MIPSpro C++ was not found]) - AC_MSG_WARN([SGI MIPSpro C++ was not found]) >> warn + echo "SGI MIPSpro C++ was not found" >> warn else AC_MSG_RESULT([checked]) fi @@ -622,7 +630,7 @@ if test "$_os" = "OSF1"; then _compaqcxx_major=`echo $_compaqcxx_version | $AWK -F. '{ print $1 }'` if test "$_compaqcxx_major" != "V6"; then AC_MSG_WARN([found version "$_compaqc_version", use version 6 of the Compaq C++ compiler]) - AC_MSG_WARN([found version "$_compaqc_version", use version 6 of the Compaq C++ compiler]) >> warn + echo "found version $_compaqc_version, use version 6 of the Compaq C++ compiler" >> warn else dnl compiler will do AC_MSG_RESULT([checked]) @@ -676,7 +684,7 @@ if test "$_os" = "SunOS"; then AC_MSG_RESULT([found]) else AC_MSG_WARN([patch 106327-06 not found, please install compiler patch 106327-06 or greater]) - AC_MSG_WARN([patch 106327-06 not found, please install compiler patch 106327-06 or greater]) >> warn + echo "patch 106327-06 not found, please install compiler patch 106327-06 or greater" >> warn fi dnl *************** dnl patch 106950-11 @@ -698,7 +706,7 @@ if test "$_os" = "SunOS"; then AC_MSG_RESULT([found]) else AC_MSG_WARN([patch 106950-11 not found, please install linker patch 106950-11 or greater]) - AC_MSG_WARN([patch 106950-11 not found, please install linker patch 106950-11 or greater]) >> warn + echo "patch 106950-11 not found, please install linker patch 106950-11 or greater" >> warn fi else if test "$_os_release" = "6"; then @@ -722,7 +730,7 @@ if test "$_os" = "SunOS"; then AC_MSG_RESULT([found]) else AC_MSG_WARN([patch 105591-09 not found, please install compiler patch 105591-09 or greater]) - AC_MSG_WARN([patch 105591-09 not found, please install compiler patch 105591-09 or greater]) >> warn + echo "patch 105591-09 not found, please install compiler patch 105591-09 or greater" >> warn fi dnl *************** dnl patch 107733-08 @@ -744,7 +752,7 @@ if test "$_os" = "SunOS"; then AC_MSG_RESULT([found]) else AC_MSG_WARN([patch 107733-06 not found, please install linker patch 107733-08 or greater]) - AC_MSG_WARN([patch 107733-06 not found, please install linker patch 107733-08 or greater]) >> warn + echo "patch 107733-06 not found, please install linker patch 107733-08 or greater" >> warn fi fi fi @@ -847,32 +855,23 @@ else fi AC_MSG_CHECKING([the installed JDK]) if test "$JAVA"; then - _correct_jdk_exists="false" dnl java -version sends output to stderr! _jdk=`$JAVA -J-version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[-A-Za-z]*//` _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'` if test "$_jdk_ver" -lt 10300; then - AC_MSG_WARN([You need at least jdk-1.3]) - _correct_jdk_exists="false" + AC_MSG_ERROR([You need at least jdk-1.3]) else - _correct_jdk_exists="true" JAVA_HOME=`echo $JAVA | $SED -n "s/\/bin\/javac//p"` AC_MSG_RESULT([checked (JDK $_jdk)]) fi else - _correct_jdk_exists="false" -fi -if test "$_correct_jdk_exists" = "false"; then - JAVA_HOME="NO_JAVA_HOME" - AC_MSG_WARN([Correct jdk not found]) - AC_MSG_WARN([Correct jdk not found]) >> warn + AC_MSG_ERROR([JAVA not found. You need at least jdk-1.3]) fi dnl =================================================================== dnl Checks for specific files. dnl =================================================================== -dnl AC_CHECK_FILE(set_soenv.1) dnl =================================================================== dnl Checks for programs. dnl =================================================================== @@ -1033,18 +1032,18 @@ dnl testing bison and flex exist dnl *************************************** AC_PATH_PROG(BISON, bison) if test -z "$BISON"; then - AC_MSG_WARN([no bison found in \$PATH, install bison]) >> warn + AC_MSG_ERROR([no bison found in \$PATH, install bison]) fi AC_PATH_PROG(FLEX, flex) if test -z "$FLEX"; then - AC_MSG_WARN([no flex found in \$PATH, install flex]) >> warn + AC_MSG_ERROR([no flex found in \$PATH, install flex]) fi dnl *************************************** dnl testing that patch exists dnl *************************************** AC_PATH_PROG(PATCH, patch) if test -z "$PATCH"; then - AC_MSG_WARN([\"patch\" not found in \$PATH, install the development tool named\"patch"\]) >> warn + AC_MSG_ERROR([\"patch\" not found in \$PATH, install the development tool named\"patch"\]) fi dnl *************************************** dnl testing bash tools path on Windows @@ -1131,7 +1130,8 @@ fi if test -z "$ANT"; then - AC_MSG_RESULT([Ant not found - Some Java projects will not build]) + AC_MSG_WARN([Ant not found - Some Java projects will not build]) + echo "Ant not found - Some Java projects will not build" >>warn else AC_MSG_CHECKING([if $ANT works]) cat > conftest.java << EOF @@ -1161,6 +1161,7 @@ EOF cat conftest.java >&5 cat conftest.xml >&5 AC_MSG_WARN([Ant does not work - Some Java projects will not build!]) + echo "Ant does not work - Some Java projects will not build!" >>warn fi rm -f conftest* core core.* *.core @@ -1277,6 +1278,7 @@ AC_SUBST(USE_GCC3) AC_SUBST(PTHREAD_CFLAGS) AC_SUBST(PTHREAD_LIBS) AC_SUBST(ENABLE_DEBUG) +AC_SUBST(ENVCFLAGSCXX) AC_OUTPUT([set_soenv]) Index: set_soenv.in =================================================================== RCS file: /cvs/tools/config_office/set_soenv.in,v retrieving revision 1.4.2.2.4.1 diff -u -b -B -p -r1.4.2.2.4.1 set_soenv.in --- set_soenv.in 27 Feb 2003 14:12:36 -0000 1.4.2.2.4.1 +++ set_soenv.in 18 Mar 2003 13:36:40 -0000 @@ -44,7 +44,7 @@ use File::Basename; # my ( $outfile, $outfile_sh, $bootfile, $newline, $comment, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir, $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $FreeBSD, $NetBSD, $Tru64, $Irix, $Irix64, $Winnt, $Macosx, $MINGWIN32, $USE_SHELL, - $WScomp, $GNUcomp, $platform, $cygwinver, $machine_type, $empty, $no_jdk, $no_ant, $no_stl, $no_tcsh, $no_cl, $no_gcc, $no_gcc_home, $no_gcc_include, + $WScomp, $GNUcomp, $platform, $cygwinver, $machine_type, $empty, $no_jdk, $no_stl, $no_tcsh, $no_cl, $no_gcc, $no_gcc_home, $no_gcc_include, $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $exportvars, $win_format_var, $perl_os); # #------------------------------------------------- @@ -79,7 +79,7 @@ my ( $USR, $ETC, $BIN, $LIB, $INC, $INCL $STLPORT_stlport, $STLPORT_inc_stlport, $PERL_PATH ); # Environment variables. -my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $ANT_HOME, $SHELL, $GCC_HOME, +my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $SHELL, $GCC_HOME, $UPD, $SOLARUPD, $WORK_STAMP, $TF_ONE51, $TF_UCB, $URD_ONLY, $SOLARROOT, $SOLARSRC, $RSCRES, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV, $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI, @@ -87,7 +87,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAV $LD_LIBRARY_PATH, $PATH, $SOLARDEF, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARINCLUDES, $SOLARLIB, $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS, - $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, + $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG ); # #------------------------------------------- @@ -125,7 +125,6 @@ $Winnt = "WINNT"; # re $Macosx = "Darwin"; # return of uname command on Mac OS X/Darwin $empty = ""; # used as argument $no_jdk = "NO_JAVA_HOME"; # possible argument -$no_ant = "NO_ANT_HOME"; # possible argument $no_stl = "NO_STLPORT4"; # possible argument $no_tcsh = "NO_TCSH"; # possible argument $no_cl = "NO_CL"; @@ -390,7 +389,7 @@ elsif ( $platform eq "$Linux" ) { print "Setting Linux Alpha specific values... "; $outfile = "LinuxAlphaEnv.Set"; $CPU = "A"; - $CPUNAME = "ALPHA"; + $CPUNAME = "ALPHA_"; $DLLSUFFIX = "la"; $OUTPATH = "unxlnga"; $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha"; @@ -449,7 +448,7 @@ elsif ( $platform eq "$Tru64" ) $COM = "CXX"; $COMPATH = '@COMPATH@'; $CPU = "A"; - $CPUNAME = "ALPHA"; + $CPUNAME = "ALPHA_"; $CVER = "C62"; $DLLSUFFIX = "t64"; $GUI = "UNX"; @@ -664,7 +663,7 @@ if ($platform eq "$Winnt" and $MINGWIN32 } } if ( '@STLPORT4@' eq $no_stl ) -{ AddWarning( "set_soenv", "No path to STLport was given with the --with-stlport4-home option. The one provided with OOo will be build." ); +{ $STLPORT4 = "$no_stl"; } @@ -720,16 +719,6 @@ if (($platform eq $Linux) or ($platform } } -# Ant Home directory -if ( '@ANT_HOME@' eq $no_ant ) -{ AddWarning( "set_soenv", "Ant was not found in the path. Some Java projects will not build." ); - $ANT_HOME = "$no_ant"; -} -else -{ # ANT_HOME as argument from autoconf. - $ANT_HOME = '@ANT_HOME@'; -} - # # E. Determining the envionment values based on the information # that was gathered earlier on. @@ -1066,6 +1055,8 @@ elsif (($platform eq "$Linux") or ($plat $PATH .= $ps.'$JAVA_HOME'.$BIN; } + $PATH .= $ps.$oldPATH; + if ( $JAVA_HOME ne "" ) { $PATH .= $ps.'$JAVA_HOME'.$BIN; @@ -1073,8 +1064,6 @@ elsif (($platform eq "$Linux") or ($plat $PATH .= GetCorrectPath($COMPATH.$BIN, $PERL_PATH, $TCSH_PATH, $compiler); - - $PATH .= $ps.$oldPATH; } elsif ($platform eq "$Winnt") @@ -1365,7 +1354,7 @@ CreateFileHeader( *OUT_SH, $UPD, $platfo ToFile( "SRC_ROOT", $SRC_ROOT, "e" ); ToFile( "SHELL", $SHELL, "e" ); ToFile( "JAVA_HOME", $JAVA_HOME, "e" ); -ToFile( "ANT_HOME", $ANT_HOME, "e" ); +ToFile( "ANT_HOME", "@ANT_HOME@", "e" ); ToFile( "JDKLIB", $JAVA_LIB, "e" ); ToFile( "STLPORT4", $STLPORT4, "e" ); ToFile( "ASM_PATH", $ASM_PATH, "e" ); @@ -1688,9 +1677,8 @@ ToFile( "CXX", $CXX, if ( $COM ne "MSC" ) { ToFile( "LINK", $CC, "e" ); } +ToFile( "ENVCFLAGSCXX", "@ENVCFLAGSCXX@", "e" ); ToFile( "GXX_INCLUDE_PATH", "@GXX_INCLUDE_PATH@","e" ); -ToFile( "BISON_HAIRY", $BISON_HAIRY, "e" ); -ToFile( "BISON_SIMPLE", $BISON_SIMPLE, "e" ); ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" ); if ($platform ne "$Winnt") { ToFile( "TEMP", $TEMP, "e" ); @@ -1998,7 +1986,7 @@ sub ToFile { if ( $_[ 2 ] eq "e" ) { # Write an environment variable to file. if (defined $_[ 1 ]) - { printf("%-12s %-17s %-10s %-39s\n", "The variable", $_[ 0 ], "is set to:", $_[ 1 ]) ; # to stdout + { printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", $_[ 1 ]) ; # to stdout if (( $platform ne "$Winnt" ) or ( $USE_SHELL ne "4nt" )) { print OUT "$setenv $_[ 0 ] \"$_[ 1 ]\"$newline"; # to tcsh file @@ -2014,7 +2002,7 @@ sub ToFile } } else - { printf("%-12s %-17s %-10s %-39s\n", "The variable", $_[ 0 ], "is set to:", "unset") ; # to stdout + { printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", "unset") ; # to stdout if (( $platform ne "$Winnt" ) or ( $USE_SHELL ne "4nt" )) { $unsetvars .= "$unsetenv $_[ 0 ] >& /dev/null$newline"; # for tcsh file