[Libreoffice-commits] .: configure.in set_soenv.in
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Thu Oct 14 00:54:51 PDT 2010
configure.in | 1526 +++++++++++++++++++++++++++++------------------------------
set_soenv.in | 248 ++++-----
2 files changed, 876 insertions(+), 898 deletions(-)
New commits:
commit 6b39d3e3def5fc1b5462cb337d3623d1e7701e83
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Thu Oct 14 09:53:40 2010 +0200
Renamed OpenOffice.org into LibreOffice in configure scripts
diff --git a/configure.in b/configure.in
index e8532e7..385b3f0 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ dnl *
dnl * Desc: This file serves as input for the GNU autoconf package
dnl * in order to create a configure script.
dnl * In this stage configure just checks the pre-requisites
-dnl * necessary to build OpenOffice.org
+dnl * necessary to build LibreOffice
dnl *
dnl *
dnl ******************************************************************/
@@ -54,19 +54,19 @@ AC_ARG_ENABLE(vba,
],,)
AC_ARG_WITH(vba-package-format,
[ --with-vba-package-format specify package format for vba compatibility api.
- Specifying "builtin" means the api component and
+ Specifying "builtin" means the api component and
associated type library are part of the installation set.
Specifying "extn" creates an uno extension that is
- part of the installation set ( located in the program
+ part of the installation set ( located in the program
directory ) that MUST be optionly registered using
either the unopkg executeable or the extension manager
gui.
-
+
Note: "builtin" is the default, "extn" can cause
problems.
Usage: --with-vba-package-format="builtin" or
--with-vba-package-format="extn"
-],,)
+],,)
AC_ARG_ENABLE(pch,
[ --enable-pch EXPERIMENTAL: Enables precompiled header support for C++.
],,)
@@ -113,17 +113,17 @@ AC_ARG_ENABLE(activex_component,
[ --disable-activex-component Remove support for ActiveX embedding of OOo
],,enable_activex_component=yes)
AC_ARG_WITH(epm,
-[ --with-epm Decides which epm to use. Default is to use
- the one from the system if one is built. When
- either this is not there or you say =internal
- epm will be built.
+[ --with-epm Decides which epm to use. Default is to use
+ the one from the system if one is built. When
+ either this is not there or you say =internal
+ epm will be built.
],,)
AC_ARG_WITH(package-format,
[ --with-package-format specify package format(s) for OOo installsets.
Default is "normal" one of the OS/Distribution.
Usage: --with-package-format="foo bar"
-],,)
+],,)
AC_ARG_ENABLE(odk,
[ --disable-odk OO.o includes an ODK, office development kit
which some packagers may with to build without
@@ -229,12 +229,12 @@ AC_ARG_WITH(system-cairo,
[ --with-system-cairo Use Cairo libraries already on system
],,)
AC_ARG_ENABLE(opengl,
-[ --enable-opengl Determines whether to build the OpenGL 3D slide
+[ --enable-opengl Determines whether to build the OpenGL 3D slide
transitions component
],,enable_opengl=no)
AC_ARG_ENABLE(dbus,
-[ --enable-dbus Determines whether to enable presentation mode
- screensaver control under GNOME via DBUS
+[ --enable-dbus Determines whether to enable presentation mode
+ screensaver control under GNOME via DBUS
],,enable_dbus=no)
AC_ARG_ENABLE(gconf,
[ --disable-gconf Determines whether to use the GConf support
@@ -248,7 +248,7 @@ AC_ARG_ENABLE(gio,
],,enable_gio=no)
AC_ARG_ENABLE(static-gtk,
[ --enable-static-gtk Modules that are linked against gtk libraries use
- the static libraries instead of the dynamic ones.
+ the static libraries instead of the dynamic ones.
(enables -Bstatic linker flag for gtk libraries)
],,)
AC_ARG_ENABLE(layout,
@@ -269,7 +269,7 @@ AC_ARG_WITH(mozilla-toolkit,
components. Default: gtk2
],,)
AC_ARG_ENABLE(nss_module,
-[ --disable-nss-module Whether to use provided NSS module
+[ --disable-nss-module Whether to use provided NSS module
],,enable_nss_module=yes)
AC_ARG_ENABLE(kde,
[ --enable-kde Determines whether to use Qt/KDE vclplug on platforms
@@ -280,7 +280,7 @@ AC_ARG_ENABLE(kdeab,
],,if test "$enable_kde" = "yes"; then enable_kdeab=yes; fi)
AC_ARG_ENABLE(kde4,
[ --enable-kde4 Determines whether to use Qt4/KDE4 vclplug on platforms
- where Qt4 and KDE4 are available. May be used with --enable-kde
+ where Qt4 and KDE4 are available. May be used with --enable-kde
if you want to support both KDE3 and KDE4.
],,)
AC_ARG_ENABLE(binfilter,
@@ -307,7 +307,7 @@ AC_ARG_ENABLE(randr,
[ --disable-randr disable RandR support in the vcl project
],,enable_randr=yes)
AC_ARG_ENABLE(randr-link,
-[ --disable-randr-link disable linking with libXrandr, instead dynamically
+[ --disable-randr-link disable linking with libXrandr, instead dynamically
open it at runtime
],,enable_randr_link=yes)
AC_ARG_ENABLE(gstreamer,
@@ -322,7 +322,7 @@ AC_ARG_WITH(myspell-dicts,
AC_ARG_WITH(system-dicts,
[ --with-system-dicts Use dictionaries from system paths- Specify
them via --with-{dict,hyph,thes}-path=/path
- if you want to override the default ones
+ if you want to override the default ones
],,)
AC_ARG_WITH(external-dict-dir,
[ --with-external-dict-dir Specify external dictionary dir
@@ -347,7 +347,7 @@ AC_ARG_WITH(system-headers,
AC_ARG_WITH(system-jars,
[ --without-system-jars When building with --with-system-libs, also the
needed jars are expected on the system. Use this to
- disable that.
+ disable that.
(except for the db case where --with-system-db
*has to* imply using the db.jar from there, too)
],,)
@@ -609,7 +609,7 @@ AC_ARG_WITH(stlport,
Usage: --with-stlport=<absolute path to stlport home>
- Warning!!, disabling using --without-stlport or
+ Warning!!, disabling using --without-stlport or
enabling using --with-stlport on a platform that
defaults to the opposite will break ABI compatability
], WITH_STLPORT=$withval , WITH_STLPORT=auto)
@@ -618,20 +618,20 @@ AC_ARG_WITH(jdk-home,
please supply the path here.
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 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_WITH(java,
[ --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.
+ or XML filters.
], if test "$withval" = "yes"; then WITH_JAVA=java; else WITH_JAVA=$withval; fi, WITH_JAVA=java)
AC_ARG_WITH(java_target_version,
[ --with-java-target-version Generate class files that will work on JVMs with
@@ -656,7 +656,7 @@ AC_ARG_WITH(ant-home,
please supply the path here.
Note that this is not the location of the Ant binary
but the location of the entire distribution.
-
+
Usage: --with-ant-home=<absolute path to Ant home>
],,)
AC_ARG_WITH(junit,
@@ -671,40 +671,40 @@ AC_ARG_WITH(perl-home,
system, please supply the path here.
Note that this is not the location of the Perl binary
but the location of the entire distribution.
-
+
Usage: --with-perl-home=<absolute path to Perl 5 home>
],,)
AC_ARG_WITH(cl-home,
[ --with-cl-home For Windows NT users, please supply the path
- for the Microsoft C/C++ compiler.
+ for the Microsoft C/C++ compiler.
Note that this is not the location of the compiler
binary but the location of the entire distribution.
-
+
Usage: --with-cl-home=<absolute path to Microsoft C/C++ compiler home>
],,)
AC_ARG_WITH(mspdb-path,
[ --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>
],,)
AC_ARG_WITH(midl-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(nsis-path,
[ --with-nsis-path For Windows users, please supply the path to the
"Nullsoft Scriptable Install System" (NSIS). If NSIS
is found in the path or this option is supplied a self
- contained executable installer for OpenOffice.org will
+ contained executable installer for LibreOffice will
be created.
Usage: --with-nsis-path=<absolute path to nsis.exe>
@@ -725,54 +725,54 @@ AC_ARG_WITH(frame-home,
AC_ARG_WITH(psdk-home,
[ --with-psdk-home For Windows users, please supply the path to the
Microsoft Platform SDK.
-
+
Usage: --with-psdk-home=<absolute path to Microsoft Platform SDK>
],,)
AC_ARG_WITH(directx-home,
[ --with-directx-home For Windows users, please supply the path to the
Microsoft DirectX SDK.
-
+
Usage: --with-directx-home=<absolute path to Microsoft DirectX SDK>
],,)
AC_ARG_WITH(mozilla-build,
[ --with-mozilla-build For Windows users, please supply the path to the
mozilla build tools.
-
+
Usage: --with-mozilla-build=<absolute path to mozilla build tools>
- At the moment of this writing, an installer for the mozilla build tools
- can be obtained from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32.
+ At the moment of this writing, an installer for the mozilla build tools
+ can be obtained from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32.
],[MOZILLABUILD=$withval],)
AC_ARG_WITH(local-solenv,
[ --with-local-solenv If you have solenv in a location other than ./solenv,
please supply the path here.
-
+
Usage: --with-local-solenv=<absolute path to solenv>
],,)
AC_ARG_WITH(local-solver,
[ --with-local-solver if you have solver in a location other than ./solver,
please supply the path here.
-
+
Usage: --with-local-solver=<absolute path to solver>
],,)
AC_ARG_ENABLE(check-only,
[ --enable-check-only Use this option option if you just want to check your
- environment. This option stops the generation of an
+ environment. This option stops the generation of an
????env.set
-
+
Usage: --enable-check-only=yes
],,)
AC_ARG_ENABLE(ccache-skip,
-[[ --enable-ccache-skip [default=auto] allow the use of --ccache-skip to
- escape compiler flags that would otherwise prevent
+[[ --enable-ccache-skip [default=auto] allow the use of --ccache-skip to
+ escape compiler flags that would otherwise prevent
caching of the result (currently used on Mac only)
NOTE: requires patched version because of a bug in
- ccache (see issue 104567 for details and patch)
- explicitly enable if your version of ccache doesn't
+ ccache (see issue 104567 for details and patch)
+ explicitly enable if your version of ccache doesn't
identify as version 2.4_OOo
]],,enable_ccache_skip=auto)
AC_ARG_WITH(lang,
-[ --with-lang Use this option to build OpenOffice.org with
+[ --with-lang Use this option to build LibreOffice with
additional language support. English (US) is always
included by default. Separate multiple languages with
space. For all languages, use --with-lang=ALL.
@@ -788,7 +788,7 @@ AC_ARG_WITH(poor-help-localizations,
Usage: --with-poor-help-localizations="af ar be-BY ca"
],,)
AC_ARG_WITH(dict,
-[ --with-dict Use this option to build OpenOffice.org with
+[ --with-dict Use this option to build LibreOffice with
dictionary support. ALL dictionaries are always
included by default unless overridden with
this option. Separate multiple dictionaries with
@@ -953,17 +953,17 @@ dnl Message.
dnl ===================================================================
echo "********************************************************************"
echo "* *"
-echo "* OpenOffice.org build configuration. *"
+echo "* LibreOffice build configuration. *"
echo "* *"
echo "* The configure process checks your platform to see whether *"
-echo "* you can build OpenOffice.org on it. *"
+echo "* you can build LibreOffice on it. *"
echo "* This process checks all pre-requisites and generates a file *"
echo "* containing the necessary environment variables. *"
echo "* Source this file after configure has ended successfully. *"
echo "* *"
echo "* Any warning that is generated during the configure process *"
echo "* must be taken into account since it can be a reason for *"
-echo "* an unsuccessful build of OpenOffice.org *"
+echo "* an unsuccessful build of LibreOffice. *"
echo "* *"
echo "********************************************************************"
echo ""
@@ -999,7 +999,7 @@ else
fi
AC_SUBST(LOCAL_SOLENV)
-if test "$LOCAL_SOLENV" = "DEFAULT"; then
+if test "$LOCAL_SOLENV" = "DEFAULT"; then
_solenv="./solenv"
else
_solenv="$LOCAL_SOLENV"
@@ -1022,8 +1022,8 @@ dnl ===================================================================
AC_CANONICAL_SYSTEM
if test "$build" != "$host" -o "$build" != "$target" \
-o "$host" != "$target"; then
- AC_MSG_WARN([cross-compiling by any means is not supported (yet)!])
- echo "cross-compiling by any means is not supported (yet)!" >> warn
+ AC_MSG_WARN([cross-compiling by any means is not supported (yet)!])
+ echo "cross-compiling by any means is not supported (yet)!" >> warn
fi
if echo "$build_os" | grep cygwin; then
@@ -1043,140 +1043,140 @@ dnl Sequential to keep the logic very simple
dnl These values may be checked and reset later.
dnl ===================================================================
case "$build_os" in
- solaris*)
- test_gtk=yes
- test_cairo=yes
- build_gstreamer=yes
- test_kde=yes
- test_cups=yes
- test_randr=yes
- test_freetype=yes
- _os=SunOS
- AC_PATH_PROG( GNUTAR, gtar,,$PATH:/usr/sfw/bin)
- if test -z "$GNUTAR"; then
- AC_MSG_ERROR([gtar (gnu tar) not found but needed. Install it (SUN Freeware package).])
- fi
- AC_SUBST(GNUTAR)
-
- dnl ===========================================================
- dnl check whether we're using solaris 6,7,8 - sparc or intel.
- dnl ===========================================================
- AC_MSG_CHECKING([the Solaris operating system release])
- _os_release=`echo $build_os | $SED -e s/solaris2\.//`
- if test "$_os_release" -lt "6"; then
- AC_MSG_ERROR([use solaris >= 6 to build OpenOffice.org])
- else
- AC_MSG_RESULT([ok ($_os_release)])
- fi
-
- dnl check whether we're using a sparc or i386 processor
- AC_MSG_CHECKING([the processor type])
- if test "$build_cpu" = "sparc" -o "$build_cpu" = "i386"; then
- AC_MSG_RESULT([ok ($build_cpu)])
- else
- AC_MSG_ERROR([only sparc and i386 processors are supported])
- fi
- ;;
- linux-gnu*|k*bsd*-gnu*)
- test_gtk=yes
- test_cairo=yes
- build_gstreamer=yes
- test_kde=yes
- test_kde4=yes
- test_cups=yes
- test_randr=yes
- test_freetype=yes
- test_unix_quickstarter=yes
- _os=Linux
- ;;
- gnu)
- test_cups=no
- _os=GNU
- ;;
- cygwin*) # Windows
- test_cups=no
- test_cairo=yes
- test_freetype=no
- _os=WINNT
- ;;
- darwin*) # Mac OS X
- test_cups=yes
- test_gtk=yes
- test_cairo=yes
- test_randr=no
- test_freetype=no
- _os=Darwin
+ solaris*)
+ test_gtk=yes
+ test_cairo=yes
+ build_gstreamer=yes
+ test_kde=yes
+ test_cups=yes
+ test_randr=yes
+ test_freetype=yes
+ _os=SunOS
+ AC_PATH_PROG( GNUTAR, gtar,,$PATH:/usr/sfw/bin)
+ if test -z "$GNUTAR"; then
+ AC_MSG_ERROR([gtar (gnu tar) not found but needed. Install it (SUN Freeware package).])
+ fi
+ AC_SUBST(GNUTAR)
+
+ dnl ===========================================================
+ dnl check whether we're using solaris 6,7,8 - sparc or intel.
+ dnl ===========================================================
+ AC_MSG_CHECKING([the Solaris operating system release])
+ _os_release=`echo $build_os | $SED -e s/solaris2\.//`
+ if test "$_os_release" -lt "6"; then
+ AC_MSG_ERROR([use solaris >= 6 to build LibreOffice])
+ else
+ AC_MSG_RESULT([ok ($_os_release)])
+ fi
+
+ dnl check whether we're using a sparc or i386 processor
+ AC_MSG_CHECKING([the processor type])
+ if test "$build_cpu" = "sparc" -o "$build_cpu" = "i386"; then
+ AC_MSG_RESULT([ok ($build_cpu)])
+ else
+ AC_MSG_ERROR([only sparc and i386 processors are supported])
+ fi
+ ;;
+ linux-gnu*|k*bsd*-gnu*)
+ test_gtk=yes
+ test_cairo=yes
+ build_gstreamer=yes
+ test_kde=yes
+ test_kde4=yes
+ test_cups=yes
+ test_randr=yes
+ test_freetype=yes
+ test_unix_quickstarter=yes
+ _os=Linux
+ ;;
+ gnu)
+ test_cups=no
+ _os=GNU
+ ;;
+ cygwin*) # Windows
+ test_cups=no
+ test_cairo=yes
+ test_freetype=no
+ _os=WINNT
+ ;;
+ darwin*) # Mac OS X
+ test_cups=yes
+ test_gtk=yes
+ test_cairo=yes
+ test_randr=no
+ test_freetype=no
+ _os=Darwin
if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then
AC_MSG_WARN([Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray])
echo "Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >>warn
enable_systray=no
fi
- ;;
- os2*)
- test_x=no
- test_cups=no
- test_randr=no
- test_gtk=no
- test_freetype=no
- _os=OS2
- ;;
- freebsd*)
- test_gtk=yes
- test_cairo=yes
- build_gstreamer=yes
- test_kde=yes
- test_kde4=yes
- test_cups=yes
- test_randr=yes
- test_freetype=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])
- AC_MSG_CHECKING([which thread library to use])
- if test "$OSVERSION" -lt "500016"; then
- PTHREAD_CFLAGS="-D_THREAD_SAFE"
- PTHREAD_LIBS="-pthread"
- elif test "$OSVERSION" -lt "502102"; then
- PTHREAD_CFLAGS="-D_THREAD_SAFE"
- PTHREAD_LIBS="-lc_r"
- else
- PTHREAD_CFLAGS=""
- PTHREAD_LIBS="-pthread"
- fi
- AC_MSG_RESULT([$PTHREAD_LIBS])
- _os=FreeBSD
- ;;
- osf)
- test_cups=no
- test_randr=no
- _os=OSF1
- ;;
- *netbsd*)
- test_gtk=yes
- test_cairo=yes
- build_gstreamer=yes
- test_kde=yes
- test_kde4=yes
- test_cups=yes
- test_randr=yes
- test_freetype=yes
- PTHREAD_CFLAGS="-pthread"
- PTHREAD_LIBS="-pthread -lpthread"
- _os=NetBSD
- ;;
- aix*)
- test_cups=no
- test_randr=no
- test_freetype=yes
- PTHREAD_LIBS=-pthread
- _os=AIX
- ;;
+ ;;
+ os2*)
+ test_x=no
+ test_cups=no
+ test_randr=no
+ test_gtk=no
+ test_freetype=no
+ _os=OS2
+ ;;
+ freebsd*)
+ test_gtk=yes
+ test_cairo=yes
+ build_gstreamer=yes
+ test_kde=yes
+ test_kde4=yes
+ test_cups=yes
+ test_randr=yes
+ test_freetype=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])
+ AC_MSG_CHECKING([which thread library to use])
+ if test "$OSVERSION" -lt "500016"; then
+ PTHREAD_CFLAGS="-D_THREAD_SAFE"
+ PTHREAD_LIBS="-pthread"
+ elif test "$OSVERSION" -lt "502102"; then
+ PTHREAD_CFLAGS="-D_THREAD_SAFE"
+ PTHREAD_LIBS="-lc_r"
+ else
+ PTHREAD_CFLAGS=""
+ PTHREAD_LIBS="-pthread"
+ fi
+ AC_MSG_RESULT([$PTHREAD_LIBS])
+ _os=FreeBSD
+ ;;
+ osf)
+ test_cups=no
+ test_randr=no
+ _os=OSF1
+ ;;
+ *netbsd*)
+ test_gtk=yes
+ test_cairo=yes
+ build_gstreamer=yes
+ test_kde=yes
+ test_kde4=yes
+ test_cups=yes
+ test_randr=yes
+ test_freetype=yes
+ PTHREAD_CFLAGS="-pthread"
+ PTHREAD_LIBS="-pthread -lpthread"
+ _os=NetBSD
+ ;;
+ aix*)
+ test_cups=no
+ test_randr=no
+ test_freetype=yes
+ PTHREAD_LIBS=-pthread
+ _os=AIX
+ ;;
*)
- AC_MSG_ERROR([$_os operating system is not suitable to build OpenOffice.org!])
+ AC_MSG_ERROR([$_os operating system is not suitable to build LibreOffice!])
;;
esac
@@ -1273,21 +1273,21 @@ dnl First setting is whether to include symbols into final build.
dnl ===================================================================
AC_MSG_CHECKING([whether to include symbols into final build])
if test -n "$enable_symbols" && test "$enable_symbols" != "no"; then
- if test "$enable_symbols" = "yes" -o "$enable_symbols" = "TRUE"; then
- ENABLE_SYMBOLS="TRUE"
- AC_MSG_RESULT([yes])
- else
- if test "$enable_symbols" = "SMALL" -o "$enable_symbols" = "small"; then
- ENABLE_SYMBOLS="SMALL"
- AC_MSG_RESULT([yes, small ones])
- 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.])
- else
- ENABLE_SYMBOLS=
- fi
- fi
- fi
+ if test "$enable_symbols" = "yes" -o "$enable_symbols" = "TRUE"; then
+ ENABLE_SYMBOLS="TRUE"
+ AC_MSG_RESULT([yes])
+ else
+ if test "$enable_symbols" = "SMALL" -o "$enable_symbols" = "small"; then
+ ENABLE_SYMBOLS="SMALL"
+ AC_MSG_RESULT([yes, small ones])
+ 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.])
+ else
+ ENABLE_SYMBOLS=
+ fi
+ fi
+ fi
else
ENABLE_SYMBOLS=
AC_MSG_RESULT([no])
@@ -1428,32 +1428,32 @@ AC_SUBST(WITH_MYSPELL_DICTS)
if test "$WITH_MYSPELL_DICTS" = "NO"; then
AC_MSG_CHECKING([whether to use dicts from external paths])
if test -n "$with_system_dicts" -a "$with_system_dicts" = "yes"; then
- AC_MSG_RESULT([yes])
- SYSTEM_DICTS=YES
- AC_MSG_CHECKING([for spelling dictionary directory])
- if test -n "$with_external_dict_dir"; then
- DICT_SYSTEM_DIR=file://$with_external_dict_dir
- else
- DICT_SYSTEM_DIR=file:///usr/share/hunspell
- fi
- AC_MSG_RESULT([$DICT_SYSTEM_DIR])
- AC_MSG_CHECKING([for hyphenation patterns directory])
- if test -n "$with_external_hyph_dir"; then
- HYPH_SYSTEM_DIR=file://$with_external_hyph_dir
- else
- HYPH_SYSTEM_DIR=file:///usr/share/hyphen
- fi
- AC_MSG_RESULT([$HYPH_SYSTEM_DIR])
- AC_MSG_CHECKING([for thesaurus directory])
- if test -n "$with_external_thes_dir"; then
- THES_SYSTEM_DIR=file://$with_external_thes_dir
- else
- THES_SYSTEM_DIR=file:///usr/share/mythes
- fi
- AC_MSG_RESULT([$THES_SYSTEM_DIR])
+ AC_MSG_RESULT([yes])
+ SYSTEM_DICTS=YES
+ AC_MSG_CHECKING([for spelling dictionary directory])
+ if test -n "$with_external_dict_dir"; then
+ DICT_SYSTEM_DIR=file://$with_external_dict_dir
+ else
+ DICT_SYSTEM_DIR=file:///usr/share/hunspell
+ fi
+ AC_MSG_RESULT([$DICT_SYSTEM_DIR])
+ AC_MSG_CHECKING([for hyphenation patterns directory])
+ if test -n "$with_external_hyph_dir"; then
+ HYPH_SYSTEM_DIR=file://$with_external_hyph_dir
+ else
+ HYPH_SYSTEM_DIR=file:///usr/share/hyphen
+ fi
+ AC_MSG_RESULT([$HYPH_SYSTEM_DIR])
+ AC_MSG_CHECKING([for thesaurus directory])
+ if test -n "$with_external_thes_dir"; then
+ THES_SYSTEM_DIR=file://$with_external_thes_dir
+ else
+ THES_SYSTEM_DIR=file:///usr/share/mythes
+ fi
+ AC_MSG_RESULT([$THES_SYSTEM_DIR])
else
- AC_MSG_RESULT([no])
- SYSTEM_DICTS=NO
+ AC_MSG_RESULT([no])
+ SYSTEM_DICTS=NO
fi
fi
AC_SUBST(SYSTEM_DICTS)
@@ -1539,8 +1539,8 @@ if test -z "$with_gcc_home"; then
GCC_HOME=`which gcc | $SED -e s,/bin/gcc,,`
GCC_HOME_SET="false"
fi
-else
- GCC_HOME="$with_gcc_home"
+else
+ GCC_HOME="$with_gcc_home"
fi
AC_MSG_RESULT($GCC_HOME)
AC_SUBST(GCC_HOME)
@@ -1584,9 +1584,9 @@ if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; th
AC_MSG_ERROR([found version "$_gcc_version", use version 3+ of the gcc compiler])
else
if test "$GCCVER" -eq "030203"; then
- if test "$ENABLE_SYMBOLS" = "SMALL"; then
+ if test "$ENABLE_SYMBOLS" = "SMALL"; then
AC_MSG_ERROR([version "$_gcc_version" gives internal error with small.])
- fi
+ fi
fi
fi
if test "$_os" = "Darwin" -a "$GCCVER" -ge "040100" ; then
@@ -1612,7 +1612,7 @@ if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; th
fi
AC_MSG_RESULT([ok (GNU ld)])
fi
-fi
+fi
AC_SUBST(GCCVER)
HAVE_LD_BSYMBOLIC_FUNCTIONS=
@@ -1640,15 +1640,15 @@ dnl ===================================================================
AC_MSG_CHECKING([whether to enable pch feature])
if test -n "$enable_pch" && test "$enable_pch" != "no"; then
if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
- ENABLE_PCH="TRUE"
- AC_MSG_RESULT([yes])
+ ENABLE_PCH="TRUE"
+ AC_MSG_RESULT([yes])
dnl There is no PCH support in GCC versions prior to this
elif test "$GCC" = "yes" -a "$GCCVER" -gt "030400"; then
- ENABLE_PCH="TRUE"
- AC_MSG_RESULT([yes])
+ ENABLE_PCH="TRUE"
+ AC_MSG_RESULT([yes])
else
- ENABLE_PCH=""
- AC_MSG_WARN([Precompiled header not yet supported for your platform/compiler])
+ ENABLE_PCH=""
+ AC_MSG_WARN([Precompiled header not yet supported for your platform/compiler])
fi
else
ENABLE_PCH=""
@@ -1693,7 +1693,7 @@ if test "$_make_longver" -ge "037901" ; then
else
if test "$_os" = "Darwin"; then
if test "$_make_longver" -ge "037900" ; then
- AC_MSG_RESULT([$GNUMAKE $_make_version])
+ AC_MSG_RESULT([$GNUMAKE $_make_version])
else
AC_MSG_WARN([failed ($GNUMAKE $_make_version need 3.79.0+)])
fi
@@ -1732,11 +1732,11 @@ if test "$_os" = "SunOS"; then
dnl cc -V outputs to standard error!!!!
_sunstudio_string=`$CC -V 2>&1 | grep '^cc' | sed -e 's/.* C //'`
_sunstudio_version=`echo $_sunstudio_string | $AWK '{ print $1 }'`
- _sunstudio_major=`echo $_sunstudio_version | $AWK -F. '{ print $1 }'`
+ _sunstudio_major=`echo $_sunstudio_version | $AWK -F. '{ print $1 }'`
if test "$_sunstudio_major" != "5"; then
AC_MSG_ERROR([found version "$_sunstudio_version", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler])
else
- _sunstudio_minor=`echo $_sunstudio_version | $AWK -F. '{ if ($2 == 5) print "true"; else if ($2 == 7) print "true"; else if ($2 == 8) print "true"; else if ($2 == 9) print "true"; else print "false" }'`
+ _sunstudio_minor=`echo $_sunstudio_version | $AWK -F. '{ if ($2 == 5) print "true"; else if ($2 == 7) print "true"; else if ($2 == 8) print "true"; else if ($2 == 9) print "true"; else print "false" }'`
if test "$_sunstudio_minor" = "false"; then
AC_MSG_ERROR([found version "$_sunstudio_version", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler])
else
@@ -1813,7 +1813,7 @@ if test "$PERL"; then
_perl_version=$?
if test "$_perl_version" -lt 5; then
AC_MSG_ERROR([found Perl version "$_perl_version", use version 5 of Perl])
- fi
+ fi
AC_MSG_RESULT([checked (perl $_perl_version)])
else
AC_MSG_ERROR([Perl not found, install version 5 of Perl])
@@ -1825,123 +1825,123 @@ dnl Testing for required Perl modules
dnl ===================================================================
AC_MSG_CHECKING([for required Perl modules])
if `$PERL -e 'use Archive::Zip;'`; then
- AC_MSG_RESULT([all modules found])
+ AC_MSG_RESULT([all modules found])
else
- AC_MSG_ERROR([Failed to find some modules])
+ AC_MSG_ERROR([Failed to find some modules])
fi
dnl ===================================================================
dnl Check which Microsoft C/C++ or MinGW compiler is used for WINNT
dnl ===================================================================
if test "$_os" = "WINNT"; then
- if test "$WITH_MINGWIN" != "yes"; then
- AC_MSG_CHECKING([for friendly registry keys])
- # VS.Net 2003, VS.Net 2005
- if test -z "$with_cl_home"; then
- vctest=`./oowintool --msvc-productdir`;
- if test -x "$vctest/bin/cl.exe"; then
- with_cl_home=$vctest;
- fi
- else
- with_cl_home=`cygpath -u "$with_cl_home"`
- fi
- AC_MSG_RESULT([done])
-
- dnl ===========================================================
- dnl Check for mspdb71.dll/mspdb80.dll
- dnl ===========================================================
- dnl .NET 2003/5/8 Compiler
- if test -n "$with_mspdb_path";then
- with_mspdb_path=`cygpath -u "$with_mspdb_path"`
- fi
- if test -e "$with_mspdb_path/mspdb71.dll" -o -e "$with_mspdb_path/mspdb80.dll"; then
- MSPDB_PATH="$with_mspdb_path"
- fi
- dnl .NET 2003 case
- if test -z "$MSPDB_PATH" -a -e "$with_cl_home/../Common7/IDE/mspdb71.dll"; then
- MSPDB_PATH="$with_cl_home/../Common7/IDE"
- fi
- dnl .NET 2005/2008 case
- if test -z "$MSPDB_PATH" -a -e "$with_cl_home/../Common7/IDE/mspdb80.dll"; then
- MSPDB_PATH="$with_cl_home/../Common7/IDE"
- fi
- dnl Windows SDK 6.0 case
- if test -z "$MSPDB_PATH" -a -e "$with_cl_home/bin/mspdb80.dll"; then
- MSPDB_PATH="$with_cl_home/bin"
- fi
-
- if test -z "$MSPDB_PATH";then
- dnl AC_PATH_PROG only checks if MSPDB_PATH is still empty
- AC_PATH_PROG(MSPDB_PATH, mspdb80.dll)
- AC_PATH_PROG(MSPDB_PATH, mspdb71.dll)
- MSPDB_PATH=`dirname "$MSPDB_PATH"`
- fi
-
- if test -z "$MSPDB_PATH"; then
- AC_MSG_ERROR([You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path])
- fi
- MSPDB_PATH=`cygpath -d "$MSPDB_PATH"`
- MSPDB_PATH=`cygpath -u "$MSPDB_PATH"`
- dnl The path needs to be added before cl is called
- PATH="$MSPDB_PATH:$PATH"
-
- AC_MSG_CHECKING([the Microsoft C/C++ Compiler])
- if test -x "$with_cl_home/bin/cl.exe"; then
- CC="$with_cl_home/bin/cl.exe"
- else
- AC_PATH_PROG(CC, cl.exe)
- fi
- if test -e "$CC"; then
- # This gives us a posix path with 8.3 filename restrictions
- CC=`cygpath -d "$CC"`
- CC=`cygpath -u "$CC"`
- # Remove /cl.exe from CC case insensitive
- AC_MSG_RESULT([found ($CC)])
- COMPATH=`echo $CC | $SED 's@\/[[Bb]][[Ii]][[Nn]]\/[[cC]][[lL]]\.[[eE]][[xX]][[eE]]@@'`
- export INCLUDE=`cygpath -d "$COMPATH/Include"`
- dnl Check which Microsoft C/C++ compiler is found
- AC_MSG_CHECKING([the Version of Microsoft C/C++ Compiler])
-dnl The following find microsoft, matches nn.nn.nnnn then pulls numbers out.
- CCNUMVER=`$CC 2>&1 | $AWK "/Microsoft/ && /..\\...\\...../ {
- x = match( \\\$0, /..\\...\\...../ )
- CCversion = substr( \\\$0, RSTART, RLENGTH)
- tokencount = split (CCversion,vertoken,\".\")
- for ( i = 1 ; i <= tokencount ; i++ ) {
- printf (\"%04d\",vertoken[[i]] )
- }
- }"`
- AC_MSG_RESULT([found Compiler version $CCNUMVER.])
- if test "$CCNUMVER" -ge "001500000000"; then
- COMEX=12
- MSVSVER=2008
- AC_MSG_RESULT([found .NET 2008 / VS 9.0.])
- elif test "$CCNUMVER" -ge "001400000000"; then
- COMEX=11
- MSVSVER=2005
- AC_MSG_RESULT([found .NET 2005.])
- elif test "$CCNUMVER" -ge "001300102240"; then
- COMEX=10
- MSVSVER=2003
- AC_MSG_RESULT([found .NET 2003.])
- else
- AC_MSG_ERROR([Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler.])
- fi
- else
- AC_MSG_ERROR([Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe.])
- fi
- else
- AC_MSG_CHECKING([the Mingwin32 C++ Compiler])
- if test `$CC -dumpmachine | $SED -e 's/^.*-//'` = "mingw32"; then
- AC_MSG_RESULT([found.])
- if $CC -dumpspecs | grep -q "mno-cygwin"; then
- USE_MINGW="cygwin"
- else
- USE_MINGW="pure-mingw"
- fi
- else
- AC_MSG_ERROR([Mingwin32 C++ Compiler not found.])
- fi
- fi
+ if test "$WITH_MINGWIN" != "yes"; then
+ AC_MSG_CHECKING([for friendly registry keys])
+ # VS.Net 2003, VS.Net 2005
+ if test -z "$with_cl_home"; then
+ vctest=`./oowintool --msvc-productdir`;
+ if test -x "$vctest/bin/cl.exe"; then
+ with_cl_home=$vctest;
+ fi
+ else
+ with_cl_home=`cygpath -u "$with_cl_home"`
+ fi
+ AC_MSG_RESULT([done])
+
+ dnl ===========================================================
+ dnl Check for mspdb71.dll/mspdb80.dll
+ dnl ===========================================================
+ dnl .NET 2003/5/8 Compiler
+ if test -n "$with_mspdb_path";then
+ with_mspdb_path=`cygpath -u "$with_mspdb_path"`
+ fi
+ if test -e "$with_mspdb_path/mspdb71.dll" -o -e "$with_mspdb_path/mspdb80.dll"; then
+ MSPDB_PATH="$with_mspdb_path"
+ fi
+ dnl .NET 2003 case
+ if test -z "$MSPDB_PATH" -a -e "$with_cl_home/../Common7/IDE/mspdb71.dll"; then
+ MSPDB_PATH="$with_cl_home/../Common7/IDE"
+ fi
+ dnl .NET 2005/2008 case
+ if test -z "$MSPDB_PATH" -a -e "$with_cl_home/../Common7/IDE/mspdb80.dll"; then
+ MSPDB_PATH="$with_cl_home/../Common7/IDE"
+ fi
+ dnl Windows SDK 6.0 case
+ if test -z "$MSPDB_PATH" -a -e "$with_cl_home/bin/mspdb80.dll"; then
+ MSPDB_PATH="$with_cl_home/bin"
+ fi
+
+ if test -z "$MSPDB_PATH";then
+ dnl AC_PATH_PROG only checks if MSPDB_PATH is still empty
+ AC_PATH_PROG(MSPDB_PATH, mspdb80.dll)
+ AC_PATH_PROG(MSPDB_PATH, mspdb71.dll)
+ MSPDB_PATH=`dirname "$MSPDB_PATH"`
+ fi
+
+ if test -z "$MSPDB_PATH"; then
+ AC_MSG_ERROR([You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path])
+ fi
+ MSPDB_PATH=`cygpath -d "$MSPDB_PATH"`
+ MSPDB_PATH=`cygpath -u "$MSPDB_PATH"`
+ dnl The path needs to be added before cl is called
+ PATH="$MSPDB_PATH:$PATH"
+
+ AC_MSG_CHECKING([the Microsoft C/C++ Compiler])
+ if test -x "$with_cl_home/bin/cl.exe"; then
+ CC="$with_cl_home/bin/cl.exe"
+ else
+ AC_PATH_PROG(CC, cl.exe)
+ fi
+ if test -e "$CC"; then
+ # This gives us a posix path with 8.3 filename restrictions
+ CC=`cygpath -d "$CC"`
+ CC=`cygpath -u "$CC"`
+ # Remove /cl.exe from CC case insensitive
+ AC_MSG_RESULT([found ($CC)])
+ COMPATH=`echo $CC | $SED 's@\/[[Bb]][[Ii]][[Nn]]\/[[cC]][[lL]]\.[[eE]][[xX]][[eE]]@@'`
+ export INCLUDE=`cygpath -d "$COMPATH/Include"`
+ dnl Check which Microsoft C/C++ compiler is found
+ AC_MSG_CHECKING([the Version of Microsoft C/C++ Compiler])
+dnl The following find microsoft, matches nn.nn.nnnn then pulls numbers out.
+ CCNUMVER=`$CC 2>&1 | $AWK "/Microsoft/ && /..\\...\\...../ {
+ x = match( \\\$0, /..\\...\\...../ )
+ CCversion = substr( \\\$0, RSTART, RLENGTH)
+ tokencount = split (CCversion,vertoken,\".\")
+ for ( i = 1 ; i <= tokencount ; i++ ) {
+ printf (\"%04d\",vertoken[[i]] )
+ }
+ }"`
+ AC_MSG_RESULT([found Compiler version $CCNUMVER.])
+ if test "$CCNUMVER" -ge "001500000000"; then
+ COMEX=12
+ MSVSVER=2008
+ AC_MSG_RESULT([found .NET 2008 / VS 9.0.])
+ elif test "$CCNUMVER" -ge "001400000000"; then
+ COMEX=11
+ MSVSVER=2005
+ AC_MSG_RESULT([found .NET 2005.])
+ elif test "$CCNUMVER" -ge "001300102240"; then
+ COMEX=10
+ MSVSVER=2003
+ AC_MSG_RESULT([found .NET 2003.])
+ else
+ AC_MSG_ERROR([Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler.])
+ fi
+ else
+ AC_MSG_ERROR([Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe.])
+ fi
+ else
+ AC_MSG_CHECKING([the Mingwin32 C++ Compiler])
+ if test `$CC -dumpmachine | $SED -e 's/^.*-//'` = "mingw32"; then
+ AC_MSG_RESULT([found.])
+ if $CC -dumpspecs | grep -q "mno-cygwin"; then
+ USE_MINGW="cygwin"
+ else
+ USE_MINGW="pure-mingw"
+ fi
+ else
+ AC_MSG_ERROR([Mingwin32 C++ Compiler not found.])
+ fi
+ fi
fi
AC_SUBST(COMEX)
AC_SUBST(MSPDB_PATH)
@@ -1952,75 +1952,75 @@ dnl .NET needs special treatment
dnl ===================================================================
if test "$_os" = "WINNT"; then
if test "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then
- dnl Check midl.exe
- AC_PATH_PROG(MIDL_PATH, midl.exe)
- if test -n "$MIDL_PATH";then
- MIDL_PATH=`dirname "$MIDL_PATH"`
- fi
- if test -n "$with_midl_path";then
- with_midl_path=`cygpath -u "$with_midl_path"`
- fi
- if test -x "$with_midl_path/midl.exe"; then
- MIDL_PATH="$with_midl_path"
- fi
- if test -z "$MIDL_PATH" -a -e "$with_cl_home/../Common7/Tools/Bin/midl.exe"; then
- MIDL_PATH="$with_cl_home/../Common7/Tools/Bin"
- fi
- if test -z "$MIDL_PATH" ; then
+ dnl Check midl.exe
+ AC_PATH_PROG(MIDL_PATH, midl.exe)
+ if test -n "$MIDL_PATH";then
+ MIDL_PATH=`dirname "$MIDL_PATH"`
+ fi
+ if test -n "$with_midl_path";then
+ with_midl_path=`cygpath -u "$with_midl_path"`
+ fi
+ if test -x "$with_midl_path/midl.exe"; then
+ MIDL_PATH="$with_midl_path"
+ fi
+ if test -z "$MIDL_PATH" -a -e "$with_cl_home/../Common7/Tools/Bin/midl.exe"; then
+ MIDL_PATH="$with_cl_home/../Common7/Tools/Bin"
+ fi
+ if test -z "$MIDL_PATH" ; then
vstest=`./oowintool --msvs-productdir`;
if test -x "$vstest/Common7/Tools/Bin/midl.exe" ; then
- MIDL_PATH="$vstest/Common7/Tools/Bin"
+ MIDL_PATH="$vstest/Common7/Tools/Bin"
fi
- fi
- if test -z "$MIDL_PATH" ; then
- psdktest=`./oowintool --psdk-home`
- if test -x "$psdktest/Bin/midl.exe" ; then
- MIDL_PATH="$psdktest/Bin"
- fi
- fi
- if test ! -x "$MIDL_PATH/midl.exe"; then
- AC_MSG_ERROR([midl.exe not found. Make sure it's in the path or use --with-midl-path])
- fi
- # Convert to posix path with 8.3 filename restrictions ( No spaces )
- 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 -n "$with_csc_path";then
- with_csc_path=`cygpath -u "$with_csc_path"`
- fi
- if test -x "$with_csc_path/csc.exe"; then
- CSC_PATH="$with_csc_path"
- else
- csctest=`./oowintool --csc-compilerdir`;
- if test -x "$csctest/csc.exe"; then
- CSC_PATH="$csctest"
- fi
- 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"`
+ fi
+ if test -z "$MIDL_PATH" ; then
+ psdktest=`./oowintool --psdk-home`
+ if test -x "$psdktest/Bin/midl.exe" ; then
+ MIDL_PATH="$psdktest/Bin"
+ fi
+ fi
+ if test ! -x "$MIDL_PATH/midl.exe"; then
+ AC_MSG_ERROR([midl.exe not found. Make sure it's in the path or use --with-midl-path])
+ fi
+ # Convert to posix path with 8.3 filename restrictions ( No spaces )
+ 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 -n "$with_csc_path";then
+ with_csc_path=`cygpath -u "$with_csc_path"`
+ fi
+ if test -x "$with_csc_path/csc.exe"; then
+ CSC_PATH="$with_csc_path"
+ else
+ csctest=`./oowintool --csc-compilerdir`;
+ if test -x "$csctest/csc.exe"; then
+ CSC_PATH="$csctest"
+ fi
+ 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
dnl For VS2003/2005 $with_frame_home has to point to the directory with lib/mscoree.lib.
AC_MSG_CHECKING(.NET Framework)
- if test -n "$with_frame_home"; then
- with_frame_home=`cygpath -u "$with_frame_home"`
- fi
- 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/../SDK/v1.1/lib/mscoree.lib"; then
- FRAME_HOME="$with_cl_home/../SDK/v1.1"
- fi
- if test -z "$FRAME_HOME" ; then
+ if test -n "$with_frame_home"; then
+ with_frame_home=`cygpath -u "$with_frame_home"`
+ fi
+ 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/../SDK/v1.1/lib/mscoree.lib"; then
+ FRAME_HOME="$with_cl_home/../SDK/v1.1"
+ fi
+ if test -z "$FRAME_HOME" ; then
frametest=`./oowintool --dotnetsdk-dir`
if test -f "$frametest/lib/mscoree.lib"; then
FRAME_HOME="$frametest"
@@ -2030,14 +2030,14 @@ if test "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then
FRAME_HOME="$frametest"
fi
fi
- 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
- AC_MSG_RESULT(found)
- # Convert to posix path with 8.3 filename restrictions ( No spaces )
- FRAME_HOME=`cygpath -d "$FRAME_HOME"`
- FRAME_HOME=`cygpath -u "$FRAME_HOME"`
+ 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
+ AC_MSG_RESULT(found)
+ # Convert to posix path with 8.3 filename restrictions ( No spaces )
+ FRAME_HOME=`cygpath -d "$FRAME_HOME"`
+ FRAME_HOME=`cygpath -u "$FRAME_HOME"`
fi
AC_SUBST(MIDL_PATH)
AC_SUBST(CSC_PATH)
@@ -2114,7 +2114,7 @@ if test "$ENABLE_VBA" = "YES"; then
AC_MSG_ERROR([unknown packaging method])
fi
fi
-
+
else
VBA_EXTENSION=NO
AC_MSG_RESULT([defaulting to build into installset])
@@ -2131,7 +2131,7 @@ dnl ===================================================================
dnl ===================================================================
-dnl Check if cups/cups.h is available
+dnl Check if cups/cups.h is available
dnl ===================================================================
if test "$test_cups" = "yes" -a "$ENABLE_CUPS" = "TRUE" ; then
AC_CHECK_HEADER(cups/cups.h, [],
@@ -2245,7 +2245,7 @@ main (void)
test (E0);
return 0;
}
-],[AC_MSG_ERROR([your version of the GNU C++ compile has a bug which prevents OpenOffice.org from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details.])], [AC_MSG_RESULT([no])])
+],[AC_MSG_ERROR([your version of the GNU C++ compile has a bug which prevents LibreOffice from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details.])], [AC_MSG_RESULT([no])])
fi
fi
@@ -2272,7 +2272,7 @@ if test "$GXX" = "yes"; then
fi
fi
dnl This is the original code...
-dnl with_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
if test -z "$with_gxx_include_path"; then
with_gxx_include_path="NO_GXX_INCLUDE"
AC_MSG_RESULT([no g++ includes])
@@ -2380,9 +2380,9 @@ if test "$_os" = "SunOS"; then
AC_MSG_WARN([SunStudio C++ was not found])
echo "SunStudio C++ was not found" >> warn
else
- AC_MSG_RESULT([checked])
+ AC_MSG_RESULT([checked])
fi
- fi
+ fi
fi
dnl ===================================================================
dnl Extra checking for the OSF compiler
@@ -2408,14 +2408,14 @@ AC_MSG_CHECKING([exception type])
AC_LANG_PUSH([C++])
if test "$WITH_MINGWIN" = "yes"; then
AC_TRY_LINK(
- [#include <iostream>
+ [#include <iostream>
extern "C" void _Unwind_SjLj_RaiseException(void) __attribute__ ((__noreturn__));
- ],
- [_Unwind_SjLj_RaiseException() ],
- [exceptions_type="sjlj"],
- [exceptions_type="dwarf2"]
+ ],
+ [_Unwind_SjLj_RaiseException() ],
+ [exceptions_type="sjlj"],
+ [exceptions_type="dwarf2"]
)
fi
@@ -2429,7 +2429,7 @@ dnl Testing for required Solaris and SunStudio compiler patches...
dnl **************************************************************
dnl Check whether the OS is SunOS.
if test "$_os" = "SunOS"; then
- _temp=`showrev -p | $AWK -F" " '{ print $2 }'`
+ _temp=`showrev -p | $AWK -F" " '{ print $2 }'`
if test "$_os_release" = "7"; then
dnl ***************
dnl patch 106327-06
@@ -2533,13 +2533,13 @@ dnl ===================================================================
if test "$_os" = "Linux"; then
case "$build_cpu" in
i?86)
- case "$build_os" in k*bsd*-gnu*)
- DEFAULT_TO_STLPORT="no"
- ;;
- *)
- DEFAULT_TO_STLPORT="yes"
- ;;
- esac
+ case "$build_os" in k*bsd*-gnu*)
+ DEFAULT_TO_STLPORT="no"
+ ;;
+ *)
+ DEFAULT_TO_STLPORT="yes"
+ ;;
+ esac
;;
*)
DEFAULT_TO_STLPORT="no"
@@ -2550,7 +2550,7 @@ dnl ===================================================================
elif test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
DEFAULT_TO_STLPORT="yes"
elif test "$_os" = "OS2"; then
- DEFAULT_TO_STLPORT="yes"
+ DEFAULT_TO_STLPORT="yes"
elif test "$_os" = "FreeBSD"; then
DEFAULT_TO_STLPORT="yes"
fi
@@ -2597,34 +2597,34 @@ dnl ===================================================================
if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
AC_MSG_CHECKING([for STLport libraries])
if test "$_os" = "SunOS"; then
- if test -f "$STLPORT4/lib/libstlport_sunpro.so"; then
- AC_MSG_RESULT([checked])
- elif test -f "$STLPORT4/lib/libstlport.so"; then
- AC_MSG_RESULT([checked])
- STLPORT_VER=500
- else
- AC_MSG_ERROR([STLport libraries not found])
- fi
- elif test "$_os" = "Darwin"; then
- if test -f "$STLPORT4/lib/libstlport_gcc.dylib"; then
- AC_MSG_RESULT([checked])
- elif test -f "$STLPORT4/lib/libstlport.dylib"; then
- AC_MSG_RESULT([checked])
- STLPORT_VER=500
- else
- AC_MSG_ERROR([STLport libraries not found])
- fi
- else
- if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
- AC_MSG_RESULT([checked])
- elif test -f "$STLPORT4/lib/libstlport.so"; then
- AC_MSG_RESULT([checked])
- STLPORT_VER=500
- else
- AC_MSG_ERROR([STLport libraries not found])
- fi
- fi
- fi
+ if test -f "$STLPORT4/lib/libstlport_sunpro.so"; then
+ AC_MSG_RESULT([checked])
+ elif test -f "$STLPORT4/lib/libstlport.so"; then
+ AC_MSG_RESULT([checked])
+ STLPORT_VER=500
+ else
+ AC_MSG_ERROR([STLport libraries not found])
+ fi
+ elif test "$_os" = "Darwin"; then
+ if test -f "$STLPORT4/lib/libstlport_gcc.dylib"; then
+ AC_MSG_RESULT([checked])
+ elif test -f "$STLPORT4/lib/libstlport.dylib"; then
+ AC_MSG_RESULT([checked])
+ STLPORT_VER=500
+ else
+ AC_MSG_ERROR([STLport libraries not found])
+ fi
+ else
+ if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
+ AC_MSG_RESULT([checked])
+ elif test -f "$STLPORT4/lib/libstlport.so"; then
+ AC_MSG_RESULT([checked])
+ STLPORT_VER=500
+ else
+ AC_MSG_ERROR([STLport libraries not found])
+ fi
+ fi
+ fi
if test "$DEFAULT_TO_STLPORT" != "yes"; then
AC_MSG_WARN([using stlport. Warning, breaks your ABI compatability!])
echo "using stlport. Warning, breaks your ABI compatability!" >>warn
@@ -2660,7 +2660,7 @@ fi
# ===================================================================
# use --ccache-skip?
# ===================================================================
-dnl used to escape compiler options for ccache that otherwise prevent
+dnl used to escape compiler options for ccache that otherwise prevent
dnl caching of the results (like "-x objective-c++" for Mac)
AC_MSG_CHECKING([whether we are allowed and able to use --ccache-skip])
if test "$_os" != "Darwin" ; then
@@ -2677,7 +2677,7 @@ elif test "$enable_ccache_skip" = "auto" ; then
if test "$CCACHE" = "not_found" ; then
AC_MSG_NOTICE([not enabling --ccache-skip (ccache not found)])
else
- # check ccache version
+ # check ccache version
AC_MSG_CHECKING([whether version of ccache is suitable])
CCACHE_VERSION=`"$CCACHE" -V | "$AWK" '/^ccache version/{print $3}'`
if test "$CCACHE_VERSION" = "2.4_OOo"; then
@@ -2687,7 +2687,7 @@ elif test "$enable_ccache_skip" = "auto" ; then
save_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS --ccache-skip -O2"
dnl an empty program will do, we're checking the compiler flags
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([],[]),
+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([],[]),
[use_ccache=yes], [use_ccache=no])
if test $use_ccache = yes ; then
AC_MSG_RESULT([yes, will enable --ccache-skip])
@@ -2744,7 +2744,7 @@ using namespace __gnu_cxx;
using namespace std;
],[istringstream strm( "test" ); return 0;],
$EGREP -q unresolvable conftest.err;
- if test $? -eq 0; then gccvisok=no; else gccvisok=yes; fi,
+ if test $? -eq 0; then gccvisok=no; else gccvisok=yes; fi,
gccvisok=no)
AC_MSG_RESULT([$gccvisok])
if test "$gccvisok" = "no"; then
@@ -2774,7 +2774,7 @@ _ACEOF
i?86|x86_64)
if $EGREP -q '@PLT' visibility.s; then
gccvisbroken=no
- else
+ else
gccvisbroken=yes
fi
;;
@@ -2939,50 +2939,28 @@ if test "$SOLAR_JAVA" != ""; then
# AC_MSG_ERROR([Kaffe is too old ($KAFFE_VER - $_kaffe_ver), you need at least 1.1.0])
# fi
# JDK=kaffe
-#
+#
# dnl TODO: define some project exclusion variables
-#
+#
# AC_MSG_RESULT([checked (Kaffe $KAFFE_VER)])
# AC_MSG_WARN([EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile])
# echo "EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile" >>warn
# JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"`
elif test `$JAVAINTERPRETER --version 2>&1 | grep -c "GNU libgcj"` -gt 0; then
JDK=gcj
- AC_MSG_RESULT([checked (gcj)])
+ AC_MSG_RESULT([checked (gcj)])
_gij_version=`$JAVAINTERPRETER --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
_gij_longver=`echo $_gij_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "BEA"` -gt 0; then
AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.in])
-# JDK=bea
-#
-# dnl BEA JDK specific tests
-# _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
-# _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
-#
-# if test "$_jdk_ver" -lt 10500; then
-# AC_MSG_ERROR([JDK is too old, you need at least BEA JDK 1.5.0])
-# fi
-#
-# AC_MSG_RESULT([checked (BEA JDK $_jdk)])
-#
-# if test "$with_jdk_home" = ""; then
-# AC_MSG_ERROR([In order to successfully build OpenOffice.org using the BEA JDK,
-#you must use the "--with-jdk-home" configure option explicitly])
-# fi
-#
-# AC_MSG_WARN([A bug in certain BEA JREs can prevent you from successfully compiling some modules])
-# echo "A bug in certain BEA JREs can prevent you from successfully compiling some modules" >>warn
-#
-# JAVA_HOME=$with_jdk_home
-#
elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "IBM"` -gt 0; then
JDK=ibm
dnl IBM JDK specific tests
_jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
_jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
-
+
if test "$_jdk_ver" -lt 10500; then
AC_MSG_ERROR([IBM JDK is too old, you need at least 1.5])
fi
@@ -2990,19 +2968,19 @@ if test "$SOLAR_JAVA" != ""; then
AC_MSG_RESULT([checked (IBM JDK $_jdk)])
if test "$with_jdk_home" = ""; then
- AC_MSG_ERROR([In order to successfully build OpenOffice.org using the IBM JDK,
+ AC_MSG_ERROR([In order to successfully build LibreOffice using the IBM JDK,
you must use the "--with-jdk-home" configure option explicitly])
fi
JAVA_HOME=$with_jdk_home
-
- else
+
+ else
JDK=sun
dnl SUN JDK specific tests
_jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
_jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
-
+
if test "$_jdk_ver" -lt 10500; then
AC_MSG_ERROR([JDK is too old, you need at least 1.5])
fi
@@ -3065,7 +3043,7 @@ dnl ===================================================================
dnl Checks for javac
dnl ===================================================================
if test "$SOLAR_JAVA" != ""; then
- if test "$JDK" = "gcj"; then
+ if test "$JDK" = "gcj"; then
javacompiler=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g" | $SED -e "s/java/javac/g"`
else
javacompiler="javac"
@@ -3217,7 +3195,7 @@ _ACEOF
if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then
if basename $(readlink $(readlink $JAVACOMPILER)) >/dev/null 2>/dev/null; then
- # try to recover first by looking whether we have a alternatives
+ # try to recover first by looking whether we have a alternatives
# system as in Debian or newer SuSEs where following /usr/bin/javac
# over /etc/alternatives/javac leads to the right bindir where we
# just need to strip a bit away to get a valid JAVA_HOME
@@ -3269,7 +3247,7 @@ fi
AWTLIB=
if test "$SOLAR_JAVA" != ""; then
AC_MSG_CHECKING([for jawt lib name])
- if test "$JDK" = "gcj"; then
+ if test "$JDK" = "gcj"; then
save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS
CFLAGS="$CFLAGS -I$JAVA_HOME/include"
@@ -3377,20 +3355,20 @@ else
# This test _should_ work because the one accepts -V (ours) and one
# (the other) not...
$DMAKE -V 2>/dev/null | grep 'dmake .* Version .*' >/dev/null
- if test $? -eq 0; then
+ if test $? -eq 0; then
BUILD_DMAKE=NO
AC_MSG_RESULT([yes])
AC_MSG_CHECKING([the dmake version])
DMAKE_VERSION=`$DMAKE -V | $AWK '$3 == "Version" {print $4}'`
if test "`echo $DMAKE_VERSION | cut -d'.' -f1`" -gt "4"; then
- AC_MSG_RESULT([OK, >= 4.11])
+ AC_MSG_RESULT([OK, >= 4.11])
elif test "`echo $DMAKE_VERSION | cut -d'.' -f1`" = "4" && \
- test "`echo $DMAKE_VERSION | cut -d'.' -f2`" -ge "11"; then
- AC_MSG_RESULT([OK, >= 4.11])
+ test "`echo $DMAKE_VERSION | cut -d'.' -f2`" -ge "11"; then
+ AC_MSG_RESULT([OK, >= 4.11])
else
- AC_MSG_RESULT([too old. >= 4.11 is needed])
- echo "A newer dmake will be built on ./bootstrap"
- BUILD_DMAKE=YES
+ AC_MSG_RESULT([too old. >= 4.11 is needed])
+ echo "A newer dmake will be built on ./bootstrap"
+ BUILD_DMAKE=YES
fi
else
AC_MSG_RESULT([no])
@@ -3408,7 +3386,7 @@ if test "$enable_epm" = "yes"; then
dnl ===================================================================
if test "$_os" != "WINNT"; then
if test -n "$with_epm"; then
- EPM=$with_epm
+ EPM=$with_epm
else
AC_PATH_PROG(EPM, epm, no)
fi
@@ -3426,27 +3404,27 @@ if test "$enable_epm" = "yes"; then
fi
AC_MSG_CHECKING([epm version])
EPM_VERSION=`$EPM | grep 'ESP Package Manager' | cut -d' ' -f4 | $SED -e s/v//`
- if test "`echo $EPM_VERSION | cut -d'.' -f1`" -gt "3" || \
- test "`echo $EPM_VERSION | cut -d'.' -f1`" -eq "3" -a "`echo $EPM_VERSION | cut -d'.' -f2`" -ge "7"; then
+ if test "`echo $EPM_VERSION | cut -d'.' -f1`" -gt "3" || \
+ test "`echo $EPM_VERSION | cut -d'.' -f1`" -eq "3" -a "`echo $EPM_VERSION | cut -d'.' -f2`" -ge "7"; then
AC_MSG_RESULT([OK, >= 3.7])
BUILD_EPM=NO
- if test "$_os" = "Darwin"; then
+ if test "$_os" = "Darwin"; then
AC_MSG_CHECKING([which PackageMaker EPM thinks to use])
- _pm=`strings $EPM | grep PackageMaker | cut -d" " -f1`
- if test "$_pm" = "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker"; then
- AC_MSG_ERROR([$_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)])
- elif test "$_pm" = "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"; then
- AC_MSG_RESULT([$_pm, ok])
- else # we never should get here, but go safe
- AC_MSG_ERROR([$_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)])
- fi
- fi
- else
+ _pm=`strings $EPM | grep PackageMaker | cut -d" " -f1`
+ if test "$_pm" = "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker"; then
+ AC_MSG_ERROR([$_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)])
+ elif test "$_pm" = "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"; then
+ AC_MSG_RESULT([$_pm, ok])
+ else # we never should get here, but go safe
+ AC_MSG_ERROR([$_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)])
+ fi
+ fi
+ else
AC_MSG_RESULT([too old. epm >= 3.7 is required.])
echo "EPM will be built."
BUILD_EPM=YES
BUILD_TYPE="$BUILD_TYPE EPM"
- fi
+ fi
fi
fi
@@ -3455,47 +3433,47 @@ if test "$enable_epm" = "yes"; then
# defaults
case "$_os" in
- OS2)
- PKGFORMAT=native
- ;;
- Darwin)
- PKGFORMAT=dmg
- ;;
- SunOS)
- PKGFORMAT=pkg
- ;;
- Linux)
+ OS2)
+ PKGFORMAT=native
+ ;;
+ Darwin)
+ PKGFORMAT=dmg
+ ;;
+ SunOS)
+ PKGFORMAT=pkg
+ ;;
+ Linux)
# if building on Debian, default should be deb...
if test -e /etc/debian_version; then
PKGFORMAT=deb
else
PKGFORMAT=rpm
fi
- ;;
- AIX)
- PKGFORMAT=rpm
- ;;
- *BSD)
- PKGFORMAT=bsd
- ;;
- OSF1)
- PKGFORMAT=setld
- ;;
+ ;;
+ AIX)
+ PKGFORMAT=rpm
+ ;;
+ *BSD)
+ PKGFORMAT=bsd
+ ;;
+ OSF1)
+ PKGFORMAT=setld
+ ;;
WINNT)
PKGFORMAT=msi
;;
- # we never should get here since we check the arciecture/os at the beginning,
- # but go sure...
- *)
- AC_MSG_ERROR([unknown system])
+ # we never should get here since we check the arciecture/os at the beginning,
+ # but go sure...
+ *)
+ AC_MSG_ERROR([unknown system])
esac
if test -n "$with_package_format"; then
- for i in $with_package_format; do
- case "$i" in
- aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | portable | archive | dmg | installed | msi)
- ;;
- *)
- AC_MSG_ERROR([unsupported format $i. Supported by EPM are:
+ for i in $with_package_format; do
+ case "$i" in
+ aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | portable | archive | dmg | installed | msi)
+ ;;
+ *)
+ AC_MSG_ERROR([unsupported format $i. Supported by EPM are:
aix - AIX software distribution
bsd - FreeBSD, NetBSD, or OpenBSD software distribution
depot or swinstall - HP-UX software distribution
@@ -3512,11 +3490,11 @@ archive - .tar.gz or .zip
dmg - Mac OS X .dmg
installed - installation tree
msi - Windows .msi
- ])
- ;;
- esac
- done
- PKGFORMAT="$with_package_format"
+ ])
+ ;;
+ esac
+ done
+ PKGFORMAT="$with_package_format"
fi
AC_MSG_RESULT([$PKGFORMAT])
if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null; then
@@ -3531,7 +3509,7 @@ msi - Windows .msi
if test $? -eq 0; then
RPM=$a
break
- fi
+ fi
fi
done
if test -z "$RPM" ; then
@@ -3563,10 +3541,10 @@ msi - Windows .msi
fi
if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null || \
echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
- if test "$EPM" != "no" && test "$EPM" != "internal"; then
+ if test "$EPM" != "no" && test "$EPM" != "internal"; then
if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then
AC_MSG_CHECKING([whether epm is patched for OOos needs])
- if grep "Patched for OpenOffice.org" $EPM >/dev/null 2>/dev/null; then
+ if grep "Patched for LibreOffice" $EPM >/dev/null 2>/dev/null; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
@@ -3610,13 +3588,13 @@ dnl Check for gperf
dnl ===================================================================
AC_PATH_PROG(GPERF, gperf)
if test -z "$GPERF"; then
- AC_MSG_ERROR([gperf not found but needed. Install it.])
+ AC_MSG_ERROR([gperf not found but needed. Install it.])
fi
AC_MSG_CHECKING([gperf version])
if test "`$GPERF --version | $EGREP ^GNU\ gperf | $AWK '{ print $3 }' | cut -d. -f1`" -ge "3"; then
- AC_MSG_RESULT([OK])
+ AC_MSG_RESULT([OK])
else
- AC_MSG_ERROR([too old, you need at least 3.0.0])
+ AC_MSG_ERROR([too old, you need at least 3.0.0])
fi
dnl ===================================================================
@@ -3626,7 +3604,7 @@ dnl # PKG_CHECK_MODULES might not happen, you should be sure to include an
dnl # explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
dnl ===================================================================
if test "$_os" != "WNT"; then
- PKG_PROG_PKG_CONFIG
+ PKG_PROG_PKG_CONFIG
fi
dnl ===================================================================
@@ -3745,7 +3723,7 @@ if test "$_os" = "Darwin" && test "$with_system_zlib" != "no"; then
fi
AC_MSG_CHECKING([which zlib to use])
if test -n "$with_system_zlib" -o -n "$with_system_libs" && \
- test "$with_system_zlib" != "no"; then
+ test "$with_system_zlib" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_ZLIB=YES
AC_CHECK_HEADER(zlib.h, [],
@@ -3764,13 +3742,13 @@ dnl Check for system jpeg
dnl ===================================================================
AC_MSG_CHECKING([which jpeg to use])
if test -n "$with_system_jpeg" -o -n "$with_system_libs" && \
- test "$with_system_jpeg" != "no"; then
+ test "$with_system_jpeg" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_JPEG=YES
AC_CHECK_HEADER(jpeglib.h, [],
[AC_MSG_ERROR(jpeg.h not found. install libjpeg)], [])
AC_CHECK_LIB(jpeg, jpeg_resync_to_restart, [ JPEG3RDLIB=-ljpeg ],
- [AC_MSG_CHECKING(jpeg library not found or fuctional)], [])
+ [AC_MSG_CHECKING(jpeg library not found or fuctional)], [])
else
AC_MSG_RESULT([internal])
SYSTEM_JPEG=NO
@@ -3783,13 +3761,13 @@ dnl Check for system expat
dnl ===================================================================
AC_MSG_CHECKING([which expat to use])
if test -n "$with_system_expat" -o -n "$with_system_libs" && \
- test "$with_system_expat" != "no"; then
+ test "$with_system_expat" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_EXPAT=YES
AC_CHECK_HEADER(expat.h, [],
[AC_MSG_ERROR(expat.h not found. install expat)], [])
AC_CHECK_LIB(expat, XML_ParserCreate, [],
- [AC_MSG_RESULT(expat library not found or functional.)], [])
+ [AC_MSG_RESULT(expat library not found or functional.)], [])
else
AC_MSG_RESULT([internal])
SYSTEM_EXPAT=NO
@@ -3839,7 +3817,7 @@ dnl Check whether freetype is available
dnl ===================================================================
if test "$test_freetype" = "yes"; then
AC_MSG_CHECKING([whether freetype is available])
- PKG_CHECK_MODULES( FREETYPE, freetype2 >= 2.0 )
+ PKG_CHECK_MODULES( FREETYPE, freetype2 >= 2.0 )
fi
AC_SUBST(FREETYPE_CFLAGS)
AC_SUBST(FREETYPE_LIBS)
@@ -3951,7 +3929,7 @@ dnl ===================================================================
AC_MSG_CHECKING([which libxml to use])
if test -n "$with_system_libxml" -o -n "$with_system_libs" -o \
"$_os" = "Darwin" && \
- test "$with_system_libxml" != "no"; then
+ test "$with_system_libxml" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_LIBXML=YES
PKG_CHECK_MODULES_MACHACK(LIBXML, xml2-config, libxml-2.0 >= 2.0)
@@ -3975,7 +3953,7 @@ if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then
PYTHON_CFLAGS="-I/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3"
PYTHON_LIBS="-framework Python"
elif test -n "$with_system_python" -o -n "$with_system_libs" && \
- test "$with_system_python" != "no"; then
+ test "$with_system_python" != "no"; then
with_system_python=yes
AC_MSG_RESULT([external])
AM_PATH_PYTHON([2.2])
@@ -4003,10 +3981,10 @@ else
fi
# bz2 tarball and bzip2 is not standard
if test -z "$BZIP2"; then
- AC_PATH_PROG( BZIP2, bzip2)
- if test -z "$BZIP2"; then
- AC_MSG_ERROR([the internal Python module has a .tar.bz2. You need bzip2])
- fi
+ AC_PATH_PROG( BZIP2, bzip2)
+ if test -z "$BZIP2"; then
+ AC_MSG_ERROR([the internal Python module has a .tar.bz2. You need bzip2])
+ fi
fi
fi
AC_SUBST(SYSTEM_PYTHON)
@@ -4020,7 +3998,7 @@ dnl Check for system berkley db
dnl ===================================================================
AC_MSG_CHECKING([which db to use])
if test -n "$with_system_db" -o -n "$with_system_libs" && \
- test "$with_system_db" != "no"; then
+ test "$with_system_db" != "no"; then
SYSTEM_DB=YES
AC_MSG_RESULT([external])
AC_CHECK_HEADER(db.h, [ DB_INCLUDES=/usr/include ],
@@ -4062,10 +4040,10 @@ if test -n "$with_system_lucene" -o -n "$with_system_libs" && \
AC_MSG_RESULT([external])
SYSTEM_LUCENE=YES
if test -z $LUCENE_CORE_JAR; then
- AC_CHECK_FILE(/usr/share/java/lucene-core-2.3.jar,
+ AC_CHECK_FILE(/usr/share/java/lucene-core-2.3.jar,
[ LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.3.jar ],
[
- AC_CHECK_FILE(/usr/share/java/lucene-core.jar,
+ AC_CHECK_FILE(/usr/share/java/lucene-core.jar,
[ LUCENE_CORE_JAR=/usr/share/java/lucene-core.jar ],
[ AC_CHECK_FILE(/usr/share/java/lucene.jar,
[ LUCENE_CORE_JAR=/usr/share/java/lucene.jar ],
@@ -4081,10 +4059,10 @@ if test -n "$with_system_lucene" -o -n "$with_system_libs" && \
fi
if test -z $LUCENE_ANALYZERS_JAR; then
- AC_CHECK_FILE(/usr/share/java/lucene-analyzers-2.3.jar,
+ AC_CHECK_FILE(/usr/share/java/lucene-analyzers-2.3.jar,
[ LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-analyzers-2.3.jar ],
[
- AC_CHECK_FILE(/usr/share/java/lucene-contrib/lucene-analyzers.jar,
+ AC_CHECK_FILE(/usr/share/java/lucene-contrib/lucene-analyzers.jar,
[ LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-contrib/lucene-analyzers.jar ],
[ AC_MSG_ERROR(lucene-analyzers.jar replacement not found.)]
)
@@ -4146,22 +4124,22 @@ dnl ===================================================================
AC_MSG_CHECKING([for mysql pre-requisites])
if test -n "$with_system_mysql" -o -n "$with_system_libs" && \
test "$with_system_mysql" != "no" && test "$with_system_libs" != "no"; then
- AC_MSG_RESULT([external MySQL])
- SYSTEM_MYSQL=YES
- AC_PATH_PROG( MYSQLCONFIG, mysql_config)
- AC_MSG_CHECKING([MySQL version])
- MYSQL_VERSION=`$MYSQLCONFIG --version`
- MYSQL_MAJOR=`$MYSQLCONFIG --version | cut -d"." -f1`
- if test "$MYSQL_MAJOR" -ge "5"; then
- AC_MSG_RESULT([OK])
- else
- AC_MSG_ERROR([too old, use 5.0.x or 5.1.x])
- fi
- AC_MSG_CHECKING([for MySQL Client library])
- MYSQL_INC=`$MYSQLCONFIG --include`
- MYSQL_LIB=`$MYSQLCONFIG --libs`
- MYSQL_DEFINES=`$MYSQLCONFIG --cflags | sed -e s,$MYSQL_INC,,`
- AC_MSG_RESULT([includes $MYSQL_INC, libraries $MYSQL_LIB])
+ AC_MSG_RESULT([external MySQL])
+ SYSTEM_MYSQL=YES
+ AC_PATH_PROG( MYSQLCONFIG, mysql_config)
+ AC_MSG_CHECKING([MySQL version])
+ MYSQL_VERSION=`$MYSQLCONFIG --version`
+ MYSQL_MAJOR=`$MYSQLCONFIG --version | cut -d"." -f1`
+ if test "$MYSQL_MAJOR" -ge "5"; then
+ AC_MSG_RESULT([OK])
+ else
+ AC_MSG_ERROR([too old, use 5.0.x or 5.1.x])
+ fi
+ AC_MSG_CHECKING([for MySQL Client library])
+ MYSQL_INC=`$MYSQLCONFIG --include`
+ MYSQL_LIB=`$MYSQLCONFIG --libs`
+ MYSQL_DEFINES=`$MYSQLCONFIG --cflags | sed -e s,$MYSQL_INC,,`
+ AC_MSG_RESULT([includes $MYSQL_INC, libraries $MYSQL_LIB])
else
SYSTEM_MYSQL=NO
if test -n "$with_libmysql_path"; then
@@ -4197,24 +4175,24 @@ dnl ===================================================================
# who thought this too-generic cppconn dir was a good idea?
AC_MSG_CHECKING([MySQL Connector/C++])
if test -n "$with_system_mysql_cppconn" -o -n "$with_system_libs" && \
- test "$with_system_mysql_cppconn" != "no" && test "$with_system_libs" != "no"; then
- AC_MSG_RESULT([external])
- SYSTEM_MYSQL_CPPCONN=YES
+ test "$with_system_mysql_cppconn" != "no" && test "$with_system_libs" != "no"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_MYSQL_CPPCONN=YES
AC_LANG_PUSH([C++])
- AC_CHECK_HEADER(mysql_driver.h, [],
- [AC_MSG_ERROR(mysql_driver.h not found. install MySQL C++ Connectivity)], [])
- AC_CHECK_LIB(mysqlcppconn, main, [],
- [AC_MSG_ERROR(MySQL C++ Connectivity lib not found or functional)], [])
+ AC_CHECK_HEADER(mysql_driver.h, [],
+ [AC_MSG_ERROR(mysql_driver.h not found. install MySQL C++ Connectivity)], [])
+ AC_CHECK_LIB(mysqlcppconn, main, [],
+ [AC_MSG_ERROR(MySQL C++ Connectivity lib not found or functional)], [])
AC_MSG_CHECKING([version])
AC_TRY_RUN([
#include <mysql_driver.h>
int main(int argc, char **argv) {
- sql::Driver *driver;
- driver = get_driver_instance();
- if (driver->getMajorVersion() > 1 || \
- (driver->getMajorVersion() == 1 && driver->getMinorVersion() > 0) || \
- (driver->getMajorVersion() == 1 && driver->getMinorVersion() == 0 && driver->getPatchVersion() >= 6))
+ sql::Driver *driver;
+ driver = get_driver_instance();
+ if (driver->getMajorVersion() > 1 || \
+ (driver->getMajorVersion() == 1 && driver->getMinorVersion() > 0) || \
+ (driver->getMajorVersion() == 1 && driver->getMinorVersion() == 0 && driver->getPatchVersion() >= 6))
return 0;
else
return 1;
@@ -4223,15 +4201,15 @@ int main(int argc, char **argv) {
AC_LANG_POP([C++])
else
- AC_MSG_RESULT([internal])
+ AC_MSG_RESULT([internal])
AC_MSG_CHECKING([for mysqlcppconn module])
if test -d mysqlcppconn; then
AC_MSG_RESULT([OK])
else
AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
fi
- BUILD_TYPE="$BUILD_TYPE MYSQLCPPCONN"
- SYSTEM_MYSQL_CPPCONN=NO
+ BUILD_TYPE="$BUILD_TYPE MYSQLCPPCONN"
+ SYSTEM_MYSQL_CPPCONN=NO
fi
AC_LANG_POP([C++])
AC_SUBST(SYSTEM_MYSQL_CPPCONN)
@@ -4316,10 +4294,10 @@ if test -n "$with_system_saxon" -o -n "$with_system_libs" && \
AC_MSG_RESULT([external])
SYSTEM_SAXON=YES
if test -z $SAXON_JAR; then
- AC_CHECK_FILE(/usr/share/java/saxon9.jar,
+ AC_CHECK_FILE(/usr/share/java/saxon9.jar,
[ SAXON_JAR=/usr/share/java/saxon9.jar ],
[
- AC_CHECK_FILE(/usr/share/java/saxon.jar,
+ AC_CHECK_FILE(/usr/share/java/saxon.jar,
[ SAXON_JAR=/usr/share/java/saxon.jar ],
[ AC_CHECK_FILE(/usr/share/java/saxon9.jar,
[ SAXON_JAR=/usr/share/java/saxon9.jar ],
@@ -4340,9 +4318,9 @@ if test -n "$with_system_saxon" -o -n "$with_system_libs" && \
fi
dnl Saxon comes in two practically available versions, the out-of-date saxonb which
-dnl supports the java extensions that OOo uses, and the up-to-date saxon he
+dnl supports the java extensions that OOo uses, and the up-to-date saxon he
dnl "home edition" version, which is crippled to not support those java extensions.
-dnl And as an aside the he one also needs to be tweaked to include
+dnl And as an aside the he one also needs to be tweaked to include
dnl a META-INF/services to broadcast that it supports the jaxp transform factory
AC_MSG_CHECKING([if saxon works])
@@ -4360,9 +4338,9 @@ class saxontest {
"net.sf.saxon.TransformerFactoryImpl");
try {
TransformerFactory tfactory = TransformerFactory.newInstance();
- // some external saxons (Debian, Ubuntu, ...) have this disabled
- // per default
- tfactory.setAttribute(FeatureKeys.ALLOW_EXTERNAL_FUNCTIONS, new Boolean(true));
+ // some external saxons (Debian, Ubuntu, ...) have this disabled
+ // per default
+ tfactory.setAttribute(FeatureKeys.ALLOW_EXTERNAL_FUNCTIONS, new Boolean(true));
System.out.println("TransformerFactory is" +
tfactory.getClass().getName());
Transformer transformer = tfactory.newTransformer(
@@ -4422,7 +4400,7 @@ if test "$_os" = "Darwin" && test "$with_system_curl" != "no"; then
fi
AC_MSG_CHECKING([which curl to use])
if test -n "$with_system_curl" -o -n "$with_system_libs" && \
- test "$with_system_curl" != "no"; then
+ test "$with_system_curl" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_CURL=YES
@@ -4434,8 +4412,8 @@ if test -n "$with_system_curl" -o -n "$with_system_libs" && \
# check curl version
AC_MSG_CHECKING([whether curl is >= 7.13.1])
if test "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $1 }'`" -gt "7" -a \
- "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $2 }'`" -gt "13" -a \
- "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $3 }'`" -gt "1"; then
+ "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $2 }'`" -gt "13" -a \
+ "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $3 }'`" -gt "1"; then
AC_MSG_ERROR([no, you need at least curl 7.13,1])
else
AC_MSG_RESULT([yes])
@@ -4456,7 +4434,7 @@ dnl Check for system mdds
dnl ===================================================================
AC_MSG_CHECKING([which mdds to use])
if test -n "$with_system_mdds" -o -n "$with_system_headers" && \
- test "$with_system_mdds" != "no"; then
+ test "$with_system_mdds" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_MDDS=YES
AC_LANG_PUSH([C++])
@@ -4475,7 +4453,7 @@ dnl Check for system boost
dnl ===================================================================
AC_MSG_CHECKING([which boost to use])
if test -n "$with_system_boost" -o -n "$with_system_headers" && \
- test "$with_system_boost" != "no"; then
+ test "$with_system_boost" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_BOOST=YES
AC_LANG_PUSH([C++])
@@ -4494,9 +4472,9 @@ if test -n "$with_system_boost" -o -n "$with_system_headers" && \
ac_cv_cxx_boost_no_exceptons_broken=no, ac_cv_cxx_boost_no_exceptons_broken=yes)
if test "$ac_cv_cxx_boost_no_exceptons_broken" = "yes"; then
- AC_MSG_ERROR([no, see https://bugzilla.redhat.com/show_bug.cgi?id=477131])
+ AC_MSG_ERROR([no, see https://bugzilla.redhat.com/show_bug.cgi?id=477131])
else
- AC_MSG_RESULT([yes])
+ AC_MSG_RESULT([yes])
fi
CXXFLAGS=$save_CXXFLAGS
AC_LANG_POP([C++])
@@ -4512,7 +4490,7 @@ dnl Check for system vigra
dnl ===================================================================
AC_MSG_CHECKING([which vigra to use])
if test -n "$with_system_vigra" -o -n "$with_system_headers" && \
- test "$with_system_vigra" != "no"; then
+ test "$with_system_vigra" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_VIGRA=YES
AC_LANG_PUSH([C++])
@@ -4531,7 +4509,7 @@ dnl Check for system odbc
dnl ===================================================================
AC_MSG_CHECKING([which odbc headers to use])
if test -n "$with_system_odbc_headers" -o -n "$with_system_headers" && \
- test "$with_system_odbc_headers" != "no"; then
+ test "$with_system_odbc_headers" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_ODBC_HEADERS=YES
@@ -4591,21 +4569,21 @@ if test "$WITH_LDAP" = "YES"; then
dnl ===================================================================
AC_MSG_CHECKING([which LDAP SDK to use])
if test -n "$with_openldap" && test "$with_openldap" != "no"; then
- AC_MSG_RESULT([OpenLDAP])
- WITH_OPENLDAP=YES
- AC_CHECK_HEADERS(ldap.h, [],
- [AC_MSG_ERROR(ldap.h not found. install openldap libs)], [])
- AC_CHECK_LIB(ldap, ldap_simple_bind_s, [],
- [AC_MSG_ERROR(openldap lib not found or functional)], [])
- # rumours say that OpenLDAP doesn't have that function. I looked and
- # it has it. Test for it to be sure
+ AC_MSG_RESULT([OpenLDAP])
+ WITH_OPENLDAP=YES
+ AC_CHECK_HEADERS(ldap.h, [],
+ [AC_MSG_ERROR(ldap.h not found. install openldap libs)], [])
+ AC_CHECK_LIB(ldap, ldap_simple_bind_s, [],
+ [AC_MSG_ERROR(openldap lib not found or functional)], [])
+ # rumours say that OpenLDAP doesn't have that function. I looked and
+ # it has it. Test for it to be sure
AC_CHECK_LIB(ldap, ldap_set_option, [],
[AC_MSG_ERROR(openldap lib not found or functional)], [])
else
- AC_MSG_RESULT([Netscape/Mozilla])
- # TODO. Actually do a sanity check and check for
- # LDAP_OPT_SIZELIMIT and LDAP_X_OPT_CONNECT_TIMEOUT
- WITH_OPENLDAP=NO
+ AC_MSG_RESULT([Netscape/Mozilla])
+ # TODO. Actually do a sanity check and check for
+ # LDAP_OPT_SIZELIMIT and LDAP_X_OPT_CONNECT_TIMEOUT
+ WITH_OPENLDAP=NO
fi
fi
AC_SUBST(WITH_LDAP)
@@ -4676,7 +4654,7 @@ if test -n "$with_system_mozilla" && test "$with_system_mozilla" != "no"; then
save_LIBS="$LIBS"
CPPFLAGS="$CPPFLAGS $MOZ_NSS_CFLAGS"
LDFLAGS="$LDFLAGS $MOZ_NSS_LIBS"
- AC_CHECK_LIB(nss3, PK11_GetCertFromPrivateKey, [],
+ AC_CHECK_LIB(nss3, PK11_GetCertFromPrivateKey, [],
[AC_MSG_ERROR(PK11_GetCertFromPrivateKey missing but needed.
See https://bugzilla.mozilla.org/show_bug.cgi?id=262274.
Fixed since nss 3.9.3 (contained by e.g. mozilla >= 1.7.5))], [])
@@ -4727,7 +4705,7 @@ AC_MSG_CHECKING([for toolkit mozilla should use])
if test -z "$with_mozilla_toolkit"; then
if test "$_os" != "WINNT" ; then
if test "$_os" = "Darwin" ; then
- MOZILLA_TOOLKIT=mac
+ MOZILLA_TOOLKIT=mac
AC_MSG_RESULT([mac])
else
MOZILLA_TOOLKIT=gtk2
@@ -4759,7 +4737,7 @@ if test -n "$enable_build_mozilla"; then
BUILD_MOZAB="TRUE"
AC_MSG_RESULT([yes])
else
- BUILD_MOZAB=""
+ BUILD_MOZAB=""
AC_MSG_RESULT([no])
fi
@@ -4865,7 +4843,7 @@ Use "./fetch_tarballs.sh ooo.lst" to download.])
PKG_CHECK_MODULES(MOZLIBREQ, libIDL-2.0 >= 0.8.0, MOZIDL="TRUE", MOZIDL="")
if test -z "$MOZIDL"; then
AC_MSG_ERROR([libIDL >= 0.8.0 is needed when using GTK2 to build mozilla.])
- fi
+ fi
else
PKG_CHECK_MODULES(MOZLIBREQ, gtk+ >= 1.2.3, MOZGTK="TRUE", MOZGTK="")
if test -z "$MOZGTK"; then
@@ -4898,7 +4876,7 @@ dnl Check for system sane
dnl ===================================================================
AC_MSG_CHECKING([which sane header to use])
if test -n "$with_system_sane_header" -o -n "$with_system_headers" && \
- test "$with_system_sane_header" != "no"; then
+ test "$with_system_sane_header" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_SANE_HEADER=YES
AC_CHECK_HEADER(sane/sane.h, [],
@@ -4915,7 +4893,7 @@ dnl Check for system icu
dnl ===================================================================
AC_MSG_CHECKING([which icu to use])
if test -n "$with_system_icu" -o -n "$with_system_libs" && \
- test "$with_system_icu" != "no"; then
+ test "$with_system_icu" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_ICU=YES
AC_LANG_PUSH([C++])
@@ -5092,7 +5070,7 @@ AC_SUBST(DISABLE_XAW)
dnl ===================================================================
-dnl Check if fontconfig/fontconfig.h is available
+dnl Check if fontconfig/fontconfig.h is available
dnl ===================================================================
if test "$ENABLE_FONTCONFIG" = "TRUE" ; then
AC_CHECK_HEADER(fontconfig/fontconfig.h, [],
@@ -5102,8 +5080,8 @@ if test "$ENABLE_FONTCONFIG" = "TRUE" ; then
#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;
+ if(FC_MAJOR > 2 || (FC_MAJOR == 2 && FC_MINOR >= 2)) return 0;
+ else return 1;
}
], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no, fontconfig >= 2.2.0 needed])])
fi
@@ -5122,7 +5100,7 @@ else
fi
AC_MSG_CHECKING([which Xrender headers to use])
if test -n "$with_system_xrender_headers" -o -n "$with_system_headers" && \
- test "$with_system_xrender_headers" != "no"; then
+ test "$with_system_xrender_headers" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_XRENDER_HEADERS=YES
AC_CHECK_HEADER(X11/extensions/Xrender.h, [],
@@ -5145,10 +5123,10 @@ dnl ===================================================================
AC_MSG_CHECKING([whether to enable RandR support])
if test "$test_randr" = "yes" -a \( "$enable_randr" = "yes" -o "$enable_randr" = "TRUE" \) ; then
if test -z "$enable_randr_link" -o "$enable_randr_link" = "no"; then
- XRANDR_DLOPEN="TRUE"
- AC_MSG_RESULT([resorting to dlopen libXrandr at runtime])
+ XRANDR_DLOPEN="TRUE"
+ AC_MSG_RESULT([resorting to dlopen libXrandr at runtime])
else
- XRANDR_DLOPEN="FALSE"
+ XRANDR_DLOPEN="FALSE"
PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2, ENABLE_RANDR="TRUE", ENABLE_RANDR="")
if test "$ENABLE_RANDR" != "TRUE"; then
AC_CHECK_HEADER(X11/extensions/Xrandr.h, [],
@@ -5158,7 +5136,7 @@ if test "$test_randr" = "yes" -a \( "$enable_randr" = "yes" -o "$enable_randr" =
[ AC_MSG_ERROR(libXrandr not found or functional) ], [])
XRANDR_LIBS="-lXrandr "
ENABLE_RANDR="TRUE"
- AC_MSG_RESULT([enabling RandR support])
+ AC_MSG_RESULT([enabling RandR support])
fi
fi
else
@@ -5199,7 +5177,7 @@ dnl Check for system neon
dnl ===================================================================
AC_MSG_CHECKING([which neon to use])
if test -n "$with_system_neon" -o -n "$with_system_libs" && \
- test "$with_system_neon" != "no"; then
+ test "$with_system_neon" != "no"; then
AC_MSG_RESULT([external])
PKG_CHECK_MODULES(NEON, neon >= 0.24.0, , AC_MSG_ERROR([you need neon >= 0.24.x for system-neon]))
NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
@@ -5234,7 +5212,7 @@ if test -n "$with_system_openssl" -o -n "$with_system_libs" && \
OPENSSL_CFLAGS=
OPENSSL_LIBS="-lssl -lcrypto"
else
- PKG_CHECK_MODULES( OPENSSL, openssl )
+ PKG_CHECK_MODULES( OPENSSL, openssl )
fi
SYSTEM_OPENSSL=YES
else
@@ -5273,8 +5251,8 @@ else
else
AGG_INCDIR="`echo $AGG_CFLAGS | $SED -e s/-I//`"
fi
- if $PKG_CONFIG --modversion libagg | grep -q 2.3 || \
- $PKG_CONFIG --modversion libagg | grep -q 2.4; then
+ if $PKG_CONFIG --modversion libagg | grep -q 2.3 || \
+ $PKG_CONFIG --modversion libagg | grep -q 2.4; then
# 2.4's libagg.pc.in still contains 2.3 :/
if $EGREP -q "Version 2.4" `echo $AGG_INCDIR`/agg_basics.h; then
AC_MSG_RESULT([2.4])
@@ -5284,9 +5262,9 @@ else
AGG_VERSION=2300
fi
SYSTEM_AGG=YES
- else
- AC_MSG_ERROR([only agg 2.3 and 2.4 are supported])
- fi
+ else
+ AC_MSG_ERROR([only agg 2.3 and 2.4 are supported])
+ fi
else
AC_MSG_RESULT([internal])
SYSTEM_AGG=NO
@@ -5302,15 +5280,15 @@ dnl Check for system redland
dnl ===================================================================
AC_MSG_CHECKING([which redland library to use])
if test -n "$with_system_redland" -o -n "$with_system_libs" && \
- test "$with_system_redland" != "no"; then
- AC_MSG_RESULT([external])
- SYSTEM_REDLAND=YES
+ test "$with_system_redland" != "no"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_REDLAND=YES
dnl versions before 1.0.8 write RDF/XML that is useless for ODF (@xml:base)
PKG_CHECK_MODULES(REDLAND, redland >= 1.0.8)
else
- AC_MSG_RESULT([internal])
- BUILD_TYPE="$BUILD_TYPE REDLAND"
- SYSTEM_REDLAND=NO
+ AC_MSG_RESULT([internal])
+ BUILD_TYPE="$BUILD_TYPE REDLAND"
+ SYSTEM_REDLAND=NO
fi
AC_SUBST(SYSTEM_REDLAND)
AC_SUBST(REDLAND_CFLAGS)
@@ -5321,7 +5299,7 @@ dnl Check for system hunspell
dnl ===================================================================
AC_MSG_CHECKING([which libhunspell to use])
if test -n "$with_system_hunspell" -o -n "$with_system_libs" && \
- test "$with_system_hunspell" != "no"; then
+ test "$with_system_hunspell" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_HUNSPELL=YES
AC_LANG_PUSH([C++])
@@ -5351,7 +5329,7 @@ dnl Checking for altlinuxhyph
dnl ===================================================================
AC_MSG_CHECKING([which altlinuxhyph to use])
if test -n "$with_system_altlinuxhyph" -o -n "$with_system_libs" && \
- test "$with_system_altlinuxhyph" != "no"; then
+ test "$with_system_altlinuxhyph" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_HYPH=YES
AC_CHECK_HEADER(hyphen.h, [],
@@ -5392,13 +5370,13 @@ if test -n "$with_system_mythes" -o -n "$with_system_libs" && \
[ AC_MSG_ERROR(mythes.hxx headers not found.)], [])
AC_CHECK_LIB(mythes-1.2, main, [],
[ MYTHES_FOUND=no], [])
- if test "$MYTHES_FOUND" = "no"; then
+ if test "$MYTHES_FOUND" = "no"; then
AC_CHECK_LIB(mythes, main, [MYTHES_FOUND=yes],
[ MYTHES_FOUND=no], [])
- fi
- if test "$MYTHES_FOUND" = "no"; then
- AC_MSG_ERROR([mythes library not found!.])
- fi
+ fi
+ if test "$MYTHES_FOUND" = "no"; then
+ AC_MSG_ERROR([mythes library not found!.])
+ fi
fi
AC_LANG_POP([C++])
else
@@ -5415,7 +5393,7 @@ dnl Checking for lpsolve
dnl ===================================================================
AC_MSG_CHECKING([which lpsolve to use])
if test -n "$with_system_lpsolve" -o -n "$with_system_libs" && \
- test "$with_system_lpsolve" != "no"; then
+ test "$with_system_lpsolve" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_LPSOLVE=YES
AC_CHECK_HEADER(lpsolve/lp_lib.h, [],
@@ -5483,7 +5461,7 @@ if test "$_os" != "WNT"; then
AC_CHECK_FUNCS(getopt, HAVE_GETOPT=YES, [HAVE_GETOPT=NO])
AC_CHECK_FUNCS(readdir_r, HAVE_READDIR_R=YES, [HAVE_READDIR_R=NO])
if test "$HAVE_GETOPT" = "YES" -a "$HAVE_READDIR_R" = "YES"; then
- SYSTEM_LIBC=YES
+ SYSTEM_LIBC=YES
fi
else
HAVE_GETOPT=NO
@@ -5500,10 +5478,10 @@ dnl =========================================
dnl FIXME: I don't know yet if PSDK works with MinGW, keep it until I know better,
dnl and add "-a \( "$WITH_MINGWIN" != "yes" \)" then
if test \( "$_os" = "WINNT" \) ; then
- AC_MSG_CHECKING([for PSDK files])
- if test -z "$with_psdk_home"; then
- # This first line will detect a February 2003 Microsoft Platform SDK
- PSDK_HOME=`./oowintool --psdk-home`
+ AC_MSG_CHECKING([for PSDK files])
+ if test -z "$with_psdk_home"; then
+ # This first line will detect a February 2003 Microsoft Platform SDK
+ PSDK_HOME=`./oowintool --psdk-home`
# But there might be also an April 2005 PSDK, unfortunately MS changed
# the registry entry. (we prefer the old version!?)
if test -z "$PSDK_HOME"; then
@@ -5514,9 +5492,9 @@ if test \( "$_os" = "WINNT" \) ; then
PSDK_HOME=`cygpath -d "$PSDK_HOME"`
PSDK_HOME=`cygpath -u "$PSDK_HOME"`
fi
- else
+ else
PSDK_HOME=`cygpath -u "$with_psdk_home"`
- fi
+ fi
# Remove a possible trailing backslash
PSDK_HOME=`echo $PSDK_HOME | $SED 's/\/$//'`
# Problem with current PSDK (iz 49865)
@@ -5529,18 +5507,18 @@ Remove/rename/backup that file and restart configure. Details about this
problem can be found in issue 49856.])
fi
# WIndows SDK has different headers
- if test \( -f "$PSDK_HOME/Include/adoint.h" \) \
- -a \( -f "$PSDK_HOME/Include/SqlUcode.h" \) \
- -a \( -f "$PSDK_HOME/Include/usp10.h" \); then
- HAVE_PSDK_H="yes"
- else
- HAVE_PSDK_H="no"
- fi
+ if test \( -f "$PSDK_HOME/Include/adoint.h" \) \
+ -a \( -f "$PSDK_HOME/Include/SqlUcode.h" \) \
+ -a \( -f "$PSDK_HOME/Include/usp10.h" \); then
+ HAVE_PSDK_H="yes"
+ else
+ HAVE_PSDK_H="no"
+ fi
if test -f "$PSDK_HOME/lib/user32.lib"; then
- HAVE_PSDK_LIB="yes"
- else
- HAVE_PSDK_LIB="no"
- fi
+ HAVE_PSDK_LIB="yes"
+ else
+ HAVE_PSDK_LIB="no"
+ fi
if test "$HAVE_PSDK_H" = "no" -o "$HAVE_PSDK_LIB" = "no"; then
AC_MSG_ERROR([Some (all?) PSDK files not found, please check if all needed Platform SDKs
are installed or use --with-psdk-home .])
@@ -5583,7 +5561,7 @@ if test \( "$_os" = "WINNT" \) ; then
# At this point $DIRECTXSDK_HOME might still be undefined. This will lead to
# the "DirectX SDK files not found" error later
else
- DIRECTXSDK_HOME=`cygpath -u "$with_directx_home"`
+ DIRECTXSDK_HOME=`cygpath -u "$with_directx_home"`
fi
# Remove a possible trailing backslash
DIRECTXSDK_HOME=`echo $DIRECTXSDK_HOME | $SED 's/\/$//'`
@@ -5605,14 +5583,14 @@ if test \( "$_os" = "WINNT" \) ; then
HAVE_DIRECTXSDK_LIB="no"
fi
if test -n "$ENABLE_DIRECTX"; then
- if test "$HAVE_DIRECTXSDK_H" = "yes" -a "$HAVE_DIRECTXSDK_LIB" = "yes"; then
- AC_MSG_RESULT([found])
- else
- AC_MSG_ERROR([DirectX SDK files not found, please use --with-directx-home or -disable-directx.])
- fi
+ if test "$HAVE_DIRECTXSDK_H" = "yes" -a "$HAVE_DIRECTXSDK_LIB" = "yes"; then
+ AC_MSG_RESULT([found])
+ else
+ AC_MSG_ERROR([DirectX SDK files not found, please use --with-directx-home or -disable-directx.])
+ fi
else
- DIRECTXSDK_HOME=""
- AC_MSG_RESULT([disabled])
+ DIRECTXSDK_HOME=""
+ AC_MSG_RESULT([disabled])
fi
fi
AC_SUBST(DIRECTXSDK_HOME)
@@ -5689,7 +5667,7 @@ if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then
GNUPATCH=$PATCH
else
if test -x "$with_gnu_patch"; then
- GNUPATCH=$with_gnu_patch
+ GNUPATCH=$with_gnu_patch
else
AC_MSG_ERROR([--with-gnu-patch did not point to an executable])
fi
@@ -5697,9 +5675,9 @@ if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then
AC_MSG_CHECKING([whether $GNUPATCH is GNU patch])
if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
- AC_MSG_RESULT([yes])
+ AC_MSG_RESULT([yes])
else
- AC_MSG_ERROR([no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it])
+ AC_MSG_ERROR([no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it])
fi
dnl We also need to check for --with-gnu-cp
@@ -5719,19 +5697,19 @@ dnl We also need to check for --with-gnu-cp
AC_MSG_CHECKING([whether $GNUCP is GNU cp])
if $GNUCP --version 2>/dev/null | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
- AC_MSG_RESULT([yes])
+ AC_MSG_RESULT([yes])
else
if $GNUCP --version 2>/dev/null | grep "GNU fileutils" >/dev/null 2>/dev/null; then
- AC_MSG_RESULT([yes])
+ AC_MSG_RESULT([yes])
else
if test "$_os" = "Darwin"; then
GNUCP=''
AC_MSG_RESULT([no gnucp found - using the system's cp command])
- else
+ else
AC_MSG_ERROR([no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it])
fi
fi
- fi
+ fi
fi
AC_SUBST(GNUPATCH)
@@ -5777,12 +5755,12 @@ else
fi
ASM_HOME="$with_asm_home"
AC_SUBST(ASM_HOME)
-
+
dnl ===================================================================
dnl testing handle deprecated unzip switch
dnl ===================================================================
if test -z "$with_zip_home"; then
- with_zip_home="$with_unzip_home"
+ with_zip_home="$with_unzip_home"
fi
dnl ===================================================================
dnl Zip will be found where you tell me to find it
@@ -5941,9 +5919,9 @@ fi
AC_SUBST(ENABLE_KDE4)
if test -z "$R"; then
- AC_MSG_RESULT([none])
+ AC_MSG_RESULT([none])
else
- AC_MSG_RESULT([$R])
+ AC_MSG_RESULT([$R])
fi
dnl ===================================================================
@@ -6055,17 +6033,17 @@ if test "$test_cairo" = "yes"; then
AC_MSG_CHECKING([whether to use cairo])
if test "x$enable_cairo" != "xno" ; then
ENABLE_CAIRO="TRUE"
- AC_MSG_RESULT([yes])
+ AC_MSG_RESULT([yes])
AC_MSG_CHECKING([which cairo to use])
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list