diff options
| author | Martin Hollmichel <mh@openoffice.org> | 2002-01-14 12:22:39 +0000 |
|---|---|---|
| committer | Martin Hollmichel <mh@openoffice.org> | 2002-01-14 12:22:39 +0000 |
| commit | 2ee7862de63335d40ec4205a9072b1d9b5b2c7f1 (patch) | |
| tree | 046424f6355dd1b67d74f5576a2c8058480062b4 /config_office | |
| parent | b20c5cb43765fe17e0f30bee57b8c07705e75fac (diff) | |
add: mingw32 on cvgnus support
Diffstat (limited to 'config_office')
| -rw-r--r-- | config_office/configure.in | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/config_office/configure.in b/config_office/configure.in index e702e45801f2..9d04881ba4d8 100644 --- a/config_office/configure.in +++ b/config_office/configure.in @@ -104,6 +104,12 @@ AC_ARG_WITH(unzip-home, Usage: --with-unzip-home=<path to unzip.exe directory> ],,) +AC_ARG_WITH(mingwin, +[ --with-mingwin For Windows users, use the mingwin32 compiler + within cygwin environment + + Usage: --with-mingwin=yes +],WITH_MINGWIN=$withval,WITH_MINGWIN=0) AC_ARG_ENABLE(sgistl, [ --enable-sgistl for IRIX users, use this option option to build OpenOffice using SGI's STL. @@ -430,14 +436,18 @@ fi dnl Check if there is a Microsoft C/C++ compiler. if test "$_os" = "WINNT"; then - AC_MSG_CHECKING([the Microsoft C/C++ Compiler]) - if test -x $with_cl_home/bin/cl; then - COMPATH=$with_cl_home - AC_MSG_RESULT([found.]) - else - COMPATH="NO_CL" - AC_MSG_RESULT([not found.]) - fi + if test "$WITH_MINGWIN" != "yes"; then + AC_MSG_CHECKING([the Microsoft C/C++ Compiler]) + if test -x $with_cl_home/bin/cl; then + COMPATH=$with_cl_home + AC_MSG_RESULT([found.]) + else + COMPATH="NO_CL" + AC_MSG_RESULT([not found.]) + fi + else + AC_MSG_CHECKING([the Mingwin32 C++ Compiler]) + fi fi dnl Check if stdc headers are available excluding windows. @@ -991,7 +1001,7 @@ if test -e ../external/gpc/gpc.c; then HAVE_GPC_C="yes" fi -if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then +if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then AC_MSG_RESULT([GPC files found]) else AC_MSG_ERROR([GPC files not found]) @@ -1093,12 +1103,13 @@ echo "\$enable_xprint="$enable_xprint echo "\$with_lang="$with_lang echo "\$with_asm_home="$with_asm_home echo "\$with_unzip_home="$with_unzip_home +echo "\$MINGWIN32="$WITH_MINGWIN echo fi # Executing the set_soenv script to setup the environment variables. if test -z "$enable_check_only"; then - './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home + './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN else echo echo Test Complete |