openoffice-ac.patch

   1 --- oo_1.0_src/config_office/configure.in~~     Thu May  2 16:48:20 2002
   2 +++ oo_1.0_src/config_office/configure.in       Thu May  2 16:50:49 2002
   3 @@ -975,10 +975,10 @@
   4  dnl ***************************************
   5  dnl testing for X libraries and includes...
   6  dnl ***************************************
   7 -if test "$_os" = "Darwin" -a "x$x_includes" = "xno_x_includes"; then
   8 -   dnl Mac OS X using Aqua graphics. Don't check for X11.
   9 -   :
  10 -elif test "$_os" != "WINNT" ; then
  11 +dnl if test "$_os" = "Darwin" -a "x$x_includes" = "xno_x_includes"; then
  12 +dnl    dnl Mac OS X using Aqua graphics. Don't check for X11.
  13 +dnl    :
  14 +dnl elif test "$_os" != "WINNT" ; then
  15     AC_PATH_X
  16     AC_PATH_XTRA
  17
  18 @@ -998,10 +998,10 @@
  19     CFLAGS=$X_CFLAGS
  20     LDFLAGS="$X_LDFLAGS $X_LIBS"
  21     AC_CHECK_LIB(X11, XOpenDisplay, x_libs="-lX11 $X_EXTRA_LIBS", [AC_MSG_ERROR([X Development libraries not found])])
  22 -else
  23 -   x_includes="no_x_includes"
  24 -   x_libraries="no_x_libraries"
  25 -fi
  26 +dnl else
  27 +dnl   x_includes="no_x_includes"
  28 +dnl   x_libraries="no_x_libraries"
  29 +dnl fi
  30  dnl ***************************************
  31  dnl testing libc version for Linux...
  32  dnl ***************************************
  33 @@ -1202,7 +1202,7 @@
  34
  35  # Executing the set_soenv script to setup the environment variables.
  36  if test -z "$enable_check_only"; then
  37 -   './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
  38 +   './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
  39  else
  40     echo
  41     echo Test Complete