Index: bootstrap.1 =================================================================== RCS file: /cvs/tools/config_office/bootstrap.1,v retrieving revision 1.13.22.1 diff -u -r1.13.22.1 bootstrap.1 --- config_office/bootstrap.1 17 Sep 2003 03:28:51 -0000 1.13.22.1 +++ config_office/bootstrap.1 20 Oct 2003 23:45:11 -0000 @@ -5,29 +5,32 @@ setenv EXEEXT "" endif -if ( ! -f $SRC_ROOT/dmake/dmake$EXEEXT ) then +if ( "$BUILD_DMAKE" == "YES" ) then -cd $SRC_ROOT/dmake -if "$?" != "0" exit $? + if ( ! -f $SRC_ROOT/dmake/dmake$EXEEXT ) then -# Special case! The w32/tcsh build needs CC pointing to the MSVC++ compiler -# but we need a cygwin/gcc build dmake to understand the posix paths -if ( $GUI == "WNT" && $USE_SHELL == "tcsh" ) then - setenv CC "" - setenv CXX "" -endif + cd $SRC_ROOT/dmake + if "$?" != "0" exit $? -./configure -if "$?" != "0" exit $? + # Special case! The w32/tcsh build needs CC pointing to the MSVC++ compiler + # but we need a cygwin/gcc build dmake to understand the posix paths + if ( $GUI == "WNT" && $USE_SHELL == "tcsh" ) then + setenv CC "" + setenv CXX "" + endif -## invoke the gnu make command set by configure. -$GNUMAKE -if "$?" != "0" exit $? + ./configure + if "$?" != "0" exit $? -echo "" -echo "dmake has been successfully built" + ## invoke the gnu make command set by configure. + $GNUMAKE + if "$?" != "0" exit $? -cd .. + echo "" + echo "dmake has been successfully built" -endif + cd .. + endif + +endif Index: bootstrap.2 =================================================================== RCS file: /cvs/tools/config_office/bootstrap.2,v retrieving revision 1.14.34.1 diff -u -r1.14.34.1 bootstrap.2 --- config_office/bootstrap.2 17 Sep 2003 03:28:52 -0000 1.14.34.1 +++ config_office/bootstrap.2 20 Oct 2003 23:45:11 -0000 @@ -2,7 +2,9 @@ # unalias these commands if they are aliased mkdir -p $SOLARENV/$OUTPATH/bin -cp -f $SRC_ROOT/dmake/dmake$EXEEXT $SOLARENV/$OUTPATH/bin +if ( "$BUILD_DMAKE" == "YES" ) then + cp -f $SRC_ROOT/dmake/dmake$EXEEXT $SOLARENV/$OUTPATH/bin +endif # create a minor.mk file Index: configure.in =================================================================== RCS file: /cvs/tools/config_office/configure.in,v retrieving revision 1.55.6.4.2.2 diff -u -r1.55.6.4.2.2 configure.in --- config_office/configure.in 9 Oct 2003 23:11:21 -0000 1.55.6.4.2.2 +++ config_office/configure.in 20 Oct 2003 23:45:12 -0000 @@ -36,6 +36,22 @@ AC_ARG_ENABLE(libsn, [ --enable-libsn Enables the use of libstartup-notification ],,) +AC_ARG_ENABLE(fontconfig, +[ --enable-fontconfig Enables the use of fontconfig +],,) +AC_ARG_WITH(fonts, +[ --without-fonts Removes Bitstream Vera fonts from + openoffice.org installation set, for people building + for specific distributions where the fonts are known + to be already available +],,) +AC_ARG_ENABLE(mozilla, +[ --enable-mozilla OO.o may include a strangely hacked up mozilla + binary for your platform, to build with this + enabled, use this option. + + Usage: --enable-mozilla +],,) AC_ARG_ENABLE(gcc3, [ --enable-gcc3 Deprecated: Now has no effect, checks compiler version ],,) @@ -67,6 +83,12 @@ the static libraries instead of the dynmaic ones. (enables -Bstatic linker flag for gtk libraries) ],,) +AC_ARG_ENABLE(rpath, +[ --disable-rpath: Disable the use of relative paths in shared libraries +],,) +AC_ARG_WITH(system-zlib, +[ --with-system-zlib Use zlib already on system +],,) AC_ARG_WITH(stlport4-home, [ --with-stlport4-home The location that STLport4 is installed in. The STL header files are assumed to be in stlport4-home/stlport @@ -108,6 +130,12 @@ Usage: --with-perl-home= ],,) +AC_ARG_WITH(python, +[ --with-python If you want to use the Python on your system, instead of + the internal version included in the source, use this flag. + + Usage: --with-python[=path-to-python] +],,) AC_ARG_WITH(cl-home, [ --with-cl-home For Windows NT users, please supply the path for the Microsoft C/C++ compiler. @@ -418,6 +446,16 @@ AC_SUBST(ENABLE_SYMBOLS) dnl =================================================================== +dnl Disable rpath in shared libraries? +dnl =================================================================== +if test "$enable_rpath" = "no"; then + ENABLE_RPATH="no" +else + ENABLE_RPATH="yes" +fi +AC_SUBST(ENABLE_RPATH) + +dnl =================================================================== dnl WINNT uses either 4nt or tcsh, all other O/S use tcsh. dnl The following sets the with_use_shell variable. dnl =================================================================== @@ -1283,6 +1321,62 @@ AC_SUBST(TCSH) dnl =================================================================== +dnl Check whether we already have dmake +dnl =================================================================== +AC_PATH_PROG(DMAKE, dmake, no) +if test "$DMAKE" = "no"; then + BUILD_DMAKE=YES +else + AC_MSG_CHECKING([whether the found dmake is the right dmake]) + # we need to find out whether that dmake we found is "our" dmake + # or the dmake from Sun's Workshop Compiler which is something + # different + # This test _should_ work because the one accepts -V (ours) and one + # (the other) not... + dmake -V 2>/dev/null | grep 'dmake .* Version 4.*, PL ' >/dev/null + if test $? -eq 0; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + BUILD_DMAKE=YES + fi +fi +AC_SUBST(BUILD_DMAKE) + +dnl =================================================================== +dnl Check for system python +dnl =================================================================== +AC_MSG_CHECKING([which python to use]) +if test -n "$with_python"; then + AC_MSG_RESULT([external]) + if test "$with_python" != "yes"; then + PYTHON="$with_python" + fi + AM_PATH_PYTHON([2.2]) +else + AC_MSG_RESULT([internal]) + SCPDEFS="$SCPDEFS -DWITH_PYTHON" +fi +AC_SUBST(PYTHON) +AC_SUBST(PYTHON_VERSION) + +dnl =================================================================== +dnl Check for system zlib +dnl =================================================================== +AC_MSG_CHECKING([which zlib to use]) +if test -n "$with_system_zlib"; then + AC_MSG_RESULT([external]) + SYSTEM_ZLIB=YES + AC_MSG_CHECKING([for zlib.h]) + AC_TRY_COMPILE([#include "zlib.h"], [], + [AC_MSG_RESULT(found)], [AC_MSG_ERROR(zlib not found. install zlib)]) +else + AC_MSG_RESULT([internal]) + SYSTEM_ZLIB=NO +fi +AC_SUBST(SYSTEM_ZLIB) + +dnl =================================================================== dnl Check whether the gtk 2.0 libraries are available. dnl =================================================================== if test -n "$ENABLE_CRASHDUMP" ; then @@ -1294,6 +1388,22 @@ fi dnl =================================================================== +dnl Check whether we want to use fontconfig and if the library is +dnl available. +dnl =================================================================== +AC_MSG_CHECKING([whether to use fontconfig]) +if test -n "$enable_fontconfig"; then + AC_MSG_RESULT([yes]) + PKG_CHECK_MODULES( FONTCONFIG, fontconfig >= 1.0.1 ) + FONTCONFIG_FONTS=YES +else + AC_MSG_RESULT([no]) + FONTCONFIG_FONTS=NO +fi +AC_SUBST(FONTCONFIG_FONTS) +AC_SUBST(FONTCONFIG_LIBS) + +dnl =================================================================== dnl Checks for libraries. dnl =================================================================== dnl Check for Mac OS X native GUI, which may be used instead of X11. @@ -1477,7 +1587,7 @@ fi ASM_HOME="$with_asm_home" AC_SUBST(ASM_HOME) - + dnl =================================================================== dnl testing handle deprecated unzip switch dnl =================================================================== @@ -1617,6 +1727,36 @@ AC_SUBST(WITH_LIBSN) AC_SUBST(LIBSN_CFLAGS) AC_SUBST(LIBSN_LIBS) + +dnl =================================================================== +dnl Disable mozilla if we can +dnl =================================================================== + +AC_MSG_CHECKING([whether to build mozilla connectivity]) +if test -n "$enable_mozilla"; then + AC_MSG_RESULT([yes]) + WITH_MOZILLA=YES +else + AC_MSG_RESULT([no]) + WITH_MOZILLA=NO + SCPDEFS="$SCPDEFS -DWITHOUT_MOZILLA" +fi +AC_SUBST(WITH_MOZILLA) + +dnl =================================================================== +dnl Test whether to include fonts +dnl =================================================================== +AC_MSG_CHECKING([whether to include Bitstream Vera fonts]) +if test "$with_fonts" != "no" ; then + AC_MSG_RESULT([yes]) + WITH_FONTS=YES + SCPDEFS="$SCPDEFS -DWITH_FONTS" +else + AC_MSG_RESULT([no]) + WITH_FONTS=NO +fi +AC_SUBST(WITH_FONTS) +AC_SUBST(SCPDEFS) dnl =================================================================== dnl Test for the presence of Ant and that it works Index: set_soenv.in =================================================================== RCS file: /cvs/tools/config_office/set_soenv.in,v retrieving revision 1.10.6.2.4.5 diff -u -r1.10.6.2.4.5 set_soenv.in --- config_office/set_soenv.in 17 Oct 2003 20:55:32 -0000 1.10.6.2.4.5 +++ config_office/set_soenv.in 20 Oct 2003 23:45:16 -0000 @@ -1690,6 +1690,7 @@ } } ToFile( "SOLARDEF", $SOLARDEF, "e" ); +ToFile( "SCPDEFS", '@SCPDEFS@', "e" ); ToFile( "SOLAREXTRAINC", $SOLAREXTRAINC, "e" ); ToFile( "SOLAREXTRALIB", $SOLAREXTRALIB, "e" ); ToFile( "SOLARINCLUDES", $SOLARINCLUDES, "e" ); @@ -1714,6 +1715,17 @@ ToFile( "WITH_LIBSN", "@WITH_LIBSN@", "e" ); ToFile( "LIBSN_CFLAGS", "@LIBSN_CFLAGS@", "e" ); ToFile( "LIBSN_LIBS", "@LIBSN_LIBS@", "e" ); +ToFile( "WITH_MOZILLA", "@WITH_MOZILLA@", "e" ); +ToFile( "WITH_FONTS", "@WITH_FONTS@", "e" ); +ToFile( "SYSTEM_PYTHON", "@PYTHON@", "e" ); +ToFile( "PYTHON_VERSION", "@PYTHON_VERSION@", "e" ); +if ( '@ENABLE_RPATH@' eq "no" ) { + ToFile( "LINKFLAGSRUNPATH",'', "e" ); +} +ToFile( "SYSTEM_ZLIB", "@SYSTEM_ZLIB@", "e" ); +ToFile( "FONTCONFIG_FONTS", "@FONTCONFIG_FONTS@", "e" ); +ToFile( "FONTCONFIG_LIBS", "@FONTCONFIG_LIBS@", "e" ); +ToFile( "BUILD_DMAKE", "@BUILD_DMAKE@", "e" ); ToFile( "GXX_INCLUDE_PATH", "@GXX_INCLUDE_PATH@", "e" ); ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" ); if ($platform ne "$Winnt")