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 09:57:45 -0000
*************** esac
*** 300,305 ****
--- 300,308 ----
  
  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 ****
--- 318,324 ----
      ENVCFLAGS=""
    fi
  fi
+ AC_SUBST(ENVCFLAGSCXX)
  
  dnl ===================================================================
  dnl Set the ENABLE_CRASHDUMP variable.
*************** else
*** 332,337 ****
--- 336,342 ----
        fi
     fi
  fi
+ AC_SUBST(ENABLE_CRASHDUMP)
  
  dnl ===================================================================
  dnl WINNT uses either 4nt or tcsh, all other O/S use tcsh.
*************** else 
*** 390,395 ****
--- 395,402 ----
        fi
     fi
  fi
+ USE_SHELL="$with_use_shell"
+ AC_SUBST(USE_SHELL)
  
  _machine_type=`uname -m`
  
*************** if test "$GCC" = "yes"; then
*** 460,465 ****
--- 467,473 ----
     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 ****
--- 509,515 ----
         fi
      fi
  fi
+ AC_SUBST(GNUMAKE)
  
  dnl ===================================================================
  dnl  Test the solaris compiler version
*************** if test "$_os" = "WINNT"; then
*** 637,642 ****
--- 646,652 ----
  		fi
  	fi
  fi
+ AC_SUBST(COMEX)
  
  dnl ===================================================================
  dnl Check if stdc headers are available excluding windows.
*************** dnl This is the original code...
*** 699,704 ****
--- 709,719 ----
  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 ****
--- 796,803 ----
  
  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...
*************** else
*** 913,920 ****
  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.]))
--- 930,937 ----
  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 ===================================================================
--- 975,990 ----
  			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 ****
--- 1016,1023 ----
  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 ===================================================================
*************** if test "$PERL"; then
*** 1054,1059 ****
--- 1078,1084 ----
  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 ****
--- 1094,1101 ----
     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 ****
--- 1159,1175 ----
     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 ****
--- 1214,1221 ----
  		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 ****
--- 1259,1266 ----
      fi
    fi
  fi
+ AC_SUBST(GNUPATCH)
+ AC_SUBST(GNUCP)
  
  dnl ***************************************
  dnl testing bash tools path on Windows
*************** if test "$_os" = "WINNT"; then
*** 1227,1232 ****
--- 1269,1279 ----
  	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,1258 ****
  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.
--- 1289,1308 ----
  else
  	with_asm_home="NO_ASM_HOME"
  fi
+ ASM_HOME="$with_asm_home"
+ AC_SUBST(ASM_HOME)
+ 
  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
!       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 th
*** 1263,1274 ****
  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
--- 1313,1327 ----
  AC_MSG_ERROR([$ZIP_EXE found in the path is not the required cygwin version of Info-ZIPs zip.exe.])
           fi
        fi
!       UNZIP_HOME="UNZIP_IN_PATH"
!     fi
!   else
!       UNZIP_HOME="$with_unzip_home"
!   fi
  else
!       UNZIP_HOME="NO_UNZIP_HOME"
  fi
+ AC_SUBST(UNZIP_HOME)
  
  dnl ===================================================================
  dnl Test for the presence of the right polgyon clipping code
*************** 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
--- 1332,1337 ----
*************** 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
--- 1353,1366 ----
  	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
--- 1369,1379 ----
  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 ****
--- 1424,1433 ----
  
    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])
  
--- 1440,1505 ----
  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])