--- oo_1.0_src/config_office/configure.in~~	Thu May  2 16:48:20 2002
+++ oo_1.0_src/config_office/configure.in	Thu May  2 16:50:49 2002
@@ -975,10 +975,10 @@
 dnl ***************************************
 dnl testing for X libraries and includes...
 dnl ***************************************

-if test "$_os" = "Darwin" -a "x$x_includes" = "xno_x_includes"; then
-   dnl Mac OS X using Aqua graphics. Don't check for X11.
-   :
-elif test "$_os" != "WINNT" ; then
+dnl if test "$_os" = "Darwin" -a "x$x_includes" = "xno_x_includes"; then
+dnl    dnl Mac OS X using Aqua graphics. Don't check for X11.
+dnl    :
+dnl elif test "$_os" != "WINNT" ; then
    AC_PATH_X
    AC_PATH_XTRA
 
@@ -998,10 +998,10 @@
    CFLAGS=$X_CFLAGS
    LDFLAGS="$X_LDFLAGS $X_LIBS"
    AC_CHECK_LIB(X11, XOpenDisplay, x_libs="-lX11 $X_EXTRA_LIBS", [AC_MSG_ERROR([X Development libraries not found])])
-else
+dnl else
    x_includes="no_x_includes"
    x_libraries="no_x_libraries"
-fi
+dnl fi
 dnl ***************************************
 dnl testing libc version for Linux...
 dnl ***************************************
@@ -1202,7 +1202,7 @@
 
 # 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 $WITH_MINGWIN $with_use_shell $USE_GCC3
+   './set_soenv' NO_GCC $_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 $with_use_shell $USE_GCC3
 else
    echo
    echo Test Complete