Index: configure.in =================================================================== RCS file: /cvs/tools/config_office/configure.in,v retrieving revision 1.54.2.8 diff -p -r1.54.2.8 configure.in *** configure.in 17 Jul 2003 13:45:37 -0000 1.54.2.8 --- configure.in 18 Jul 2003 13:30:17 -0000 *************** dnl * vi:set sw=3 ts=3 et: *** 3,9 **** dnl * dnl * Name: configure.in dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland ! dnl * Date: May 2000 dnl * dnl * Desc: This file serves as input for the GNU autoconf package dnl * in order to create a configure script. --- 3,9 ---- dnl * dnl * Name: configure.in dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland ! dnl * Date: $Date$ dnl * dnl * Desc: This file serves as input for the GNU autoconf package dnl * in order to create a configure script. *************** AC_ARG_WITH(os-version, *** 173,182 **** Usage: --with-os-version= ],,) AC_ARG_WITH(unzip-home, ! [ --with-unzip-home For Windows users, please supply the path for ! unzip.exe. ! Usage: --with-unzip-home= ],,) AC_ARG_WITH(mingwin, [ --with-mingwin For Windows users, use the mingwin32 compiler within --- 173,184 ---- Usage: --with-os-version= ],,) AC_ARG_WITH(unzip-home, ! [ --with-unzip-home Deprecated: use --with-zip-home instead],,) ! AC_ARG_WITH(zip-home, ! [ --with-zip-home If you use a non standard zip, for example windows ! please supply the path for zip ! Usage: --with-zip-home= ],,) AC_ARG_WITH(mingwin, [ --with-mingwin For Windows users, use the mingwin32 compiler within *************** esac *** 300,305 **** --- 302,310 ---- AC_MSG_RESULT([checked ($_os)]) + AC_SUBST(PTHREAD_CFLAGS) + AC_SUBST(PTHREAD_LIBS) + dnl =================================================================== dnl First setting is whether to include symbols into final build. dnl =================================================================== *************** else *** 315,320 **** --- 320,326 ---- ENVCFLAGS="" fi fi + AC_SUBST(ENVCFLAGSCXX) dnl =================================================================== dnl Set the ENABLE_CRASHDUMP variable. *************** else *** 332,337 **** --- 338,344 ---- fi fi fi + AC_SUBST(ENABLE_CRASHDUMP) dnl =================================================================== dnl WINNT uses either 4nt or tcsh, all other O/S use tcsh. *************** else *** 390,395 **** --- 397,404 ---- fi fi fi + USE_SHELL="$with_use_shell" + AC_SUBST(USE_SHELL) _machine_type=`uname -m` *************** if test "$GCC" = "yes"; then *** 460,465 **** --- 469,475 ---- fi AC_MSG_RESULT([checked (gcc $_gcc_version)]) fi + AC_SUBST(USE_GCC3) dnl =================================================================== dnl Search all the common names for GNU make *************** else *** 501,506 **** --- 511,517 ---- fi fi fi + AC_SUBST(GNUMAKE) dnl =================================================================== dnl Test the solaris compiler version *************** dnl ==================================== *** 508,514 **** if test "$_os" = "SunOS"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) ! COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"` AC_MSG_CHECKING([the SUN Workshop C compiler version]) dnl cc -V outputs to standard error!!!! _workshop_version=`$CC -V 2>&1 | $AWK '/^cc/ { print $7 }'` --- 519,525 ---- if test "$_os" = "SunOS"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) ! COMPATH=`echo $_cc | $SED -n "s/\/cc//p"` AC_MSG_CHECKING([the SUN Workshop C compiler version]) dnl cc -V outputs to standard error!!!! _workshop_version=`$CC -V 2>&1 | $AWK '/^cc/ { print $7 }'` *************** dnl ==================================== *** 536,542 **** if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) ! COMPATH=`echo $_cc | $SED -n "s/\/usr\/bin\/cc//p"` AC_MSG_CHECKING([the SGI MIPSpro C compiler version]) dnl cc -version outputs to standard error!!!! _mipspro_version=`$CC -version 2>&1 | $AWK '{ print $4 }'` --- 547,553 ---- if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) ! COMPATH=`echo $_cc | $SED -n "s/\/cc//p"` AC_MSG_CHECKING([the SGI MIPSpro C compiler version]) dnl cc -version outputs to standard error!!!! _mipspro_version=`$CC -version 2>&1 | $AWK '{ print $4 }'` *************** dnl ==================================== *** 561,567 **** if test "$_os" = "OSF1"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) ! COMPATH=`echo $_cc | $SED -n "s/\/usr\/bin\/cc//p"` AC_MSG_WARN([******* $_cc , $COMPATH]) AC_MSG_CHECKING([the Compaq C compiler version]) dnl cc -V outputs to standard error!!!! --- 572,578 ---- if test "$_os" = "OSF1"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) ! COMPATH=`echo $_cc | $SED -n "s/\/cc//p"` AC_MSG_WARN([******* $_cc , $COMPATH]) AC_MSG_CHECKING([the Compaq C compiler version]) dnl cc -V outputs to standard error!!!! *************** if test "$_os" = "WINNT"; then *** 637,642 **** --- 648,654 ---- fi fi fi + AC_SUBST(COMEX) dnl =================================================================== dnl Check if stdc headers are available excluding windows. *************** dnl This is the original code... *** 699,704 **** --- 711,721 ---- dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include fi fi + if test -z "$_gxx_include_path"; then + _gxx_include_path="NO_GXX_INCLUDE" + fi + GXX_INCLUDE_PATH="$_gxx_include_path" + AC_SUBST(GXX_INCLUDE_PATH) dnl =================================================================== dnl Extra checking for the SUN OS compiler *************** extern "C" void __sjthrow(void) __attrib *** 781,786 **** --- 798,805 ---- AC_MSG_RESULT(Exceptions type: $exceptions_type) AC_LANG_RESTORE + EXCEPTIONS="$exceptions_type" + AC_SUBST(EXCEPTIONS) dnl ************************************************************** dnl Testing for required Solaris and workshop compiler patches... *************** if test -n "$enable_sgistl"; then *** 906,920 **** AC_MSG_RESULT([not found.]) fi else ! AC_MSG_ERROR([IRIX not found.]) fi else dnl =================================================================== dnl Checks for STLPORT4 dnl =================================================================== ! AC_MSG_CHECKING([for STLport4 headers]) ! if test -d "$with_stlport4_home"; then STLPORT4=$with_stlport4_home if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then AC_TRY_CPP($STLPORT4/stlport/hash_map, AC_MSG_RESULT([checked.]), AC_MSG_ERROR([STLport4 headers not found.])) --- 925,939 ---- AC_MSG_RESULT([not found.]) fi else ! AC_MSG_ERROR([Option --enable-sgistl is only valid for IRIX]) fi else dnl =================================================================== dnl Checks for STLPORT4 dnl =================================================================== ! AC_MSG_CHECKING([for STLport4 headers]) ! if test -d "$with_stlport4_home"; then STLPORT4=$with_stlport4_home if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then AC_TRY_CPP($STLPORT4/stlport/hash_map, AC_MSG_RESULT([checked.]), AC_MSG_ERROR([STLport4 headers not found.])) *************** if test -d "$with_stlport4_home"; then *** 958,968 **** fi fi fi ! else AC_MSG_RESULT([using internal stlport.]) fi fi dnl =================================================================== dnl Checks for JDK. dnl =================================================================== --- 977,992 ---- fi fi fi ! else AC_MSG_RESULT([using internal stlport.]) + fi fi + if test -z "$STLPORT4"; then + STLPORT4="NO_STLPORT4" fi + AC_SUBST(STLPORT4) + dnl =================================================================== dnl Checks for JDK. dnl =================================================================== *************** if test "$JAVA"; then *** 994,999 **** --- 1018,1025 ---- else AC_MSG_ERROR([JAVA not found. You need at least jdk-1.3]) fi + AC_SUBST(JAVA_HOME) + dnl =================================================================== dnl Checks for specific files. dnl =================================================================== *************** dnl Check whether there's a C++ pre-proc *** 1008,1017 **** if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then AC_PROG_CXXCPP fi - dnl Check for a BSD compatible install program. - dnl AC_PROG_INSTALL - dnl Check whether ln -s works on the current file system. - dnl AC_PROG_LN_S dnl =================================================================== dnl Check whether xmkmf program can be used, x systems only --- 1034,1039 ---- *************** if test "$test_x" = "yes"; then *** 1021,1028 **** if test -z "$XMKMF"; then AC_MSG_ERROR([install xmkmf to run this script, include openwin in path]) fi - else - echo "Skipping xmkmf test $test_x" fi dnl =================================================================== --- 1043,1048 ---- *************** if test "$PERL"; then *** 1054,1059 **** --- 1074,1080 ---- else AC_MSG_ERROR([Perl not found, install version 5 of Perl]) fi + AC_SUBST(PERL) dnl =================================================================== dnl Check whether the tcsh can be used. *************** else *** 1069,1074 **** --- 1090,1097 ---- AC_MSG_WARN([Windows 4NT builds don't need tcsh]) TCSH="NO_TCSH_NEEDED" fi + AC_SUBST(TCSH) + dnl =================================================================== dnl Check whether the gtk 2.0 libraries are available. dnl =================================================================== *************** else *** 1132,1137 **** --- 1155,1171 ---- x_includes="no_x_includes" x_libraries="no_x_libraries" fi + if test -z "$x_includes"; then + x_includes="no_x_includes" + fi + if test -z "$x_libraries"; then + x_libraries="no_x_libraries" + fi + XINC="$x_includes" + AC_SUBST(XINC) + XLIB="$x_libraries" + AC_SUBST(XLIB) + dnl *************************************** dnl testing libc version for Linux... dnl *************************************** *************** if test \( "$_os" = "WINNT" \) ; then *** 1176,1181 **** --- 1210,1217 ---- AC_MSG_ERROR([PSDK files not found, please use --with-psdk-home .]) fi fi + AC_SUBST(PSDK_HOME) + dnl *************************************** dnl testing bison and flex exist dnl *************************************** *************** dnl We also need to check for --with-gnu *** 1219,1224 **** --- 1255,1262 ---- fi fi fi + AC_SUBST(GNUPATCH) + AC_SUBST(GNUCP) dnl *************************************** dnl testing bash tools path on Windows *************** if test "$_os" = "WINNT"; then *** 1227,1232 **** --- 1265,1275 ---- AC_PATH_PROG(CYGWIN, bash) CYGWIN=`dirname $CYGWIN` fi + if test -z "$CYGWIN"; then + CYGWIN="NO_CYGWIN" + fi + AC_SUBST(CYGWIN) + dnl *************************************** dnl testing ml.exe assembler path dnl *************************************** *************** if test "$_os" = "WINNT" -a "$WITH_MINGW *** 1242,1277 **** else with_asm_home="NO_ASM_HOME" fi ! dnl *************************************** ! dnl testing unzip.exe path ! dnl *************************************** if test "$_os" = "WINNT"; then ! # We are looking for zip, not unzip. All occurences should ! # change from UNZIP to ZIP ! if test ! -x "$with_unzip_home/zip.exe"; then ! AC_PATH_PROG(ZIP_EXE, zip.exe) ! if test -z "$ZIP_EXE"; then ! with_unzip_home="NO_UNZIP_HOME" ! else ! if test "$with_use_shell" = "4nt" ; then ! if test -z "`$ZIP_EXE -h | grep -i WinNT`" ; then ! AC_MSG_ERROR([$ZIP_EXE found in the path is not the required native Windows Version 2.3 of Info-ZIPs zip.exe. Probably there is a cygwin version in the path.]) fi ! else ! if test -n "`$ZIP_EXE -h | grep -i WinNT`" ; then ! AC_MSG_ERROR([$ZIP_EXE found in the path is not the required cygwin version of Info-ZIPs zip.exe.]) fi ! fi ! with_unzip_home="UNZIP_IN_PATH" ! fi ! fi ! else ! with_unzip_home="NO_UNZIP_HOME" fi dnl =================================================================== ! dnl Test for the presence of the right polgyon clipping code dnl =================================================================== WITH_GPC=NO --- 1285,1335 ---- else with_asm_home="NO_ASM_HOME" fi ! ASM_HOME="$with_asm_home" ! AC_SUBST(ASM_HOME) ! ! dnl =================================================================== ! dnl testing handle deprecated unzip switch ! dnl =================================================================== ! if test -z "$with_zip_home"; then ! with_zip_home="$with_unzip_home" ! fi ! dnl =================================================================== ! dnl Zip will be found where you tell me to find it ! dnl =================================================================== ! if test -n "$with_zip_home" ; then ! ZIP="$with_zip_home/zip" ! ZIP_HOME="$with_zip_home" ! else ! ZIP_HOME="ZIP_IN_PATH" ! fi ! dnl =================================================================== ! dnl Zip must be available or else it is an error, all platforms ! dnl =================================================================== ! AC_PATH_PROG(ZIP, zip) ! if test -z "$ZIP"; then ! AC_MSG_ERROR([Zip is required to build, please install or use --with-zip-home],,) ! fi ! ! dnl =================================================================== ! dnl Zip must be a specific type for different build types. ! dnl =================================================================== if test "$_os" = "WINNT"; then ! if test "$with_use_shell" = "4nt" ; then ! if test -z "`$ZIP -h | grep -i WinNT`" ; then ! AC_MSG_ERROR([$ZIP found in the path is not the required native Windows Version 2.3 of Info-ZIPs zip.exe. Probably there is a cygwin version in the path.]) fi ! else ! if test -n "`$ZIP -h | grep -i WinNT`" ; then ! AC_MSG_ERROR([$ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe.]) fi ! fi fi + AC_SUBST(ZIP_HOME) dnl =================================================================== ! dnl Test for the presence of the right polygon clipping code dnl =================================================================== WITH_GPC=NO *************** WITH_LIBART=NO *** 1279,1286 **** if test -n "$enable_libart"; then PKG_CHECK_MODULES( LIBART, libart-2.0 >= 2.3.13 ) - AC_SUBST(LIBART_CFLAGS) - AC_SUBST(LIBART_LIBS) WITH_LIBART=YES elif test "$with_gpc" != "no" ; then --- 1337,1342 ---- *************** elif test "$with_gpc" != "no" ; then *** 1302,1310 **** AC_MSG_RESULT([GPC files found]) else AC_MSG_ERROR([GPC files not found ! ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z and untar in external/gpc, or use --enable-libart]) fi fi dnl =================================================================== dnl Test for the presence of libstartup-notification --- 1358,1371 ---- AC_MSG_RESULT([GPC files found]) else AC_MSG_ERROR([GPC files not found ! ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z and untar in external/gpc, ! or install libart and use --enable-libart]) fi fi + AC_SUBST(WITH_LIBART) + AC_SUBST(LIBART_CFLAGS) + AC_SUBST(LIBART_LIBS) + AC_SUBST(WITH_GPC) dnl =================================================================== dnl Test for the presence of libstartup-notification *************** dnl ==================================== *** 1313,1322 **** WITH_LIBSN=NO if test -n "$enable_libsn"; then PKG_CHECK_MODULES( LIBSN, libstartup-notification-1.0 >= 0.5 ) - AC_SUBST(LIBSN_CFLAGS) - AC_SUBST(LIBSN_LIBS) WITH_LIBSN=YES fi dnl =================================================================== dnl Test for the presence of Ant and that it works --- 1374,1384 ---- WITH_LIBSN=NO if test -n "$enable_libsn"; then PKG_CHECK_MODULES( LIBSN, libstartup-notification-1.0 >= 0.5 ) WITH_LIBSN=YES fi + AC_SUBST(WITH_LIBSN) + AC_SUBST(LIBSN_CFLAGS) + AC_SUBST(LIBSN_LIBS) dnl =================================================================== dnl Test for the presence of Ant and that it works *************** EOF *** 1367,1372 **** --- 1429,1438 ---- rm -f conftest* core core.* *.core fi + if test -z "$ANT_HOME"; then + ANT_HOME="NO_ANT_HOME" + fi + AC_SUBST(ANT_HOME) dnl =================================================================== *************** echo "* *** 1379,1505 **** echo "********************************************************************" # Get UPD number from ../solenv/inc/minor.mk ! upd=`grep RSCVERSION= ../solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'` if test -z "$COMPATH"; then AC_MSG_ERROR([No compiler found.]) fi ! if test -z "$_gxx_include_path"; then ! _gxx_include_path="NO_GXX_INCLUDE" ! fi ! if test -z "$JAVA_HOME"; then ! AC_MSG_ERROR([No java found.]) ! fi ! if test -z "$ANT_HOME"; then ! ANT_HOME="NO_ANT_HOME" ! fi ! if test -z "$TCSH"; then ! AC_MSG_ERROR([No tcsh found.]) ! fi ! if test -z "$STLPORT4"; then ! STLPORT4="NO_STLPORT4" ! fi ! if test -z "$PERL"; then ! AC_MSG_ERROR([No perl found.]) ! fi ! if test -z "$x_libraries"; then ! x_libraries="no_x_libraries" ! fi ! if test -z "$x_includes"; then ! x_includes="no_x_includes" ! fi if test -z "$with_local_solenv"; then LOCAL_SOLENV="DEFAULT" else LOCAL_SOLENV=$with_local_solenv fi if test -z "$with_local_solver"; then LOCAL_SOLVER="DEFAULT" else LOCAL_SOLVER=$with_local_solver fi ! if test -z "$CYGWIN"; then ! CYGWIN="NO_CYGWIN" ! fi if test -z "$with_lang"; then ! with_lang=,ENUS, else ! with_lang=","$with_lang"," fi if test -z "$with_dict"; then ! with_dict=,ALL, else ! with_dict=","$with_dict"," fi if test -n "$enable_debug"; then ENABLE_DEBUG="TRUE" else ENABLE_DEBUG="FALSE" fi if test -n "$enable_static_gtk"; then ENABLE_STATIC_GTK="TRUE" else ENABLE_STATIC_GTK="FALSE" fi dnl =================================================================== dnl Bits to substitute into set_soenv.in dnl =================================================================== ! AC_SUBST(ANT_HOME) ! AC_SUBST(COMPATH) ! GXX_INCLUDE_PATH="$_gxx_include_path" ! AC_SUBST(GXX_INCLUDE_PATH) GCC_HOME="$with_gcc_home" AC_SUBST(GCC_HOME) ! AC_SUBST(GNUMAKE) ! AC_SUBST(JAVA_HOME) ! AC_SUBST(TCSH) ! AC_SUBST(PERL) ! XLIB="$x_libraries" ! AC_SUBST(XLIB) ! XINC="$x_includes" ! AC_SUBST(XINC) ! AC_SUBST(LOCAL_SOLENV) ! AC_SUBST(LOCAL_SOLVER) ! UPD="$upd" ! AC_SUBST(UPD) ! AC_SUBST(CYGWIN) ! AC_SUBST(COMEX) ! AC_SUBST(STLPORT4) ! WITH_LANG="$with_lang" ! AC_SUBST(WITH_LANG) ! WITH_DICT="$with_dict" ! AC_SUBST(WITH_DICT) ! AC_SUBST(PSDK_HOME) ! ASM_HOME="$with_asm_home" ! AC_SUBST(ASM_HOME) ! UNZIP_HOME="$with_unzip_home" ! AC_SUBST(UNZIP_HOME) AC_SUBST(WITH_MINGWIN) - USE_SHELL="$with_use_shell" - AC_SUBST(USE_SHELL) - EXCEPTIONS="$exceptions_type" - AC_SUBST(EXCEPTIONS) OSVERSION="$with_os_version" AC_SUBST(OSVERSION) - AC_SUBST(USE_GCC3) - AC_SUBST(PTHREAD_CFLAGS) - AC_SUBST(PTHREAD_LIBS) - AC_SUBST(ENABLE_DEBUG) - AC_SUBST(ENABLE_STATIC_GTK) - AC_SUBST(ENVCFLAGSCXX) - AC_SUBST(ENABLE_CRASHDUMP) - AC_SUBST(WITH_GPC) - AC_SUBST(WITH_LIBART) - AC_SUBST(LIBART_CFLAGS) - AC_SUBST(LIBART_LIBS) - AC_SUBST(WITH_LIBSN) - AC_SUBST(LIBSN_CFLAGS) - AC_SUBST(LIBSN_LIBS) - AC_SUBST(GNUPATCH) - AC_SUBST(GNUCP) AC_OUTPUT([set_soenv]) --- 1445,1510 ---- echo "********************************************************************" # Get UPD number from ../solenv/inc/minor.mk ! UPD="`grep RSCVERSION= ../solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`" ! AC_SUBST(UPD) if test -z "$COMPATH"; then AC_MSG_ERROR([No compiler found.]) fi ! AC_SUBST(COMPATH) ! if test -z "$with_local_solenv"; then LOCAL_SOLENV="DEFAULT" else LOCAL_SOLENV=$with_local_solenv fi + AC_SUBST(LOCAL_SOLENV) + if test -z "$with_local_solver"; then LOCAL_SOLVER="DEFAULT" else LOCAL_SOLVER=$with_local_solver fi ! AC_SUBST(LOCAL_SOLVER) ! if test -z "$with_lang"; then ! WITH_LANG=,ENUS, else ! WITH_LANG=","$with_lang"," fi + AC_SUBST(WITH_LANG) + if test -z "$with_dict"; then ! WITH_DICT=,ALL, else ! WITH_DICT=","$with_dict"," fi + AC_SUBST(WITH_DICT) if test -n "$enable_debug"; then ENABLE_DEBUG="TRUE" else ENABLE_DEBUG="FALSE" fi + AC_SUBST(ENABLE_DEBUG) if test -n "$enable_static_gtk"; then ENABLE_STATIC_GTK="TRUE" else ENABLE_STATIC_GTK="FALSE" fi + AC_SUBST(ENABLE_STATIC_GTK) dnl =================================================================== dnl Bits to substitute into set_soenv.in dnl =================================================================== ! GCC_HOME="$with_gcc_home" AC_SUBST(GCC_HOME) ! AC_SUBST(WITH_MINGWIN) OSVERSION="$with_os_version" AC_SUBST(OSVERSION) AC_OUTPUT([set_soenv]) Index: set_soenv.in =================================================================== RCS file: /cvs/tools/config_office/set_soenv.in,v retrieving revision 1.9.2.6 diff -p -r1.9.2.6 set_soenv.in *** set_soenv.in 17 Jul 2003 13:21:22 -0000 1.9.2.6 --- set_soenv.in 18 Jul 2003 13:30:22 -0000 *************** *** 1,8 **** #!@PERL@ -w # # Program: set_soenv.in ! # Version: 0.1 ! # Date: 07-06-2000 # Author: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems, Ireland. # #--------------------------------------------------------------------------- --- 1,8 ---- #!@PERL@ -w # # Program: set_soenv.in ! # Version: $Revision$ ! # Date: $Date$ # Author: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems, Ireland. # #--------------------------------------------------------------------------- *************** my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CV *** 73,79 **** my ( $USR, $ETC, $BIN, $LIB, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG, $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE, $SOLARENVINC, $USR_DT, $USR_OPENWIN, $TCSH_PATH, $XLIB, $XINC, ! $CYGWIN, $language, $dict, $ASM_PATH, $UNZIP_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB, $STLPORT_stlport, $STLPORT_inc_stlport, $PERL_PATH ); # Environment variables. --- 73,79 ---- my ( $USR, $ETC, $BIN, $LIB, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG, $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE, $SOLARENVINC, $USR_DT, $USR_OPENWIN, $TCSH_PATH, $XLIB, $XINC, ! $CYGWIN, $language, $dict, $ASM_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB, $STLPORT_stlport, $STLPORT_inc_stlport, $PERL_PATH ); # Environment variables. *************** $L = " -L"; # li *** 115,121 **** $D = " -D"; # define search path $Solaris = "SunOS"; # return of uname command on Solaris $Linux = "Linux"; # return of uname command on Linux ! $NetBSD = "NetBSD"; # return of uname command on NetBSD $FreeBSD = "FreeBSD"; # return of uname command on FreeBSD $Tru64 = "OSF1"; # return of uname command of Tru64 $Irix = "IRIX"; # return of uname command of Irix on a 32 bit platform --- 115,121 ---- $D = " -D"; # define search path $Solaris = "SunOS"; # return of uname command on Solaris $Linux = "Linux"; # return of uname command on Linux ! $NetBSD = "NetBSD"; # return of uname command on NetBSD $FreeBSD = "FreeBSD"; # return of uname command on FreeBSD $Tru64 = "OSF1"; # return of uname command of Tru64 $Irix = "IRIX"; # return of uname command of Irix on a 32 bit platform *************** $Winnt = "WINNT"; # re *** 124,142 **** $Macosx = "Darwin"; # return of uname command on Mac OS X/Darwin $empty = ""; # used as argument $no_ant = "NO_ANT_HOME"; # possible argument ! $no_stl = "NO_STLPORT4"; # possible argument $no_gcc_home = "NO_GCC_HOME"; $warnfile = "warn"; # logfile configure warnings. $Warning = ""; # container for warning messages ! $STLPORT4 = '@STLPORT4@'; # Location of STLport4 ! $MINGW = '@WITH_MINGWIN@'; # use MinGW for Windows build ! $USE_GCC3 = '@USE_GCC3@'; # use gcc3 (only for unxlngi4 and unxfbsd5i at the moment) ! $CC = '@CC@'; # C compiler ! $CXX = '@CXX@'; # C++ compiler ! $EXCEPTIONS = '@EXCEPTIONS@'; # Exception handling type ! $ENABLE_DEBUG = '@ENABLE_DEBUG@'; # Enable a debug build $ENABLE_STATIC_GTK = '@ENABLE_STATIC_GTK@'; # Use static gtk libraries ! $WRAPCMD = ""; # Wrapper (only for winnt) # #--------------------------------------------------------------- --- 124,142 ---- $Macosx = "Darwin"; # return of uname command on Mac OS X/Darwin $empty = ""; # used as argument $no_ant = "NO_ANT_HOME"; # possible argument ! $no_stl = "NO_STLPORT4"; # possible argument $no_gcc_home = "NO_GCC_HOME"; $warnfile = "warn"; # logfile configure warnings. $Warning = ""; # container for warning messages ! $STLPORT4 = '@STLPORT4@'; # Location of STLport4 ! $MINGW = '@WITH_MINGWIN@'; # use MinGW for Windows build ! $USE_GCC3 = '@USE_GCC3@'; # use gcc3 (only for unxlngi4 and unxfbsd5i at the moment) ! $CC = '@CC@'; # C compiler ! $CXX = '@CXX@'; # C++ compiler ! $EXCEPTIONS = '@EXCEPTIONS@'; # Exception handling type ! $ENABLE_DEBUG = '@ENABLE_DEBUG@'; # Enable a debug build $ENABLE_STATIC_GTK = '@ENABLE_STATIC_GTK@'; # Use static gtk libraries ! $WRAPCMD = ""; # Wrapper (only for winnt) # #--------------------------------------------------------------- *************** if ( '@STLPORT4@' eq $no_stl ) *** 646,655 **** if ($platform eq "$Winnt") { $ASM_PATH = PosixFormat('@ASM_HOME@'); } - # unzip.exe path for Windows users. - if ($platform eq "$Winnt") - { $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 --- 646,651 ---- *************** if ($platform eq "$Solaris") *** 984,990 **** $PATH .= $ps.'$JAVA_HOME'.$BIN; } ! $PATH .= GetCorrectPath($COMPATH.$BIN, $PERL_PATH, $TCSH_PATH, $compiler); $PATH .= $ps.$oldPATH; } --- 980,986 ---- $PATH .= $ps.'$JAVA_HOME'.$BIN; } ! $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler); $PATH .= $ps.$oldPATH; } *************** elsif (($platform eq "$Linux") or ($plat *** 999,1013 **** { $PATH .= $ps.'$JAVA_HOME'.$BIN; } - $PATH .= $ps.$oldPATH; ! if ( $JAVA_HOME ne "" ) ! { ! $PATH .= $ps.'$JAVA_HOME'.$BIN; ! } ! ! $PATH .= GetCorrectPath($COMPATH.$BIN, $PERL_PATH, $TCSH_PATH, $compiler); } --- 995,1003 ---- { $PATH .= $ps.'$JAVA_HOME'.$BIN; } $PATH .= $ps.$oldPATH; ! $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler); } *************** if ( $COM eq "MSC" ) *** 1087,1094 **** if ( ($COM eq "MSC") && ($ASM_PATH ne "ASM_IN_PATH") ) { $PATH .= $ps.'${ASM_PATH}'; } ! if ($UNZIP_PATH ne "UNZIP_IN_PATH") ! { $PATH .= $ps.'${UNZIP_PATH}'; } # Check if $CYGWIN is already set in PATH if ( ! $noldPATH =~ /(?:[:]|\A)(?:$CYGWIN)(?:[:]|\Z)/ ) --- 1077,1086 ---- if ( ($COM eq "MSC") && ($ASM_PATH ne "ASM_IN_PATH") ) { $PATH .= $ps.'${ASM_PATH}'; } ! # unzip.exe path for Windows users. ! if( "@ZIP_HOME@" ne "ZIP_IN_PATH") ! { ! $PATH .= $ps.PosixFormat('@ZIP_HOME@'); } # Check if $CYGWIN is already set in PATH if ( ! $noldPATH =~ /(?:[:]|\A)(?:$CYGWIN)(?:[:]|\Z)/ ) *************** if ($platform eq "$Solaris") *** 1192,1199 **** $SOLARINC .= '/SC5 '; } # Platform dependent include path at the top of this list of include paths ! if ($platform eq "$Solaris") ! { $SOLARINC .= $I.'$COMPATH'.$ds."include"; } if ($platform eq "$Linux") --- 1184,1193 ---- $SOLARINC .= '/SC5 '; } # Platform dependent include path at the top of this list of include paths ! if ($platform eq "$Solaris") ! { my $temp; ! $temp =~ s:$COMPATH:/bin\$:; ! $SOLARINC .= $I.$temp.$ds."include"; } if ($platform eq "$Linux") *************** ToFile( "ANT_HOME", "@ANT_HOME@ *** 1318,1324 **** ToFile( "JDKLIB", $JAVA_LIB, "e" ); ToFile( "STLPORT4", $STLPORT4, "e" ); ToFile( "ASM_PATH", $ASM_PATH, "e" ); - ToFile( "UNZIP_PATH", $UNZIP_PATH, "e" ); ToFile( "Empty", $empty, "n" ); ToFile( "BUILD_SOSL", $BUILD_SOSL, "e" ); ToFile( "LOCAL_SOLENV", $LOCAL_SOLENV, "e" ); --- 1312,1317 ----