diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-04-11 07:56:01 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-04-11 07:56:01 +0000 |
| commit | 4b24f6b20ecc7c4ac22951ef41ac2dc68b5f6e79 (patch) | |
| tree | 1478dc4032476d9800f68dd574682a82bd94504b /config_office | |
| parent | e0879c04ea3dd999c5c0c6266ddb2494f04be156 (diff) | |
INTEGRATION: CWS configure9 (1.93.2); FILE MERGED
2005/04/08 15:43:47 rene 1.93.2.17: #i46873# don't use sed -r in java check....
2005/04/07 21:15:36 rene 1.93.2.16: fix cut'n'paste errors and also add x_libraries to to check.
2005/04/06 23:04:22 rene 1.93.2.15: move fi to right place...
2005/04/05 12:51:40 rene 1.93.2.14: more help whitespace improvements, and make help not exceed 80 lines where possible,
2005/04/05 10:10:09 rene 1.93.2.13: more test -n fixes
don't emit a warning when PKGFORMAT is rpm / pkg and we don't have external EPM, in which case EPM_VERSION isn't set. Disable that check completely when using internal EPM since we know our epm is patched.
2005/04/04 20:37:29 rene 1.93.2.12: #i46624# whitespace fixes (alignment of help options)
2005/04/04 13:20:35 rene 1.93.2.11: RESYNC: (1.93-1.94); FILE MERGED
2005/04/04 12:51:17 rene 1.93.2.10: more crashup/symbol help fixes
2005/04/04 10:21:16 rene 1.93.2.9: don't enable Gtk/GNOME VFS per default for Mac OS X
2005/04/04 10:13:33 rene 1.93.2.8: regenerate configure
2005/04/04 10:01:52 rene 1.93.2.7: #i46572# make java check work if path contains space, as in Windows, thanks vq
2005/03/31 14:40:41 rene 1.93.2.6: #i46018# fix crashdump check output and change help test to say --disable-foo when the option is enabled per default...
2005/03/31 14:23:57 rene 1.93.2.5: fix more checks wrt test -n and --disable-foo
2005/03/31 14:22:46 rene 1.93.2.4: fix more checks wrt test -n and --disable-foo
2005/03/31 14:06:36 rene 1.93.2.3: #i45934# fix PASF check to make --disable-pasf work
2005/03/30 18:40:36 rene 1.93.2.2: #i46310# check for moc
2005/03/30 08:43:04 rene 1.93.2.1: #i46081# check for fontconfig version
Diffstat (limited to 'config_office')
| -rwxr-xr-x | config_office/configure | 346 |
1 files changed, 238 insertions, 108 deletions
diff --git a/config_office/configure b/config_office/configure index b5a9db98bfb0..0614366f2bec 100755 --- a/config_office/configure +++ b/config_office/configure @@ -309,7 +309,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED LOCAL_SOLENV UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH WITH_MYSPELL_DICTS USE_SHELL WITH_MINGWIN TCSH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_GCC_VISIBILITY_FEATURE GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH FRAME_HOME CPP EGREP CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL BUILD_VER_STRING SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVADOC JAVA_HOME JDK JAVACACHE XSLTPROC XMKMF PERL DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_OPENLDAP MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZ_NSS_CFLAGS MOZ_NSS_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_XRENDER_HEADERS SYSTEM_NAS NAS_INCLUDES ENABLE_PASF SYSTEM_PORTAUDIO SYSTEM_SNDFILE BUILD_TYPE NEON_CFLAGS NEON_LIBS SYSTEM_NEON PSDK_HOME DIRECTXSDK_HOME DIRECTXSDK_LIB EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GNOMEVFS_CFLAGS GNOMEVFS_LIBS GCONF_CFLAGS GCONF_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS KDE_CFLAGS KDE_LIBS LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_DICT ENABLE_STATIC_GTK CUSTOM_IMAGE_SETS LOCAL_SOLVER LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED LOCAL_SOLENV UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH WITH_MYSPELL_DICTS USE_SHELL WITH_MINGWIN TCSH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_GCC_VISIBILITY_FEATURE GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH FRAME_HOME CPP EGREP CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL BUILD_VER_STRING SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVADOC JAVA_HOME JDK JAVACACHE XSLTPROC XMKMF PERL DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_OPENLDAP MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZ_NSS_CFLAGS MOZ_NSS_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_XRENDER_HEADERS SYSTEM_NAS NAS_INCLUDES ENABLE_PASF SYSTEM_PORTAUDIO SYSTEM_SNDFILE BUILD_TYPE NEON_CFLAGS NEON_LIBS SYSTEM_NEON PSDK_HOME DIRECTXSDK_HOME DIRECTXSDK_LIB EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GNOMEVFS_CFLAGS GNOMEVFS_LIBS GCONF_CFLAGS GCONF_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS MOC KDE_CFLAGS KDE_LIBS LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_DICT ENABLE_STATIC_GTK CUSTOM_IMAGE_SETS LOCAL_SOLVER LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -862,10 +862,10 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-libart Enables the use of libart, instead of GPC for - polygon clipping. + polygon clipping. - --enable-openldap Enables the use of the OpenLDAP LDAP SDK instead - of the Netscape/Mozilla one + --enable-openldap Enables the use of the OpenLDAP LDAP SDK instead + of the Netscape/Mozilla one --enable-libsn Enables the use of libstartup-notification @@ -873,35 +873,31 @@ Optional Features: binary for your platform, to build without this version, use this option. - Usage: --disable-mozilla - - --disable-epm OO.o includes self-packaging code, that requires + --disable-epm OO.o includes self-packaging code, that requires epm, however epm is useless for large scale package building. - Usage: --disable-epm - --disable-fontooo disable FontOOo (useful for distributions using fontconfig for OOo) - --enable-cups enable cups support in the psprint project + --disable-cups disable cups support in the psprint project - --enable-fontconfig enable support for the fontconfig library + --disable-fontconfig disable support for the fontconfig library --disable-directx Remove DirectX implementation for the new XCanvas - interface. This requires more installed on Windows to - compile. (DirectX SDK, GDI+ libs) + interface. The DirectX support requires more stuff installed on + Windows to compile. (DirectX SDK, GDI+ libs) --disable-atlmfc Disable the use of ATL/MFC for windows build. - --enable-symbols Include debugging symbols in output. Warning - - a complete build needs 8 Gb of space and takes - much longer. (enables -g compiler flag) + --enable-symbols Include debugging symbols in output. + Implicitly activated by --enable-crashdump (see below) + WARNING - a complete build needs 8 Gb of space and + takes much longer. (enables -g compiler flag) --enable-symbols=SMALL sets the gcc -g1 setting which is smaller. - --enable-debug: Include debugging symbols from --enable-symbols plus extra debugging code. Extra large build! (enables -g compiler flag and dmake debug=true) @@ -910,21 +906,24 @@ Optional Features: assertions, object counting, etc. Larger build. Independent from --enable-debug - --enable-crashdump: Enable the crashdump feature code. This option - implicitly activates --enable-symbols. + --enable-crashdump[=yes|TRUE|STATIC|no] + Enable (disable) the crashdump feature code. [default=STATIC] + When enabled, this option implicitly + activates --enable-symbols (see above). - --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. ) + --enable-cl-standard For Microsoft C/C++ compiler users, use non-optimizing + standard compiler. ( This just disavles optimization + options and therefore removes a lot of warnings when + using the cheaper standard compiler. ) --enable-vctk Tell configure to check for the MS VC Toolkit 2003. ( This is experimental! ) - --enable-gtk Determines whether to use Gtk+ vclplug on platforms + --disable-gtk Determines whether to use Gtk+ vclplug on platforms where Gtk+ is available. - --enable-gnome-vfs Determines whether to use the Gnome Virtual Filing - System on platforms where that VFS is available + --disable-gnome-vfs Determines whether to use the Gnome Virtual Filing + System on platforms where that VFS is available --enable-static-gtk: Modules that are linked against gtk libraries use the static libraries instead of the dynamic ones. @@ -940,7 +939,7 @@ Optional Features: --disable-rpath: Disable the use of relative paths in shared libraries - --enable-pasf enable support for sound using portaudio/sndfile + --disable-pasf disable support for sound using portaudio/sndfile --enable-check-only Use this option option if you just want to check your environment. This option stops the generation of an @@ -951,8 +950,6 @@ Optional Features: --enable-macos9 Use this option option if you want to generate a macos9 environment on macosx. - Usage: --enable-macos9 - --enable-sgistl for IRIX users, use this option option to build OpenOffice.org using SGI's STL. @@ -967,7 +964,7 @@ Optional Packages: --with-gnu-cp Specify location of GNU cp on Solaris or FreeBSD --without-gpc Use the internal polygon clipping code instead of - the external GPC polygon clipping library. + the external GPC polygon clipping library. --without-fonts Removes Bitstream Vera fonts from openoffice.org installation set, for people building @@ -978,21 +975,21 @@ Optional Packages: --with-system-mspack use libmspack already installed on system - --with-mozilla-version Choose which version of mozilla to use while building - mozilla. Default: 1.7.5. - Note that not all versions are supported. + --with-mozilla-version Choose which version of mozilla to use while building + mozilla. Default: 1.7.5. + Note that not all versions are supported. - --with-mozilla-toolkit Choose which GUI toolkit to use while building mozilla - components. Default: gtk2 + --with-mozilla-toolkit Choose which GUI toolkit to use while building mozilla + components. Default: gtk2 - --without-myspell-dicts Removes myspell dictionaries from openoffice.org - installation set, for people building for specific - distributions where the myspell dictionaries are - installed from other sources + --without-myspell-dicts Removes myspell dictionaries from openoffice.org + installation set, for people building for specific + distributions where the myspell dictionaries are + installed from other sources --with-system-libs Use libs already on system -- enables all - --with-system-* flags except mozilla, python and - odbc-headers + --with-system-* flags except mozilla, python and + odbc/sane/xrender-header(s) --with-system-zlib Use zlib already on system @@ -1002,7 +999,7 @@ Optional Packages: --with-system-freetype Use freetype already on system - --with-system-libwpd Use libwpd already on system + --with-system-libwpd Use libwpd already on system --with-system-libxml Use libxml already on system @@ -1010,51 +1007,54 @@ Optional Packages: --with-system-sablot Use sablot already on system - --with-system-odbc-headers Use the odbc headers already on system + --with-system-odbc-headers Use the odbc headers already on system - --with-system-sane-header Use sane.h already on system + --with-system-sane-header Use sane.h already on system - --with-system-xrender-headers Use XRender headers already on system + --with-system-xrender-headers Use XRender headers already on system --with-system-curl Use curl already on system --with-system-boost Use boost already on system - --with-system-nas Use nas already on system + --with-system-nas Use nas already on system - --with-system-sndfile Use sndfile already on system + --with-system-sndfile Use sndfile already on system --with-system-portaudio Use portaudio already on system - --with-system-neon Use neon already on system + --with-system-neon Use neon already on system --with-system-mozilla Use mozilla already on system. Note that some - components cannot be built against a contemporary - mozilla + components cannot be built against a contemporary + mozilla --with-stlport4 The location that STLport4 is installed in. The STL - header files are assumed to be in stlport4-home/stlport - and the STLport4 library in stlport4-home/lib. + header files are assumed to be in + stlport4-home/stlport and the STLPort4 library in + stlport4-home/lib. Usage: --with-stlport4=<absolute path to stlport4 home> - Warning!!, --without-stlport4 is possible with gcc >= 3.3.3, - but will break ABI compatability + Warning!!, --without-stlport4 is possible with + gcc >= 3.3.3, but will break ABI compatability --with-jdk-home if you have installed JDK 1.3, on your system, please supply the path here. - Note that this is not the location of the Java binary but the - location of the entire distribution. + Note that this is not the location of the Java binary + but the location of the entire distribution. Usage: --with-jdk-home=<absolute path to JDK 1.3 home> - --with-gxx-include-path if you want to override the autodetected g++ 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> - --with-java Build with[out] Java support. If you use --without-java/--with-java=no then - the build will have no support for Java components, applets, - accessibility or XML filters. Use --with-java=gij to enable gij/gcj + --with-java Build with[out] Java support. If you use + --without-java/--with-java=no then the build will have + no support for Java components, applets, accessibility + or XML filters. Use --with-java=gij to enable gij/gcj as java/javac replacements --with-ant-home If you have installed Jakarta Ant on your system, @@ -1078,38 +1078,39 @@ Optional Packages: Usage: --with-cl-home=<absolute path to Microsoft C/C++ compiler home> - --with-mspdb-path For Microsoft C/C++ compiler users, please supply the path - pointing to the mspdb71.dll (.NET 2003). + --with-mspdb-path For Microsoft C/C++ compiler users, please supply the + path pointing to the mspdb71.dll (.NET 2003). Usage: --with-mspdb-path=<absolute path to mspdb71.dll> - --with-midl-path For Microsoft C/C++ .NET compiler users, please supply the path - pointing to the midl.exe. + --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> - --with-csc-path For Microsoft C/C++ .NET compiler users, please supply the path - pointing to the csc.exe. + --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> - --with-nmake-path For MS Visual Toolkit compiler users, please supply the path - pointing to the nmake.exe. The Platform SDK provides one in the - Win64 directory, usually something like: - "/cygdrive/c/Programme/Microsoft SDK/Bin/Win64" + --with-nmake-path For MS Visual Toolkit compiler users, please supply + the path pointing to the nmake.exe. The Platform SDK + provides one in the Win64 directory, usually something + like: /cygdrive/c/Programme/Microsoft SDK/Bin/Win64" Usage: --with-nmake-path=<absolute path to nmake.exe> - --with-frame-home For Microsoft C/C++ .NET compiler users, please supply - the path pointing to lib/mscoree.lib, usually something - like: - "/cygdrive/c/Program Files/Microsoft Visual Studio .NET/FrameworkSDK" + --with-frame-home For Microsoft C/C++ .NET compiler users, please supply + the path pointing to lib/mscoree.lib, usually + something like: + "/cygdrive/c/Program Files/Microsoft Visual Studio .NET/FrameworkSDK" - MS Visual Toolkit compiler users, please supply the path - pointing to lib/msvcrt.lib, usually something like: - "/cygdrive/c/Program Files/Microsoft Visual Studio .NET 2003/Vc7" + MS Visual Toolkit compiler users, please supply the + path pointing to lib/msvcrt.lib, usually something + like: + "/cygdrive/c/Program Files/Microsoft Visual Studio .NET 2003/Vc7" - Usage: --with-frame-home=<absolute path to Framework SDK [home]> + Usage: --with-frame-home=<absolute path to Framework SDK [home]> --with-psdk-home For Windows users, please supply the path to the Microsoft Platform SDK. @@ -1121,10 +1122,11 @@ Optional Packages: Usage: --with-directx-home=<absolute path to Microsoft DirectX SDK> - --with-extra-dotnet-files For MS Visual Toolkit compiler, please supply the path - to additional library/include files that are otherwise missing. - (This is a cludge until MS Visual Toolkit is usable without - extra files.) + --with-extra-dotnet-files For MS Visual Toolkit compiler, please supply the + path to additional library/include files that are + otherwise missing. + (This is a cludge until MS Visual Toolkit is usable + without extra files.) Usage: --with-extra-dotnet-files=<absolute path to extra files> @@ -1138,8 +1140,8 @@ Optional Packages: Usage: --with-local-solver=<absolute path to solver> - --with-images Select different image sets to build & install in - addition to the default set. + --with-images Select different image sets to build & install in + addition to the default set. Usage: --with-images="industrial crystal" @@ -1185,7 +1187,7 @@ Optional Packages: Usage: --with-use-shell=tcsh|4nt - --with-build-version Allows the builder to add a custom version tag + --with-build-version Allows the builder to add a custom version tag that will appear in the Help/About box for QA purposes. @@ -1737,7 +1739,6 @@ if test "${enable_directx+set}" = set; then else enable_directx=yes fi; - # Check whether --enable-atlmfc or --disable-atlmfc was given. if test "${enable_atlmfc+set}" = set; then enableval="$enable_atlmfc" @@ -2519,6 +2520,7 @@ echo "$as_me: error: only sparc and i386 processors are supported" >&2;} darwin*) # Mac OS X test_x=no test_cups=no + test_gtk=no _os=Darwin ;; freebsd*) @@ -2603,16 +2605,16 @@ else if test -z "$enable_symbols"; then enable_symbols="yes" fi - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$as_me:$LINENO: result: yes, STATIC" >&5 +echo "${ECHO_T}yes, STATIC" >&6 else if test "$enable_crashdump" = "" -o "$enable_crashdump" = "no"; then ENABLE_CRASHDUMP="" echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 else - { { echo "$as_me:$LINENO: error: --enable-crashdump only accepts yes, TRUE or STATIC as parameter." >&5 -echo "$as_me: error: --enable-crashdump only accepts yes, TRUE or STATIC as parameter." >&2;} + { { echo "$as_me:$LINENO: error: --enable-crashdump only accepts yes, no, TRUE or STATIC as parameter." >&5 +echo "$as_me: error: --enable-crashdump only accepts yes, no, TRUE or STATIC as parameter." >&2;} { (exit 1); exit 1; }; } fi fi @@ -2649,7 +2651,7 @@ fi echo "$as_me:$LINENO: checking whether to do a debug build" >&5 echo $ECHO_N "checking whether to do a debug build... $ECHO_C" >&6 -if test -n "$enable_debug"; then +if test -n "$enable_debug" && test "$enable_debug" != "no"; then ENABLE_DEBUG="TRUE" if test -z "$enable_symbols"; then enable_symbols="yes" @@ -2665,7 +2667,7 @@ fi echo "$as_me:$LINENO: checking whether to build with additional debug utilities" >&5 echo $ECHO_N "checking whether to build with additional debug utilities... $ECHO_C" >&6 -if test -n "$enable_dbgutil"; then +if test -n "$enable_dbgutil" && test "$enable_dbgutil" != "no"; then PROEXT="" PRODUCT="" PROFULLSWITCH="" @@ -2684,7 +2686,7 @@ fi echo "$as_me:$LINENO: checking whether to include symbols into final build" >&5 echo $ECHO_N "checking whether to include symbols into final build... $ECHO_C" >&6 -if test -n "$enable_symbols" ; then +if test -n "$enable_symbols" && test "$enable_symbols" != "no"; then if test "$enable_symbols" = "yes" -o "$enable_symbols" = "TRUE"; then ENABLE_SYMBOLS="TRUE" echo "$as_me:$LINENO: result: yes" >&5 @@ -6373,7 +6375,7 @@ fi rm -f conftest.err conftest.$ac_ext fi -if test -n "$enable_sgistl"; then +if test -n "$enable_sgistl" && "$enable_sgistl" != "no"; then if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then echo "$as_me:$LINENO: checking for SGI STL" >&5 echo $ECHO_N "checking for SGI STL... $ECHO_C" >&6 @@ -6667,6 +6669,13 @@ echo "$as_me: error: $_java_path not found set with_jdk_home" >&2;} { (exit 1); exit 1; }; } fi fi + if test "$_os" = "WINNT"; then + if test x`echo "$JAVAINTERPRETER" | grep -i '\.exe$'` = x; then + JAVAINTERPRETER="${JAVAINTERPRETER}.exe" + fi + JAVAINTERPRETER=`cygpath -d "$JAVAINTERPRETER"` + JAVAINTERPRETER=`cygpath -u "$JAVAINTERPRETER"` + fi fi if test "$SOLAR_JAVA" != ""; then @@ -6716,6 +6725,9 @@ echo "$as_me: error: JDK is too old, you need at least 1.3" >&2;} echo "$as_me:$LINENO: result: checked (JDK $_jdk)" >&5 echo "${ECHO_T}checked (JDK $_jdk)" >&6 JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"` + if test "$_os" = "WINNT"; then + JAVA_HOME=`echo $JAVA_HOME | $SED "s,\.[eE][xX][eE]$,,"` + fi fi else { { echo "$as_me:$LINENO: error: JAVA not found. You need at least jdk-1.3, Kaffee 1.01, or gcj-4" >&5 @@ -6783,6 +6795,13 @@ fi echo "$as_me: error: $javacompiler not found set with_jdk_home" >&2;} { (exit 1); exit 1; }; } fi + if test "$_os" = "WINNT"; then + if test x`echo "$JAVACOMPILER" | grep -i '\.exe$'` = x; then + JAVACOMPILER="${JAVACOMPILER}.exe" + fi + JAVACOMPILER=`cygpath -d "$JAVACOMPILER"` + JAVACOMPILER=`cygpath -u "$JAVACOMPILER"` + fi fi if test "$SOLAR_JAVA" != ""; then @@ -6877,6 +6896,13 @@ fi echo "$as_me: error: $_javadoc_path not found set with_jdk_home" >&2;} { (exit 1); exit 1; }; } fi + if test "$_os" = "WINNT"; then + if test x`echo "$JAVADOC" | grep -i '\.exe$'` = x; then + JAVADOC="${JAVADOC}.exe" + fi + JAVADOC=`cygpath -d "$JAVADOC"` + JAVADOC=`cygpath -u "$JAVADOC"` + fi fi if test "$SOLAR_JAVA" != ""; then @@ -8129,6 +8155,7 @@ echo "$as_me: error: PackageMaker needed to build OSX packages and you are not o RPM= ;; rpm | pkg) + if test "$EPM" != "no" && test "$EPM" != "internal"; then if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then echo "$as_me:$LINENO: checking whether epm is patched for OOos needs" >&5 echo $ECHO_N "checking whether epm is patched for OOos needs... $ECHO_C" >&6 @@ -8159,7 +8186,8 @@ echo "$as_me: WARNING: if you want to make sure installation without --nodeps an --with-epm=internal which will build a suitable epm" >&2;} fi fi - if test "$PKGFORMAT" = "rpm"; then + fi + if test "$PKGFORMAT" = "rpm"; then echo "$as_me:$LINENO: checking for rpm" >&5 echo $ECHO_N "checking for rpm... $ECHO_C" >&6 for a in "$RPM" rpmbuild rpm; do @@ -8177,8 +8205,8 @@ echo "$as_me: error: not found" >&2;} echo "$as_me:$LINENO: result: $RPM" >&5 echo "${ECHO_T}$RPM" >&6 fi - fi - if test "$PKGFORMAT" = "pkg"; then + fi + if test "$PKGFORMAT" = "pkg"; then # Extract the first word of "pkgmk", so it can be a program name with args. set dummy pkgmk; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -8225,7 +8253,7 @@ echo "$as_me: error: pkgmk needed for Solaris pkg creation. Install it." >&2;} { (exit 1); exit 1; }; } fi RPM= - fi + fi ;; esac @@ -9704,7 +9732,7 @@ fi echo "$as_me:$LINENO: checking which boost to use" >&5 echo $ECHO_N "checking which boost to use... $ECHO_C" >&6 -if test -n "$with_system_boost"; then +if test -n "$with_system_boost" && test "$with_system_boost" != "no"; then echo "$as_me:$LINENO: result: external" >&5 echo "${ECHO_T}external" >&6 SYSTEM_BOOST=YES @@ -10009,7 +10037,7 @@ fi echo "$as_me:$LINENO: checking which odbc headers to use" >&5 echo $ECHO_N "checking which odbc headers to use... $ECHO_C" >&6 -if test -n "$with_system_odbc_headers"; then +if test -n "$with_system_odbc_headers" && test "$with_system_odbc_headers" != "no"; then echo "$as_me:$LINENO: result: external" >&5 echo "${ECHO_T}external" >&6 SYSTEM_ODBC_HEADERS=YES @@ -11378,7 +11406,7 @@ fi echo "$as_me:$LINENO: checking which sane header to use" >&5 echo $ECHO_N "checking which sane header to use... $ECHO_C" >&6 -if test -n "$with_system_sane_header"; then +if test -n "$with_system_sane_header" && test "$with_system_sane_header" != "no"; then echo "$as_me:$LINENO: result: external" >&5 echo "${ECHO_T}external" >&6 SYSTEM_SANE_HEADER=YES @@ -13375,11 +13403,60 @@ echo "$as_me: error: fontconfig/fontconfig.h could not be found. libfontconfig1- fi + echo "$as_me:$LINENO: checking whether fontconfig is >= 2.2.0" >&5 +echo $ECHO_N "checking whether fontconfig is >= 2.2.0... $ECHO_C" >&6 + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include <fontconfig/fontconfig.h> + +int main(int argc, char **argv) { + if(FC_MAJOR > 2 || (FC_MAJOR == 2 && FC_MINOR >= 2)) return 0; + else return 1; +} + +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +{ { echo "$as_me:$LINENO: error: no, fontconfig >= 2.2.0 needed" >&5 +echo "$as_me: error: no, fontconfig >= 2.2.0 needed" >&2;} + { (exit 1); exit 1; }; } +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi fi echo "$as_me:$LINENO: checking which XRender headers to use" >&5 echo $ECHO_N "checking which XRender headers to use... $ECHO_C" >&6 -if test -n "$with_system_xrender_headers"; then +if test -n "$with_system_xrender_headers" && test -n "$with_system_xrender_headers" != "no"; then echo "$as_me:$LINENO: result: external" >&5 echo "${ECHO_T}external" >&6 SYSTEM_XRENDER_HEADERS=YES @@ -13749,7 +13826,8 @@ fi echo "$as_me:$LINENO: checking whether to enable portaudio/sndfile support" >&5 echo $ECHO_N "checking whether to enable portaudio/sndfile support... $ECHO_C" >&6 -if test "$_os" != "WINNT" -a -n "$enable_pasf"; then +if test "$_os" != "WINNT" && \ + test -n "$enable_pasf" && test "$enable_pasf" != "no"; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 ENABLE_PASF=YES @@ -15136,7 +15214,7 @@ echo $ECHO_N "checking which polygon clipping code to use... $ECHO_C" >&6 WITH_GPC=NO WITH_LIBART=NO -if test -n "$enable_libart"; then +if test -n "$enable_libart" && test "$enable_libart" != "no"; then echo "$as_me:$LINENO: result: libart" >&5 echo "${ECHO_T}libart" >&6 @@ -15306,7 +15384,7 @@ fi ENABLE_GNOMEVFS="" echo "$as_me:$LINENO: checking whether to enable GNOME VFS support" >&5 echo $ECHO_N "checking whether to enable GNOME VFS support... $ECHO_C" >&6 -if test "$_os" != "WINNT" -a "$enable_gnome_vfs" = "yes"; then +if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gnome_vfs" = "yes"; then ENABLE_GNOMEVFS="TRUE" echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 @@ -15725,15 +15803,16 @@ fi KDE_CFLAGS="" KDE_LIBS="" +MOC="moc" if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include $x_includes" - qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/include /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib $x_includes" + qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib $x_libraries" if test -n "$QTDIR" ; then qt_incdirs="$QTDIR/include $qt_incdirs" qt_libdirs="$QTDIR/lib $qt_libdirs" fi kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes" - kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib" + kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib $x_libraries" if test -n "$KDEDIR" ; then kde_incdirs="$KDEDIR/include $kde_incdirs" kde_libdirs="$KDEDIR/lib $kde_libdirs" @@ -15782,6 +15861,55 @@ your Qt installation by exporting QTDIR before running \"configure\"." >&2;} { (exit 1); exit 1; }; } fi + # Extract the first word of "moc", so it can be a program name with args. +set dummy moc; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_MOC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $MOC in + [\\/]* | ?:[\\/]*) + ac_cv_path_MOC="$MOC" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$QTDIR/bin:$PATH " +for as_dir in $as_dummy +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_MOC="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="no" + ;; +esac +fi +MOC=$ac_cv_path_MOC + +if test -n "$MOC"; then + echo "$as_me:$LINENO: result: $MOC" >&5 +echo "${ECHO_T}$MOC" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test "$MOC" = "no" ; then + { { echo "$as_me:$LINENO: error: Qt Meta Object Compiler not found. Please specify +the root of your Qt installation by exporting QTDIR before running \"configure\"." >&5 +echo "$as_me: error: Qt Meta Object Compiler not found. Please specify +the root of your Qt installation by exporting QTDIR before running \"configure\"." >&2;} + { (exit 1); exit 1; }; } + fi + echo "$as_me:$LINENO: checking for KDE headers" >&5 echo $ECHO_N "checking for KDE headers... $ECHO_C" >&6 kde_incdir="no" @@ -15826,10 +15954,11 @@ fi + echo "$as_me:$LINENO: checking whether to use libstartup-notification" >&5 echo $ECHO_N "checking whether to use libstartup-notification... $ECHO_C" >&6 WITH_LIBSN=NO -if test -n "$enable_libsn"; then +if test -n "$enable_libsn" && test "$enable_libsn" != "no"; then succeeded=no @@ -16712,7 +16841,7 @@ fi echo "$as_me:$LINENO: checking whether to statically link to Gtk" >&5 echo $ECHO_N "checking whether to statically link to Gtk... $ECHO_C" >&6 -if test -n "$enable_static_gtk"; then +if test -n "$enable_static_gtk" && test "$enable_static_gtk" != "no"; then ENABLE_STATIC_GTK="TRUE" echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 @@ -17584,6 +17713,7 @@ s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t s,@GTK_LIBS@,$GTK_LIBS,;t t s,@GDKPIXBUF_CFLAGS@,$GDKPIXBUF_CFLAGS,;t t s,@GDKPIXBUF_LIBS@,$GDKPIXBUF_LIBS,;t t +s,@MOC@,$MOC,;t t s,@KDE_CFLAGS@,$KDE_CFLAGS,;t t s,@KDE_LIBS@,$KDE_LIBS,;t t s,@LIBSN_CFLAGS@,$LIBSN_CFLAGS,;t t |