Skip to content

C
core
Kaydet (Commit) 12380541 authored tarafından Rüdiger Timm's avatar Rüdiger Timm
Dosyalara gözat
Seçenekler

INTEGRATION: CWS ooo20031110 (1.56.4); FILE MERGED 

2003/11/24 12:46:45 waratah 1.56.4.6: Deprecated gcc 2.95 from support
2003/11/20 22:20:11 waratah 1.56.4.5: Correct recolution of enable_symbols in script
2003/11/19 08:18:51 waratah 1.56.4.4: #i17700# implement testing for x windows include files
2003/11/05 12:55:20 waratah 1.56.4.3: Correct --disable-symbols option should work
2003/10/26 18:57:14 vq 1.56.4.2: #21441 Adjust configure to detect the new requirements for Windows when
building OOo 2.0.
2003/10/18 12:38:06 waratah 1.56.4.1: #i21389#  merge configure patches from the 1.1 branches
üst 74b0b0ee
Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 50 deletions
config_office/configure.in
Dosyayı görüntüle @ 12380541
......@@ -3,7 +3,7 @@ dnl * vi:set sw=3 ts=3 et:
dnl *
dnl * Name: configure.in
dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland
dnl * Date: $Date: 2003-08-18 14:53:58 $
dnl * Date: $Date: 2003-12-01 17:39:04 $
dnl *
dnl * Desc: This file serves as input for the GNU autoconf package
dnl * in order to create a configure script.
......@@ -12,7 +12,7 @@ dnl * necessary to build OpenOffice.org
dnl *
dnl *
dnl ******************************************************************/
AC_REVISION( $Revision: 1.56 $ )
AC_REVISION( $Revision: 1.57 $ )
AC_PREREQ(2.50)
AC_INIT()
echo "$@" >config.parms
......@@ -57,6 +57,11 @@ AC_ARG_ENABLE(crashdump,
[ --enable-crashdump: Enable the crashdump feature code. This option
implicitly activates --enable-symbols.
],,)
AC_ARG_ENABLE(cl-standard,
[ --enable-cl-standard For Microsoft C/C++ compiler users, use non-optimizing standard compiler.
( This just disables optimization options and therefore removes a lot of
warnings when using the cheaper standard compiler. )
],,)
AC_ARG_ENABLE(static-gtk,
[ --enable-static-gtk: Modules that are linked against gtk libraries use
the static libraries instead of the dynmaic ones.
......@@ -77,6 +82,11 @@ AC_ARG_WITH(jdk-home,
Usage: --with-jdk-home=<absolute path to JDK 1.3 home>
],,)
AC_ARG_WITH(gxx_include_path,
[ --with-gxx-include-path if you want to override the autodetected g++ include path.
Usage: --with-gxx-include-path=<absolute path to g++ include dir>
],,)
AC_ARG_ENABLE(java,
[ --disable-java Build without Java support. Use if there is no supported JDK
for your platform. The build will have no support for Java
......@@ -113,11 +123,25 @@ AC_ARG_WITH(mspdb-path,
Usage: --with-mspdb-path=<absolute path to mspdb60.dll/mspdb70.dll>
],,)
AC_ARG_WITH(midl-path,
[ --with-midl-path For Microsoft C/C++ .NET compiler users, please supply the path
[ --with-midl-path For Microsoft C/C++ .NET compiler users, please supply the path
pointing to the midl.exe.
Usage: --with-midl-path=<absolute path to midl.exe>
],,)
AC_ARG_WITH(csc-path,
[ --with-csc-path For Microsoft C/C++ .NET compiler users, please supply the path
pointing to the csc.exe.
Usage: --with-csc-path=<absolute path to csc.exe>
],,)
AC_ARG_WITH(frame-home,
[ --with-frame-home For Microsoft C/C++ .NET compiler users, please supply the path
pointing to the .NET Framework SDK.
Usually something like:
"/cygdrive/c/Programme/Microsoft Visual Studio .NET/FrameworkSDK"
Usage: --with-frame-home=<absolute path to Framework SDK>
],,)
AC_ARG_WITH(wdevenv-path,
[ --with-wdevenv-path For Microsoft C/C++ .NET compiler users, please supply the path
pointing to the wdevenv.exe.
......@@ -191,8 +215,8 @@ AC_ARG_WITH(asm-home,
Usage: --with-asm-home=<path to ml.exe directory>
],,)
AC_ARG_WITH(os-version,
[ --with-os-version For FreeBSD users, use this option option to build
OpenOffice.org with the correct OSVERSION.
[ --with-os-version For FreeBSD users, use this option option to override
the detected OSVERSION.
Usage: --with-os-version=<OSVERSION>
],,)
......@@ -301,6 +325,19 @@ case "$_os" in
"FreeBSD")
test_x=yes
test_gtk=yes
AC_MSG_CHECKING([the FreeBSD operating system release])
if test -n "$with_os_version"; then
OSVERSION="$with_os_version"
else
OSVERSION=`/sbin/sysctl -n kern.osreldate`
fi
AC_MSG_RESULT([found OSVERSION=$OSVERSION])
PTHREAD_CFLAGS="-D_THREAD_SAFE"
if test "$OSVERSION" -lt "500016"; then
PTHREAD_LIBS="-pthread"
else
PTHREAD_LIBS="-lc_r"
fi
;;
"OSF1")
test_x=dontknow
......@@ -326,6 +363,7 @@ esac
AC_MSG_RESULT([checked ($_os)])
AC_SUBST(OSVERSION)
AC_SUBST(PTHREAD_CFLAGS)
AC_SUBST(PTHREAD_LIBS)
......@@ -353,6 +391,16 @@ else
fi
AC_SUBST(ENABLE_CRASHDUMP)
dnl ===================================================================
dnl Set the VC_STANDARD variable.
dnl ===================================================================
if test "$enable_cl_standard" = "" -o "$enable_cl_standard" = "no"; then
VC_STANDARD=""
else
VC_STANDARD="TRUE"
fi
AC_SUBST(VC_STANDARD)
dnl ===================================================================
dnl Set the ENABLE_DEBUG variable. (Activate --enable-symbols)
dnl ===================================================================
......@@ -374,10 +422,11 @@ if test -n "$enable_symbols" ; then
ENABLE_SYMBOLS="TRUE"
else
if test "$enable_symbols" = "SMALL" -o "$enable_symbols" = "small"; then
ENABLE_SYMBOLS="SMALL"
else
ENABLE_SYMBOLS="SMALL"
else if test "$enable_symbols" != "no"; then
echo enable symbols is: $enable_symbols
AC_MSG_ERROR([--enable-symbols only accepts yes, TRUE or SMALL as parameter.])
fi
fi
fi
fi
......@@ -391,7 +440,7 @@ if test $_os = "WINNT" -a $CygwinVer = "true"; then
if test "$with_use_shell" = "0"; then
with_use_shell="4nt"
fi
if test `uname -r | $AWK -F. '{ print $1"."$2 }'` = "1.3"; then
if test `uname -r | $AWK -F. '{ print $1$2 }'` -ge "13"; then
CygwinVer="1"
dnl ===================================================================
dnl Sanity check! Native windows programs cannot use cygwin symlinks!
......@@ -489,7 +538,7 @@ if test "$COMPATH" = "." ; then
fi
dnl ===================================================================
dnl Test the gcc version, 3 is OK, 2.96 invalid, 2.95+ is OK
dnl Test the gcc version, 3 is OK
dnl ===================================================================
if test "$GCC" = "yes"; then
AC_MSG_CHECKING([the GNU gcc compiler version])
......@@ -500,19 +549,12 @@ if test "$GCC" = "yes"; then
if test "$_gcc_major" = "3"; then
USE_GCC3="TRUE"
if test "$_gcc_longver" -eq "030203"; then
AC_MSG_ERROR([found version "$_gcc_version"
gives internal error, use another version please.])
if test $ENABLE_SYMBOLS -eq "SMALL"; then
AC_MSG_ERROR([version "$_gcc_version" gives internal error with small.])
fi
fi
else
USE_GCC3="FALSE"
if test "$_gcc_longver" -lt "029502"; then
AC_MSG_ERROR([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler])
else
if test "$_gcc_longver" -gt "029599"; then
AC_MSG_ERROR([found version "$_gcc_version", Not supported. Upgrade to gcc 3])
fi
fi
echo "gcc 2.95 support is not perfect, suggest upgrade to gcc 3" >>warn
AC_MSG_ERROR([found version "$_gcc_version", use version 3+ of the gcc compiler])
fi
AC_MSG_RESULT([checked (gcc $_gcc_version)])
fi
......@@ -738,7 +780,7 @@ if test "$COMEX" = "8"; then
dnl Check midl.exe
AC_PATH_PROG(MIDL_PATH, midl.exe)
if test -n "$MIDL_PATH";then
MIDL_PATH=`dirname $MIDL_PATH`
MIDL_PATH=`dirname "$MIDL_PATH"`
fi
if test -x "$with_midl_path/midl.exe"; then
MIDL_PATH="$with_midl_path"
......@@ -753,10 +795,39 @@ if test "$COMEX" = "8"; then
MIDL_PATH=`cygpath -d "$MIDL_PATH"`
MIDL_PATH=`cygpath -u "$MIDL_PATH"`
dnl Check csc.exe
AC_PATH_PROG(CSC_PATH, csc.exe)
if test -n "$CSC_PATH";then
CSC_PATH=`dirname "$CSC_PATH"`
fi
if test -x "$with_csc_path/csc.exe"; then
CSC_PATH="$with_csc_path"
fi
if test ! -x "$CSC_PATH/csc.exe"; then
AC_MSG_ERROR([csc.exe not found. Make sure it's in the path or use --with-csc-path])
fi
# Convert to posix path with 8.3 filename restrictions ( No spaces )
CSC_PATH=`cygpath -d "$CSC_PATH"`
CSC_PATH=`cygpath -u "$CSC_PATH"`
dnl Check mscoree.lib / .NET Frameworks dir
if test -f "$with_frame_home/lib/mscoree.lib"; then
FRAME_HOME="$with_frame_home"
fi
if test -z "$FRAME_HOME" -a -e "$with_cl_home/../FrameworkSDK/lib/mscoree.lib"; then
FRAME_HOME="$with_cl_home/../FrameworkSDK"
fi
if test ! -f "$FRAME_HOME/lib/mscoree.lib"; then
AC_MSG_ERROR([mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home])
fi
# Convert to posix path with 8.3 filename restrictions ( No spaces )
FRAME_HOME=`cygpath -d "$FRAME_HOME"`
FRAME_HOME=`cygpath -u "$FRAME_HOME"`
dnl Check wdevenv.exe
AC_PATH_PROG(WDEVENV_PATH, wdevenv.exe)
if test -n "$WDEVENV_PATH"; then
WDEVENV_PATH=`dirname $WDEVENV_PATH`
WDEVENV_PATH=`dirname "$WDEVENV_PATH"`
fi
if test -x "$with_wdevenv_path/wdevenv.exe"; then
WDEVENV_PATH="$with_wdevenv_path"
......@@ -769,6 +840,8 @@ if test "$COMEX" = "8"; then
WDEVENV_PATH=`cygpath -u "$WDEVENV_PATH"`
fi
AC_SUBST(MIDL_PATH)
AC_SUBST(CSC_PATH)
AC_SUBST(FRAME_HOME)
AC_SUBST(WDEVENV_PATH)
dnl ===================================================================
......@@ -812,30 +885,20 @@ fi
dnl ===================================================================
dnl Set the gcc/gxx include directories
dnl ===================================================================
if test "$_os" = "FreeBSD" && test "$CC" != "cc"; then
if test "$GXX" = "yes"; then
if test -n "$enable_gcc3"; then
_gccincname1="g++-v3"
else
_gccincname1="g++-3"
fi
_gcc_include_path=".."
_gxx_include_path="$_gcc_include_path/$_gccincname1"
fi
else
if test "$GXX" = "yes"; then
_gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
if test "$_gxx_include_path" = "/usr/libexec/(null)/include"; then
_gxx_include_path="/usr/include"
# Removed the special FreeBSD treatment. The problem was that with_gxx_include_path
# often contains an i386 which is expanded as a macro. Solved in stlport.
if test "$GXX" = "yes" -a -z "$with_gxx_include_path"; then
with_gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
if test "$with_gxx_include_path" = "/usr/libexec/(null)/include"; then
with_gxx_include_path="/usr/include"
fi
dnl This is the original code...
dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
dnl with_gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
fi
if test -z "$with_gxx_include_path"; then
with_gxx_include_path="NO_GXX_INCLUDE"
fi
if test -z "$_gxx_include_path"; then
_gxx_include_path="NO_GXX_INCLUDE"
fi
GXX_INCLUDE_PATH="$_gxx_include_path"
GXX_INCLUDE_PATH="$with_gxx_include_path"
AC_SUBST(GXX_INCLUDE_PATH)
dnl ===================================================================
......@@ -1299,6 +1362,7 @@ if test "$_os" = "Darwin" -a "x$x_includes" = "xno_x_includes"; then
elif test "$_os" != "WINNT" ; then
AC_PATH_X
AC_PATH_XTRA
AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])])
if test "x$x_includes" = "x"; then
x_includes="/usr/include"
......@@ -1428,7 +1492,7 @@ dnl testing bash tools path on Windows
dnl ***************************************
if test "$_os" = "WINNT"; then
AC_PATH_PROG(CYGWIN, bash)
CYGWIN=`dirname $CYGWIN`
CYGWIN=`dirname "$CYGWIN"`
fi
if test -z "$CYGWIN"; then
CYGWIN="NO_CYGWIN"
......@@ -1526,18 +1590,18 @@ may have to search Microsoft's website.) Last time it was seen at:
fi
dnl ===================================================================
dnl Windows builds with .NET need msvcp70.dll in external/msvcp70/
dnl Windows builds with .NET need msvcp70.dll/msvcr70.dll in external/msvcp70/
dnl ===================================================================
if test "$_os" = "WINNT" -a "$COMEX" = "8"; then
AC_MSG_CHECKING([msvcp70.dll])
if test -f ../external/msvcp70/msvcp70.dll; then
if test -f ../external/msvcp70/msvcp70.dll -a -f ../external/msvcp70/msvcr70.dll; then
AC_MSG_RESULT([found])
else
AC_MSG_ERROR([The msvcp70.dll is missing in external/msvcp70/.
The dll is part of the .NET installation and can be found in a directory
AC_MSG_ERROR([msvcp70.dll and/or msvcr70.dll are/is missing in external/msvcp70/.
These dlls are part of the .NET installation and can be found in a directory
similar to:
"c:\\Program Files\\Microsoft Visual Studio .NET\\Visual C++ .NET Professional - English\\"
Please copy the file to external/msvcp70.])
Please copy the files to external/msvcp70.])
fi
fi
......@@ -1709,8 +1773,6 @@ GCC_HOME="$with_gcc_home"
AC_SUBST(GCC_HOME)
AC_SUBST(WITH_MINGWIN)
OSVERSION="$with_os_version"
AC_SUBST(OSVERSION)
AC_OUTPUT([set_soenv])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment