Index: config_office/set_soenv.in =================================================================== RCS file: /cvs/tools/config_office/set_soenv.in,v retrieving revision 1.4.2.3 diff -u -r1.4.2.3 set_soenv.in --- config_office/set_soenv.in 14 Mar 2003 12:23:13 -0000 1.4.2.3 +++ config_office/set_soenv.in 31 Mar 2003 11:32:23 -0000 @@ -44,7 +44,7 @@ # my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment, $comment4nt, $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_ant, $no_stl, $no_gcc_home, $no_gcc_include, $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $unsetvarsbat, $exportvars, $win_format_var, $perl_os); # #------------------------------------------------- @@ -124,12 +124,8 @@ $Winnt = "WINNT"; # return of uname command on Windows NT $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"; -$no_gcc = "NO_GCC"; $no_gcc_home = "NO_GCC_HOME"; $warnfile = "warn"; # logfile configure warnings. $Warning = ""; # container for warning messages @@ -613,46 +609,20 @@ } # 2. Java home directory. -# Check whether autoconf found the JAVA_HOME directory. -if ( '@JAVA_HOME@' eq $no_jdk ) -{ AddWarning( "set_soenv", "Autoconf did not find correct JDK, prompted for value" ); - $JAVA_HOME = GetValue( "Please enter the Java home directory: " ); - CheckPathExist( $JAVA_HOME ); -} -else -{ # JAVA_HOME as argument from autoconf. - $JAVA_HOME = PosixFormat('@JAVA_HOME@') ; -} +# JAVA_HOME as argument from autoconf. +$JAVA_HOME = PosixFormat('@JAVA_HOME@') ; if ( $platform eq "$Winnt" ) { $JAVA_HOME =~ s/[\s\/]+$//; # remove trailing \n or \/ if there is any. } # 3. Tcsh path. # Check whether autoconf found the Tcsh path. -if ( '@TCSH@' eq $no_tcsh and $USE_SHELL eq "tcsh" ) -{ AddWarning( "set_soenv", "Autoconf did not find tcsh, prompted for value" ); - $SHELL = GetValue( "Please enter the path where tcsh is located: " ); - CheckPathExist( $SHELL ); - $TCSH_PATH = $SHELL; - $SHELL = $SHELL."\/tcsh"; -} -elsif ($USE_SHELL eq "tcsh") +if ($USE_SHELL eq "tcsh") { # SHELL as argument from autoconf. $SHELL = '@TCSH@'."\/tcsh"; $TCSH_PATH = '@TCSH@'; } -# Microsoft C/C++ compiler path for Windows NT users. -if ($platform eq "$Winnt" and $MINGWIN32 ne "yes") -{ if ( '@COMPATH@' eq $no_cl) - { AddWarning( "set_soenv", "Autoconf did not find Microsoft C/C++ compiler, prompted for value" ); - $COMPATH = GetValue( "Please enter the MS-DOS format path for the Microsoft C/C++ compiler home directory: " ); - until ((grep / /, $COMPATH) eq 0) - { printf "No spaces and names < 8 characters in MS-DOS format paths.\n"; - $COMPATH = GetValue( "Please enter the MS-DOS format path for the Microsoft C/C++ compiler home directory: " ); - } - CheckPathExist( $COMPATH ); - } -} + 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"; @@ -660,54 +630,18 @@ # ml.exe assembler path for Windows users. if ($platform eq "$Winnt") -{ if ( '@ASM_HOME@' eq "NO_ASM_HOME" ) - { AddWarning( "set_soenv", "Autoconf did not find ml.exe assembler path, prompted for value" ); - $ASM_PATH = GetValue( "Please enter the path where the ml.exe assembler is located: " ); - CheckPathExist( $ASM_PATH ); - } - else - { $ASM_PATH = PosixFormat('@ASM_HOME@'); - } +{ $ASM_PATH = PosixFormat('@ASM_HOME@'); } # unzip.exe path for Windows users. if ($platform eq "$Winnt") -{ if ( '@UNZIP_HOME@' eq "NO_UNZIP_HOME" ) - { AddWarning( "set_soenv", "Autoconf did not find unzip.exe path, prompted for value" ); - $UNZIP_PATH = GetValue( "Please enter the path where unzip.exe is located: " ); - CheckPathExist( $UNZIP_PATH ); - } - else - { $UNZIP_PATH = PosixFormat('@UNZIP_HOME@'); - } - +{ $UNZIP_PATH = PosixFormat('@UNZIP_HOME@'); } # 4. Gcc path. # Check whether autoconf found the compiler path. if (($platform eq $Linux) or ($platform eq $NetBSD) or ($platform eq $FreeBSD) or ( ($platform eq $Irix ) or ($platform eq $Irix64) and ($compiler eq "gcc")) ) -{ if ( '@COMPATH@' eq $no_gcc) - { AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" ); - printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: "; - my $answer = ; - chomp( $answer ); - if ( $answer eq "y" || $answer eq "Y" ) - { $GCC_HOME = GetValue( "Please enter the gcc 2.95.2 --prefix value: " ); - $result = CheckPathExist( $GCC_HOME ); - if ($result eq "false") - { AddWarning( "set_soenv", "The path $GCC_HOME does not exist on your system." ); - } - else - { $COMPATH = $GCC_HOME."/bin"; - } - } - else - { AddWarning( "set_soenv", "gcc 2.95.2 does not exist on your system." ); - } - } - else - { # GCC_HOME is not needed. +{ # GCC_HOME is not needed. $GCC_HOME = $no_gcc_home; - } } # Ant Home directory @@ -1904,20 +1838,6 @@ # XII. Functions. #----------------- # -#------------------------------------------------------------ -# Function name: GetValue -# Description: Ask the user to enter certain information -# and stores that information in a variable. -# Arguments: 1. Path (string) -# Return value: Path (string) -#------------------------------------------------------------ -sub GetValue -{ my $value; - print "$_[ 0 ]"; - $value = ; - chomp( $value ); # cut off new line - return( CheckPathName( $value ) ); -} #------------------------------------------------------------- # Function name: CheckPathName # Description: chops off the '/' character if it's the last Index: config_office/configure.in =================================================================== RCS file: /cvs/tools/config_office/configure.in,v retrieving revision 1.49.2.3 diff -u -r1.49.2.3 configure.in --- config_office/configure.in 14 Mar 2003 12:22:51 -0000 1.49.2.3 +++ config_office/configure.in 31 Mar 2003 11:32:24 -0000 @@ -329,28 +329,20 @@ USE_GCC3="FALSE" 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" + AC_MSG_ERROR([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) 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" + 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" + AC_MSG_ERROR([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) fi fi fi fi - if test "$COMPATH" != "NO_GCC"; then - AC_MSG_RESULT([checked (gcc $_gcc_version)]) - fi + AC_MSG_RESULT([checked (gcc $_gcc_version)]) dnl Set the include paths _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include @@ -413,15 +405,11 @@ fi _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 - COMPATH="NO_COMPATH" + AC_MSG_ERROR([found version "$_workshop_version", use version 5.0 or 5.2 of the Sun Workshop C compiler]) 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 - COMPATH="NO_COMPATH" + AC_MSG_ERROR([found version "$_workshop_version", use version 5.0 or 5.2 of the Sun Workshop C compiler]) else dnl compiler will do AC_MSG_RESULT([checked]) @@ -442,15 +430,11 @@ _mipspro_version=`$CC -version 2>&1 | $AWK '{ print $4 }'` _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 - COMPATH="NO_COMPATH" + AC_MSG_ERROR([found version "$_mipspro_version", use version 7.2+ of the SGI MIPSpro C compiler]) 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 - COMPATH="NO_COMPATH" + AC_MSG_ERROR([found version "$_mipspro_version", use version 7.2+ of the SGI MIPSpro C compiler]) else dnl compiler will do AC_MSG_RESULT([checked]) @@ -472,9 +456,7 @@ _compaqc_version=`$CC -V 2>&1 | $AWK '{ print $3 }'` _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 - COMPATH="NO_COMPATH" + AC_MSG_ERROR([found version "$_compaqc_version", use version 6 of the Compaq C compiler]) else dnl compiler will do AC_MSG_RESULT([checked]) @@ -508,8 +490,7 @@ fi AC_MSG_RESULT([found.]) else - COMPATH="NO_CL" - AC_MSG_RESULT([not found.]) + AC_MSG_ERROR([Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe.]) fi else AC_MSG_CHECKING([the Mingwin32 C++ Compiler]) @@ -865,9 +846,7 @@ _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([Correct jdk not found]) fi dnl =================================================================== dnl Checks for specific files. @@ -925,13 +904,12 @@ AC_PATH_PROG(TCSH, tcsh) if test -z "$TCSH"; then AC_MSG_ERROR([tcsh not found in \$PATH]) - TCSH="NO_TCSH"; else TCSH=`echo $TCSH | $SED -n "s/\/tcsh//p"` fi else AC_MSG_WARN([Windows / Cygwin b2x does not have tcsh]) - TCSH="NO_TCSH" + TCSH="NO_TCSH_NEEDED" fi dnl =================================================================== @@ -1060,13 +1038,13 @@ if test ! -x "$with_asm_home/ml.exe"; then AC_PATH_PROG(ML_EXE, ml.exe) if test -z "$ML_EXE"; then - with_asm_home="NO_ASM_HOME" + AC_MSG_ERROR([Configure did not find ml.exe assembler.]) else with_asm_home="ASM_IN_PATH" fi fi else - with_asm_home="NO_ASM_HOME" + AC_MSG_ERROR([Configure did not find ml.exe assembler.]) fi dnl *************************************** dnl testing unzip.exe path @@ -1093,7 +1071,7 @@ fi fi else - with_unzip_home="NO_UNZIP_HOME" + AC_MSG_ERROR([Configure did not find zip.exe.]) fi dnl =================================================================== @@ -1180,7 +1158,7 @@ upd=`grep RSCVERSION= ../solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'` if test -z "$COMPATH"; then - COMPATH="NO_COMPATH" + AC_MSG_ERROR([No compiler found.]) fi if test -z "$_gcc_include_path"; then _gcc_include_path="NO_GCC_INCLUDE" @@ -1189,19 +1167,19 @@ _gxx_include_path="NO_GXX_INCLUDE" fi if test -z "$JAVA_HOME"; then - JAVA_HOME="NO_JAVA_HOME" + AC_MSG_ERROR([No java found.]) fi if test -z "$ANT_HOME"; then ANT_HOME="NO_ANT_HOME" fi if test -z "$TCSH"; then - TCSH="NO_TCSH" + AC_MSG_ERROR([No tcsh found.]) fi if test -z "$STLPORT4"; then STLPORT4="NO_STLPORT4" fi if test -z "$PERL"; then - PERL="NO_PERL" + AC_MSG_ERROR([No perl found.]) fi if test -z "$x_libraries"; then x_libraries="no_x_libraries"