Licenced under MPL 1.1 / GPLv3+ / LGPLv3+ of course.
Cleaning and organizing of configure.in:
Make configure --help be more coherent, limit it's width to 80 chars and
arranged options alphabetically to help maintaining them.
Use tabs of 4 spaces, not 3.
Removed unnecessary empty lines.
Changed default VENDORNAME = "The Document Foundation"
and we are building LibreOffice, not OpenOffice.org!
From f34ca4d2db05766cf2aaa438b028e72ff56e20a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niko=20R=C3=B6nkk=C3=B6?= <ronkko@ronkko-laptop.(none)>
Date: Sun, 24 Oct 2010 22:58:09 +0300
Subject: [PATCH] Cleaning and organizing of configure.in
Make configure --help be more coherent, limit it's width to 80 chars and
arranged options alphabetically to help maintaining them.
Use tabs of 4 spaces, not 3.
Removed unnecessary empty lines.
Changed default VENDORNAME = "The Document Foundation"
and we are building LibreOffice, not OpenOffice.org!
---
configure.in | 706 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 351 insertions(+), 355 deletions(-)
diff --git a/configure.in b/configure.in
index f3151a7..5d30aff 100644
--- a/configure.in
+++ b/configure.in
@@ -19,217 +19,199 @@ AC_SUBST(OOO_BUILDVERSION)
PROPAGATED_ARGS=$ac_configure_args
AC_SUBST(PROPAGATED_ARGS)
-AC_ARG_WITH(git,
+# Optional Features:
+AC_ARG_ENABLE(access,
[
- --with-git Use git to get the up-stream sources instead of
- downloading and unpacking the tarballs.
-
- Recommended for developers, but not for package
- maintainers.],
+ --disable-access Disable the Access import pieces.],
,)
-AC_ARG_WITH(git-managed,
+AC_ARG_ENABLE(binfilter,
[
- --with-git-managed Use GIT to manage your patches],
+ --enable-binfilter Enable legacy binary file formats filters this makes
+ source download size larger.],
,)
-AC_ARG_WITH(source-version,
+AC_ARG_ENABLE(build-noarch,
[
- --with-source-version define another version for the ooo source tarballs
-
- Example: --with-source-version=3.3.0.1.4],
+ --enable-build-noarch Allow to build some pieces in architecture
+ independent RPMS (icon themes, help, l10n).],
,)
-AC_ARG_WITH(split,
+AC_ARG_ENABLE(cairo,
[
- --without-split do not use the split package sources; use the upstream
- tarball or so],
-,with_split=yes)
+ --enable-cairo Enables cairo canvas backend.],
+,)
-AC_ARG_WITH(piece,
+AC_ARG_ENABLE(defuzz-patches,
[
- --with-piece build only a piece of openoffice.
- bootstrapping goodness.
-
- Examples: --with-piece=bootstrap],
+ --enable-defuzz-patches
+ Regenerate fuzzy patches.],
,)
-AC_ARG_WITH(srcdir,
+AC_ARG_ENABLE(dbgutil,
[
- --with-srcdir define the directory where to download the source
- tarball and other extra sources.],
+ --enable-dbgutil Include additional debugging utilities, such as
+ assertions, object counting, etc. Larger build.
+ (This generates a non-product build.)],
,)
-AC_ARG_WITH(win32,
+AC_ARG_ENABLE(extensions,
[
- --with-win32 define the build to be on win32; this sets a number
- of defaults suitable for that platform.],
+ --enable-extensions Enables the unpacking of the extensions sources.],
,)
-AC_ARG_WITH(internal-gcc,
+AC_ARG_ENABLE(graphite,
[
- --with-internal-gcc build our own gcc (vanilla gcc-4.2.3
- and binutils 2.18).],
+ --enable-graphite Enables hyper-complex text rendering with graphite
+ enabled fonts.],
,)
-AC_ARG_WITH(distro,
+AC_ARG_ENABLE(gtk,
[
- --with-distro build with a specific distributions patch-set. There
- is no default value, so you always have to select one.
-
- Examples: --with-distro=Ark
- --with-distro=Debian
- --with-distro=SUSE
-
- Hint: Run once without this option to get full list
- of available distributions ;-)],
+ --disable-gtk Disables gtk+ native widgets.],
,)
-AC_ARG_WITH(lang,
+AC_ARG_ENABLE(kde,
[
- --with-lang define the localizations to build. The English one
- is built by default.
-
- Examples: --with-lang="en-US de fr it"
- --with-lang=ALL],
+ --disable-kde Disables KDE native widgets.],
,)
-AC_ARG_WITH(poor-help-localizations,
+AC_ARG_ENABLE(kde4,
[
- --with-poor-help-localizations
- define the localizations with so incomplete help
- that the English(US) one should be used instead.
-
- Example: --with-poor-help-localizations="af ar ca"],
+ --disable-kde4 Disables KDE4 native widgets.],
,)
-AC_ARG_WITH(additional-sections,
+AC_ARG_ENABLE(mono,
[
- --with-additional-sections
- define list of additional sections that should be
- enabled in the apply file; It allows to easily
- enable experimental sets of patches that are not
- applied by default.
-
- Example:
- --with-additional-sections="EMFPlus PostgreSQL"
-],,)
-
-AC_ARG_ENABLE(dbgutil,
-[ --enable-dbgutil: Include additional debugging utilities, such as
- assertions, object counting, etc. Larger build.
- (this generates a non-product build)
-],,)
-
-AC_ARG_ENABLE(binfilter,
-[ --enable-binfilter: Enable legacy binary file formats filters
- this makes source download size larger
-],,)
+ --enable-mono Enables the compilation of the Mono bindings.],
+,)
AC_ARG_ENABLE(odk,
-[ --disable-odk OO.o includes an ODK, office development kit
- which some packagers may wish to build without
-],,)
+[
+ --disable-odk LibO includes an ODK, office development kit which
+ some packagers may wish to build without.],
+,)
-AC_ARG_WITH(mingwin,
-[ --with-mingwin For Windows users, use the mingwin32 compiler within
- cygwin environment, this implies --with-use-shell=tcsh
+AC_ARG_ENABLE(post-install-scripts,
+[
+ --disable-post-install-scripts
+ Disables post install scripts within make install.
+ It is usefull when creating a package from the
+ installed files. The scripts are then run by the
+ package after it is installed.],
+,)
- Usage: --with-mingwin=yes
+AC_ARG_ENABLE(split-app-modules,
+[
+ --enable-split-app-modules
+ Split file lists for app modules: base, calc, ...],
+,)
- For !Windows use, use the mingw32 C++ compiler to (re-)
- build unowinreg.dll
+AC_ARG_ENABLE(split-opt-features,
+[
+ --enable-split-opt-features
+ Split file lists for some optional features: pyuno,
+ testtool ...],
+,)
- Usage: --with-mingwin=i586-mingw32msvc-g++
-],,)
+AC_ARG_ENABLE(strip,
+[
+ --disable-strip Disables the stripping of installed binaries, so
+ debugging symbols are not removed.],
+,)
-AC_ARG_ENABLE(extensions,
-[ --enable-extensions enables the unpacking of the extensions sources
-],,)
+AC_ARG_ENABLE(tests,
+[
+ --enable-tests Enables the execution of the tests.],
+,)
-AC_ARG_ENABLE(mono,
-[ --enable-mono Enables the compilation of the Mono bindings
-],,)
+# This is here only to make --help work nicely:
+# Shouldn't this be a --enabe-java or AC_ARG_WITH instead?
+AC_ARG_ENABLE(java,
+[
+ --with-java Build LibO with a JDK & Java support.],
+,)
-AC_ARG_ENABLE(graphite,
-[ --enable-graphite Enables hyper-complex text rendering with
- graphite enabled fonts.
-],,)
+# Optional Packages:
+AC_ARG_WITH(additional-sections,
+[
+ --with-additional-sections
+ Define list of additional sections that should be
+ enabled in the apply file; It allows to easily
+ enable experimental sets of patches that are not
+ applied by default.
-AC_ARG_ENABLE(access,
-[ --disable-access Disable the Access import pieces.
-],,)
+ Example:
+ --with-additional-sections="EMFPlus PostgreSQL"],
+,)
-AC_ARG_WITH(system-mdbtools,
+AC_ARG_WITH(arch,
[
- --with-system-mdbtools Use system libmdb* for the Access base backend
-],,)
+ --with-arch Define the architecture that we will target.
-AC_ARG_WITH(system-libwpd,
-[
- --with-system-libwpd Use system libwpd* library
-],,)
+ Usage: --with-arch=(x86|ppc|sparc)],
+,)
-AC_ARG_WITH(system-libwps,
+AC_ARG_WITH(arch-flags,
[
- --with-system-libwps Use system libwps* library
-],,)
+ --with-arch-flags Define extra flags that will be passed to the C and
+ C++ compiler during build.
-AC_ARG_WITH(system-libwpg,
-[
- --with-system-libwpg Use system libwpg* library
-],,)
+ Example: --with-arch-flags="-O2 -fmessage-length=0"],
+,)
-AC_ARG_WITH(unstable-wp,
+AC_ARG_WITH(binsuffix,
[
- --with-unstable-wp Use new unstable libwp* libraries
-],,)
+ --with-binsuffix Specify the suffix to be used on the end of script
+ names, to allow parallel installation of two versions.
-AC_ARG_ENABLE(cairo,
-[
- --enable-cairo Enables cairo canvas backend.],
+ Default: --with-binsuffix=2.0],
,)
-AC_ARG_WITH(ooo-builddir,
+AC_ARG_WITH(ct2n,
[
- --with-ooo-builddir define the directory where openoffice.org will be
- compiled, e.g. the root of an ooo cvs checkout.],
+ --with-ct2n Download and integrate ConvertTextToNumber extension.],
,)
-AC_ARG_WITH(installed-ooo-dirname,
+AC_ARG_WITH(dejavu-fonts,
[
- --with-installed-ooo-dirname
- specify the directory name of the core OOo network
- install dir, for example "openoffice" or "ooo-1.1",
- yielding a core install directory of
- /usr/lib/openoffice or /usr/lib/ooo-1.1.
+ --with-dejavu-fonts Download and install updated DejaVu fonts.
+ The parameter is a version number.
- Example: --with-installed-ooo-dirname=ooo-1.1],
+ Example: --with-dejavu-fonts=2.32
+
+ You should use this only if you want a newer version
+ than that which upstream has.],
,)
-AC_ARG_WITH(binsuffix,
+AC_ARG_WITH(distro,
[
- --with-binsuffix
- specify the suffix to be used on the end of script
- names, to allow parallel installation of two versions.
+ --with-distro Build with a specific distributions patch-set. There
+ is no default value, so you always have to select one.
- Default: --with-binsuffix=2.0],
+ Examples: --with-distro=Ark
+ --with-distro=Debian
+ --with-distro=SUSE
+
+ Hint: Run once without this option to get full list
+ of available distributions ;-)],
,)
AC_ARG_WITH(docdir,
[
- --with-docdir define the directory name where the extra
+ --with-docdir Define the directory name where the extra
documentation will be installed.
- Example: --with-docdir=/usr/share/doc/packages/OpenOffice.org],
+ Example:
+ --with-docdir=/usr/share/doc/packages/LibreOffice],
,)
-AC_ARG_WITH(num-cpus,
+AC_ARG_WITH(drink,
[
- --with-num-cpus Number of build processes/cpus to use (number of
- projects that will build at the same time).
- Multi-process/multi-cpu builds can save a lot of time
- on multi-cpu machines.],
+ --with-drink The parameter is a favourite drink that unpack should
+ advise you to take.
+
+ Example: --with-drink=tea],
,)
AC_ARG_WITH(gcc-speedup,
@@ -238,99 +220,133 @@ AC_ARG_WITH(gcc-speedup,
ccache (caching results of previous compilation) and
icecream (distributed compiling tool) are supported.
Both can be used at the same time.
+
You can also choose distcc instead of icecream.
- Example: --with-gcc-speedup=ccache,icecream],
+ Example: --with-gcc-speedup=ccache,icecream],
,)
-AC_ARG_WITH(icecream-bindir,
+AC_ARG_WITH(git,
[
- --with-icecream-bindir Location of icecream's gcc and g++.
- Defaults to /opt/icecream/bin.],
+ --with-git Use git to get the up-stream sources instead of
+ downloading and unpacking the tarballs.
+
+ Recommended for developers, but not for package
+ maintainers.],
,)
-AC_ARG_WITH(max-jobs,
+AC_ARG_WITH(git-managed,
[
- --with-max-jobs
- Maximum number of jobs that make will issue at
- the same time. Defaults to 1.],
+ --with-git-managed Use GIT to manage your patches.],
,)
-AC_ARG_ENABLE(tests,
+AC_ARG_WITH(gnu-patch,
[
- --enable-tests Enables the execution of the tests.],
+ --with-gnu-patch The parameter is an absolute path to GNU patch.
+
+ Example: --with-gnu-cp=/usr/local/bin/gpatch],
,)
-AC_ARG_ENABLE(gtk,
+AC_ARG_WITH(gnu-tar,
[
- --disable-gtk Disables gtk+ native widgets.],
+ --with-gnu-tar The parameter is an absolute path to GNU tar.
+
+ Example: --with-gnu-cp=/usr/local/bin/gtar],
,)
-AC_ARG_ENABLE(kde,
+AC_ARG_WITH(google-docs,
[
- --disable-kde Disables KDE native widgets.],
+ --with-google-docs Download and integrate Google Documents extension.],
,)
-AC_ARG_ENABLE(kde4,
+AC_ARG_WITH(hunart,
[
- --disable-kde4 Disables KDE4 native widgets.],
+ --with-hunart Download and integrate the Hungarian cross-reference
+ toolbar extension.],
,)
-AC_ARG_ENABLE(strip,
+AC_ARG_WITH(icecream-bindir,
[
- --disable-strip
- Disables the stripping of installed binaries, so
- debugging symbols are not removed.],
+ --with-icecream-bindir Location of icecream's gcc and g++.
+ Defaults to /opt/icecream/bin],
,)
-AC_ARG_ENABLE(build-noarch,
+AC_ARG_WITH(installed-ooo-dirname,
[
- --enable-build-noarch
- Allow to build some pieces in architecture
- independent RPMS (icon themes, help, l10n)],
+ --with-installed-ooo-dirname
+ Specify the directory name of the core LibO network
+ install dir, for example "libreoffice" or "ooo-1.1",
+ yielding a core install directory of
+ /usr/lib/libreoffice or /usr/lib/ooo-1.1.
+
+ Example: --with-installed-ooo-dirname=ooo-1.1],
,)
-AC_ARG_ENABLE(split-app-modules,
+AC_ARG_WITH(internal-gcc,
[
- --enable-split-app-modules
- Split file lists for app modules: base, calc, ...],
+ --with-internal-gcc Build our own gcc (vanilla gcc-4.2.3 and
+ binutils 2.18).],
,)
-AC_ARG_ENABLE(split-opt-features,
+AC_ARG_WITH(lang,
[
- --enable-split-opt-features
- Split file lists for some optional features:
- pyuno, testtool ...],
+ --with-lang Define the localizations to build. The English one is
+ built by default.
+
+ Examples: --with-lang="en-US de fr it"
+ --with-lang=ALL],
,)
-AC_ARG_ENABLE(post-install-scripts,
+AC_ARG_WITH(languagetool,
[
- --disable-post-install-scripts
- Disables post install scripts within make install.
- It is usefull when creating a package from the
- installed files. The scripts are then run by
- the package after it is installed.],
+ --with-languagetool Download and integrate LanguageTool extension.],
,)
-AC_ARG_ENABLE(defuzz-patches,
+AC_ARG_WITH(liberation-fonts,
[
- --enable-defuzz-patches
- Regenerate fuzzy patches.],
+ --with-liberation-fonts
+ Download and install updated Liberation Fonts.
+ The parameter is a version number.
+
+ Example: --with-liberation-fonts=1.1],
,)
-AC_ARG_WITH(arch,
+AC_ARG_WITH(lightproof,
[
- --with-arch Define the architecture that we will target.
+ --with-lightproof Download and integrate the Lightproof "grammar
+ checker" extension.],
+,)
- Usage: --with-arch=(x86|ppc|sparc)],
+AC_ARG_WITH(max-jobs,
+[
+ --with-max-jobs Maximum number of jobs that make will issue at the
+ same time. Defaults to 1.],
,)
-AC_ARG_WITH(arch-flags,
+AC_ARG_WITH(mingwin,
+[
+ --with-mingwin For Windows users, use the mingwin32 compiler within
+ cygwin environment, this implies --with-use-shell=tcsh
+
+ Usage: --with-mingwin=yes
+
+ For not Windows use, use the mingw32 C++ compiler to
+ (re-)build unowinreg.dll.
+
+ Usage: --with-mingwin=i586-mingw32msvc-g++],
+,)
+
+AC_ARG_WITH(mirror,
[
- --with-arch-flags Define extra flags that will be passed to the
- C and C++ compiler during bild
+ --with-mirror Specify a mirror of the go-oo.org packages directory.
+
+ Example: --with-mirror=http://foo.bar.baz/mirror
+
+ If you want to setup your own mirror, just add
+ something like the following to your cron:
- Example: --with-arch-flags="-O2 -fmessage-length=0"],
+ rsync -azq --delete --partial go-oo.org::packages \\
+ /some/directory/where/you/want/],
,)
AC_ARG_WITH(mono-gac-root,
@@ -339,145 +355,131 @@ AC_ARG_WITH(mono-gac-root,
needed if you are using $DESTDIR and want to
preinstall the mono DLLs into the GAC.
- Example: --with-mono-gac-root=/usr/lib],
+ Example: --with-mono-gac-root=/usr/lib],
,)
-
-AC_ARG_WITH(openclipart,
+AC_ARG_WITH(nlpsolver,
[
- --with-openclipart Build and install OOo galleries from the Open Clip
- Art Library. The parameter is either a version of
- the library or an absolute path to the prebuilt and
- preinstalled .png files.
-
- Example: --with-openclipart=0.13
- --with-openclipart=/usr/share/openclipart],
+ --with-nlpsolver Download and integrate NLPSolver extension.],
,)
-
-AC_ARG_WITH(sun-templates,
+AC_ARG_WITH(num-cpus,
[
- --with-sun-templates Download and integrate Sun template packages.],
+ --with-num-cpus Number of build processes/cpus to use (number of
+ projects that will build at the same time).
+ Multi-process/multi-cpu builds can save a lot of time
+ on multi-cpu machines.],
,)
-AC_ARG_WITH(ct2n,
+AC_ARG_WITH(numbertext,
[
- --with-ct2n Download and integrate ConvertTextToNumber extension.],
+ --with-numbertext Download and integrate the Numbertext Calc numerical
+ extension.],
,)
-AC_ARG_WITH(watch-window,
+AC_ARG_WITH(ooo-builddir,
[
- --with-watch-window Download and integrate Watch Window extension to Calc.],
+ --with-ooo-builddir Define the directory where libreoffice will be
+ compiled, e.g. the root of an ooo cvs checkout.],
,)
-AC_ARG_WITH(google-docs,
+AC_ARG_WITH(oooblogger,
[
- --with-google-docs Download and integrate Google Documents extension.],
+ --with-oooblogger Download and integrate oooblogger extension.],
,)
-AC_ARG_WITH(nlpsolver,
+AC_ARG_WITH(openclipart,
[
- --with-nlpsolver Download and integrate NLPSolver extension.],
-,)
+ --with-openclipart Build and install OOo galleries from the Open Clip Art
+ Library. The parameter is either a version of the
+ library or an absolute path to the prebuilt and
+ preinstalled .png files.
+ Examples: --with-openclipart=0.13
+ --with-openclipart=/usr/share/openclipart],
+,)
-AC_ARG_WITH(languagetool,
+AC_ARG_WITH(piece,
[
- --with-languagetool Download and integrate LanguageTool extension.],
-,)
+ --with-piece Build only a piece of LibreOffice.
+ Bootstrapping goodness.
+ Example: --with-piece=bootstrap],
+,)
-AC_ARG_WITH(oooblogger,
+AC_ARG_WITH(poor-help-localizations,
[
- --with-oooblogger Download and integrate oooblogger extension.],
-,)
+ --with-poor-help-localizations
+ Define the localizations with so incomplete help that
+ the English(US) one should be used instead.
+ Example: --with-poor-help-localizations="af ar ca"],
+,)
-AC_ARG_WITH(dejavu-fonts,
+AC_ARG_WITH(source-version,
[
- --with-dejavu-fonts Download and install updated DejaVu fonts. The parameter is
- a version number.
-
- Example: --with-dejavu-fonts=2.32
+ --with-source-version Define another version for the ooo source tarballs.
- You should use this only if you want a newer version than
- that which upstream has.],
+ Example: --with-source-version=3.3.0.1.4],
,)
-AC_ARG_WITH(liberation-fonts,
+AC_ARG_WITH(split,
[
- --with-liberation-fonts
- Download and install updated Liberation Fonts. The parameter is
- a version number.
+ --without-split Do not use the split package sources; use the upstream
+ tarball or so.],
+,with_split=yes)
- Example: --with-liberation-fonts=1.1],
+AC_ARG_WITH(srcdir,
+[
+ --with-srcdir Define the directory where to download the source
+ tarball and other extra sources.],
,)
-AC_ARG_WITH(lightproof,
+AC_ARG_WITH(sun-templates,
[
- --with-lightproof Download and integrate the Lightproof "grammar
- checker" extension.],
+ --with-sun-templates Download and integrate Sun template packages.],
,)
-AC_ARG_WITH(numbertext,
+AC_ARG_WITH(system-mdbtools,
[
- --with-numbertext Download and integrate the Numbertext Calc numerical extension.],
+ --with-system-mdbtools Use system libmdb* for the Access base backend.],
,)
-AC_ARG_WITH(hunart,
+AC_ARG_WITH(system-libwpd,
[
- --with-hunart Download and integrate the Hungarian cross-reference toolbar extension.],
+ --with-system-libwpd Use system libwpd* library.],
,)
-AC_ARG_WITH(typo,
+AC_ARG_WITH(system-libwpg,
[
- --with-typo Download and integrate the Typography toolbar extension.],
+ --with-system-libwpg Use system libwpg* library.],
,)
-AC_ARG_WITH(gnu-patch,
+AC_ARG_WITH(system-libwps,
[
- --with-gnu-patch The parameter is an absolute path to GNU patch.
-
- Example: --with-gnu-cp=/usr/local/bin/gpatch],
+ --with-system-libwps Use system libwps* library.],
,)
-AC_ARG_WITH(gnu-tar,
+AC_ARG_WITH(typo,
[
- --with-gnu-tar The parameter is an absolute path to GNU tar.
-
- Example: --with-gnu-cp=/usr/local/bin/gtar],
+ --with-typo Download and integrate the Typography toolbar
+ extension.],
,)
-AC_ARG_WITH(drink,
+AC_ARG_WITH(unstable-wp,
[
- --with-drink The parameter is a favourite drink that unpack
- should advise you to take.
-
- Example: --with-drink=coffee],
+ --with-unstable-wp Use new unstable libwp* libraries.],
,)
-dnl
-dnl Items here only to make --help work nicely:
-dnl
-AC_ARG_ENABLE(java,
+AC_ARG_WITH(watch-window,
[
- --with-java build ooo with a Jdk & Java support],
+ --with-watch-window Download and integrate Watch Window extension to Calc.],
,)
-dnl
-dnl Mirror
-dnl
-AC_ARG_WITH(mirror,
-[
- --with-mirror Specify a mirror of the go-ooo.org packages
- directory.
-
- Example: --with-mirror=http://foo.bar.baz/mirror
-
- If you want to setup your own mirror, just add
- something like the following to your cron:
- rsync -azq --delete --partial go-oo.org::packages \\
- /some/directory/where/you/want/],
+AC_ARG_WITH(win32,
+[
+ --with-win32 Define the build to be on Win32; this sets a number of
+ defaults suitable for that platform.],
,)
AM_MAINTAINER_MODE
@@ -494,7 +496,7 @@ OOO_ADDITIONAL_SECTIONS=
AC_PATH_PROG(PERL, perl)
if test -z "$PERL"; then
- AC_MSG_ERROR([perl not found; required for libreoffice])
+ AC_MSG_ERROR([perl not found; required for libreoffice])
fi
AC_SUBST(PERL)
INTLTOOL_PERL=$PERL
@@ -506,15 +508,15 @@ dnl PKG_PROG_PKG_CONFIG([0.9.0])
PKG_PROG_PKG_CONFIG()
if test ! -x "$PKG_CONFIG" -a "z`uname -s`" != "zDarwin"; then
- AC_MSG_ERROR([
+ AC_MSG_ERROR([
*** You need the pkg-config to build LibreOffice.
*** Get the latest version of pkg-config from
*** <http://www.freedesktop.org/software/pkgconfig/>.])
fi
PKG_CHECK_MODULES( MINIMUM_REQS,
- [ libxml-2.0 fontconfig >= 1.0.1 ],
- have_common=true, have_common=false )
+ [ libxml-2.0 fontconfig >= 1.0.1 ],
+ have_common=true, have_common=false )
if test "z`uname -s`" = "zDarwin"; then
if test -d "/Developer/SDKs/MacOSX10.4u.sdk"; then
@@ -553,9 +555,9 @@ AC_SUBST(BUILD_WIN32)
AM_CONDITIONAL(BUILD_WIN32, [test "$BUILD_WIN32" = yes])
if test "z`uname -s`" = "zSunOS" -a -f /usr/xpg4/bin/grep ; then
- GREP=/usr/xpg4/bin/grep
+ GREP=/usr/xpg4/bin/grep
else
- GREP=grep
+ GREP=grep
fi
APPLY_DIR="$TOOLSDIR/patches/dev300"
@@ -564,23 +566,23 @@ APPLY_DIR="$TOOLSDIR/patches/dev300"
# the default dir is defined by the selected tag
# the alternatives are derived by removing a part (suffix) of the tag
while test "$APPLY_DIR" != "$TOOLSDIR/patches/" ; do
- test -f $APPLY_DIR/apply && break
- APPLY_DIR=${APPLY_DIR%?}
+ test -f $APPLY_DIR/apply && break
+ APPLY_DIR=${APPLY_DIR%?}
done
test "$APPLY_DIR" = "$TOOLSDIR/patches/" && APPLY_DIR="$TOOLSDIR/patches"
if test -f $APPLY_DIR/apply; then
- AC_MSG_RESULT([using $APPLY_DIR/apply])
+ AC_MSG_RESULT([using $APPLY_DIR/apply])
else
- AC_MSG_ERROR([Can't locate patch set])
+ AC_MSG_ERROR([Can't locate patch set])
fi
AC_SUBST(APPLY_DIR)
# piece source version
if test "z$with_source_version" = "z"; then
- # FIXME: do we want to guess it from the tag, e.g. 3.3.0.1 from OOO_BUILD_3_3_0_1?
- OOO_SOURCEVERSION="$OOO_BUILDVERSION"
+ # FIXME: do we want to guess it from the tag, e.g. 3.3.0.1 from OOO_BUILD_3_3_0_1?
+ OOO_SOURCEVERSION="$OOO_BUILDVERSION"
else
- OOO_SOURCEVERSION="$with_source_version"
+ OOO_SOURCEVERSION="$with_source_version"
fi
AC_SUBST(OOO_SOURCEVERSION)
@@ -616,9 +618,9 @@ AC_MSG_RESULT([$SRCDIR])
BUILDDIR=$BASEDIR/build
if test "z$with_ooo_builddir" = "z"; then
- OOBUILDDIR=$BUILDDIR/$OOO_SOURCEDIRNAME
+ OOBUILDDIR=$BUILDDIR/$OOO_SOURCEDIRNAME
else
- OOBUILDDIR=$with_ooo_builddir
+ OOBUILDDIR=$with_ooo_builddir
fi
if test "z`uname -s`" != "zSunOS" -a "z$with_win32" != "z" -a "z`uname -o 2>/dev/null`" =
"zCygwin" ; then
@@ -683,7 +685,7 @@ AC_MSG_RESULT([$DISTRO])
AC_SUBST(DISTRO)
AC_MSG_CHECKING([for vendor name based on the distribution name])
-VENDORNAME=OpenOffice
+VENDORNAME="The Document Foundation"
case $DISTRO in
ArchLinux*) VENDORNAME="ArchLinux" ;;
Ark*) VENDORNAME="Ark" ;;
@@ -692,25 +694,26 @@ case $DISTRO in
Dropline*) VENDORNAME="DroplineGNOME" ;;
Frugalware*) VENDORNAME="Frugalware" ;;
Gentoo*) VENDORNAME="Gentoo" ;;
+ LibreOffice*) VENDORNAME="The Document Foundation" ;;
Mandriva*) VENDORNAME="Mandriva" ;;
Pardus*) VENDORNAME="Pardus" ;;
rPath*|rpl*) VENDORNAME="rPath" ;;
SUSE*|Novell*|NLD*) VENDORNAME="Novell" ;;
Slackware*) VENDORNAME="Slackware" ;;
PLD*) VENDORNAME="PLD" ;;
- OxygenOffice*) VENDORNAME="OxygenOffice" ;;
OOo4Kids*) VENDORNAME="EducOOo" ;;
- LibreOffice*|Raw) VENDORNAME="The Document Foundation" ;;
+ OpenOffice.org*) VENDORNAME="OpenOffice.org" ;;
+ OxygenOffice*) VENDORNAME="OxygenOffice" ;;
*) AC_MSG_WARN([Cannot guess vendor from distro - please add it to configure.in]) ;;
esac
AC_MSG_RESULT([$VENDORNAME])
AC_SUBST(VENDORNAME)
if test "z$with_java" = "zno"; then
- AC_PATH_PROG(XSLTPROC, xsltproc, no)
- if test "$XSLTPROC" = "no"; then
- AC_MSG_ERROR([xsltproc is required to build without java])
- fi
+ AC_PATH_PROG(XSLTPROC, xsltproc, no)
+ if test "$XSLTPROC" = "no"; then
+ AC_MSG_ERROR([xsltproc is required to build without java])
+ fi
fi
AC_CHECK_HEADER(security/pam_appl.h, have_pam=true, have_pam=false)
@@ -738,26 +741,26 @@ fi
AC_CHECK_PROG(FLEX, flex, yes)
if ! test "z$FLEX" = "zyes"; then
- AC_MSG_ERROR( flex must be installed )
+ AC_MSG_ERROR( flex must be installed )
fi
AC_CHECK_PROG(BISON, bison, yes)
if ! test "z$BISON" = "zyes"; then
- AC_MSG_ERROR( bison must be installed )
+ AC_MSG_ERROR( bison must be installed )
fi
if test "z$with_internal_gcc" = "zyes" ; then
- SYSTEM_GCC=
- gcc_to_use="internal (will be built)"
+ SYSTEM_GCC=
+ gcc_to_use="internal (will be built)"
else
- SYSTEM_GCC=true
- gcc_to_use="from system"
+ SYSTEM_GCC=true
+ gcc_to_use="from system"
fi
AC_SUBST(SYSTEM_GCC)
BUILD_NCPUS=1
if test "z$with_num_cpus" != "z"; then
- BUILD_NCPUS=$with_num_cpus
+ BUILD_NCPUS=$with_num_cpus
fi
AC_SUBST(BUILD_NCPUS)
@@ -836,36 +839,36 @@ AC_SUBST(OOOP_TEMPLATES_PACK)
AC_MSG_CHECKING([for widget sets])
OOO_WIDGET_FLAGS=
if test "$enable_kde" != "no"; then
- if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin" -a "z$with_distro" != "zCrossWin32";
then
- OOO_WIDGET_FLAGS="--enable-kde"
- widget_sets="kde"
- fi
+ if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin" -a "z$with_distro" !=
"zCrossWin32"; then
+ OOO_WIDGET_FLAGS="--enable-kde"
+ widget_sets="kde"
+ fi
else
- OOO_WIDGET_FLAGS="--disable-kde"
+ OOO_WIDGET_FLAGS="--disable-kde"
fi
if test "$enable_kde4" != "no"; then
- if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin" -a "z$with_distro" != "zCrossWin32";
then
- OOO_WIDGET_FLAGS="$OOO_WIDGET_FLAGS --enable-kde4"
- widget_sets="$widget_sets kde4"
- fi
+ if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin" -a "z$with_distro" !=
"zCrossWin32"; then
+ OOO_WIDGET_FLAGS="$OOO_WIDGET_FLAGS --enable-kde4"
+ widget_sets="$widget_sets kde4"
+ fi
else
- OOO_WIDGET_FLAGS="$OOO_WIDGET_FLAGS --disable-kde4"
+ OOO_WIDGET_FLAGS="$OOO_WIDGET_FLAGS --disable-kde4"
fi
if test "$enable_gtk" != "no"; then
- if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin" -a "z$with_distro" != "zCrossWin32";
then
- OOO_WIDGET_FLAGS="--enable-gtk $OOO_WIDGET_FLAGS"
- widget_sets="gtk $widget_sets"
-
- PKG_CHECK_MODULES( FOO_GTK, [ gtk+-2.0 ],
- have_gtk=true, have_gtk=false )
- if ! $have_gtk; then
- AC_MSG_ERROR([Gtk+ library requirements were not met])
- fi
- fi
+ if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin" -a "z$with_distro" !=
"zCrossWin32"; then
+ OOO_WIDGET_FLAGS="--enable-gtk $OOO_WIDGET_FLAGS"
+ widget_sets="gtk $widget_sets"
+
+ PKG_CHECK_MODULES( FOO_GTK, [ gtk+-2.0 ],
+ have_gtk=true, have_gtk=false )
+ if ! $have_gtk; then
+ AC_MSG_ERROR([Gtk+ library requirements were not met])
+ fi
+ fi
else
- OOO_WIDGET_FLAGS="--disable-gtk $OOO_WIDGET_FLAGS"
+ OOO_WIDGET_FLAGS="--disable-gtk $OOO_WIDGET_FLAGS"
fi
OOO_CUSTOM_IMAGES=
OOO_EXTRA_ARTWORK=extras-3.tar.bz2
@@ -880,19 +883,19 @@ if test "z$BUILD_WIN32" = "zyes" -a "z$enable_cairo" = "z" ; then
enable_cairo="no"
fi
if test "$enable_cairo" != "no"; then
- if test "$with_system_cairo" = "yes"; then
+ if test "$with_system_cairo" = "yes"; then
SYSTEM_CAIRO=TRUE
- fi
- CAIRO_ENABLED=TRUE
- # Use the latest version
- CAIRO_VER=1.4.10
- CAIRO_CONFIGURE_FLAG="--enable-cairo=yes"
- cairo_enabled=yes
+ fi
+ CAIRO_ENABLED=TRUE
+ # Use the latest version
+ CAIRO_VER=1.4.10
+ CAIRO_CONFIGURE_FLAG="--enable-cairo=yes"
+ cairo_enabled=yes
else
- CAIRO_ENABLED=
- CAIRO_VER=
- CAIRO_CONFIGURE_FLAG="--enable-cairo=no"
- cairo_enabled=no
+ CAIRO_ENABLED=
+ CAIRO_VER=
+ CAIRO_CONFIGURE_FLAG="--enable-cairo=no"
+ cairo_enabled=no
fi
AC_SUBST(CAIRO_ENABLED)
AC_SUBST(SYSTEM_CAIRO)
@@ -925,19 +928,19 @@ AC_SUBST(OOO_BUILD_NOARCH)
SPLIT_APP_MODULES="NO"
if test "z$enable_split_app_modules" = "zyes"; then
- SPLIT_APP_MODULES="YES"
+ SPLIT_APP_MODULES="YES"
fi
AC_SUBST(SPLIT_APP_MODULES)
SPLIT_OPT_FEATURES="NO"
if test "z$enable_split_opt_features" = "zyes"; then
- SPLIT_OPT_FEATURES="YES"
+ SPLIT_OPT_FEATURES="YES"
fi
AC_SUBST(SPLIT_OPT_FEATURES)
RUN_POST_INSTALL_SCRIPTS="yes"
if test "z$enable_post_install_scripts" = "zno"; then
- RUN_POST_INSTALL_SCRIPTS="no"
+ RUN_POST_INSTALL_SCRIPTS="no"
fi
AC_SUBST(RUN_POST_INSTALL_SCRIPTS)
@@ -949,13 +952,13 @@ AC_SUBST(TESTS)
DEFUZZ_PATCHES="NO"
if test "z$enable_defuzz_patches" = "zyes"; then
- DEFUZZ_PATCHES="YES"
+ DEFUZZ_PATCHES="YES"
fi
AC_SUBST(DEFUZZ_PATCHES)
OOO_STRIP="yes"
if test "z$enable_strip" = "zno"; then
- OOO_STRIP="no"
+ OOO_STRIP="no"
fi
AC_SUBST(OOO_STRIP)
@@ -972,7 +975,7 @@ AC_SUBST(ARCHITECTURE)
AC_MSG_CHECKING([for broken aliases])
if `alias gcc > /dev/null 2>&1`; then
- AC_MSG_ERROR( you can't alias your gcc - that's broken );
+ AC_MSG_ERROR( you can't alias your gcc - that's broken );
fi
AC_MSG_RESULT(ok)
@@ -1016,7 +1019,6 @@ AC_MSG_RESULT([${OPENCLIPART_VER:-${OPENCLIPART_DIR:-no}}])
AC_SUBST(OPENCLIPART_VER)
AC_SUBST(OPENCLIPART_DIR)
-
AC_MSG_CHECKING([whether to use newer DejaVu fonts])
DEJAVU_FONTS_VER=
DEJAVU_FONTS_PACK_NAME=
@@ -1040,7 +1042,6 @@ AC_MSG_RESULT([${DEJAVU_FONTS_VER:-no, use those in upstream}])
AC_SUBST(DEJAVU_FONTS_VER)
AC_SUBST(DEJAVU_FONTS_PACK_NAME)
-
AC_MSG_CHECKING([for Liberation Fonts])
LIBERATION_FONTS_VER=
if test "z$with_liberation_fonts" != "z" -a "z$with_liberation_fonts" != "zno" ; then
@@ -1057,7 +1058,6 @@ fi
AC_MSG_RESULT([${LIBERATION_FONTS_VER:-as upstream}])
AC_SUBST(LIBERATION_FONTS_VER)
-
AC_MSG_CHECKING([for GNU patch])
GNUPATCH=patch
if test "z$with_gnu_patch" != "z"; then
@@ -1130,16 +1130,16 @@ SNAPSHOT_TAG="$datestamp.$TAG";
AC_SUBST(SNAPSHOT_TAG)
if test "z$with_installed_ooo_dirname" != "z"; then
- OOOINSTALLDIRNAME=$with_installed_ooo_dirname
+ OOOINSTALLDIRNAME=$with_installed_ooo_dirname
else
- OOOINSTALLDIRNAME=ooo-$OOO_MAJOR
+ OOOINSTALLDIRNAME=ooo-$OOO_MAJOR
fi
AC_SUBST(OOOINSTALLDIRNAME)
if test "z$with_docdir" != "z"; then
docdir="$with_docdir"
else
- docdir="$datadir/doc/packages/OpenOffice.org"
+ docdir="$datadir/doc/packages/LibreOffice"
fi
AC_SUBST(docdir)
@@ -1168,7 +1168,6 @@ fi
AC_MSG_RESULT([$OOO_POOR_HELP_LOCALIZATIONS])
AC_SUBST(OOO_POOR_HELP_LOCALIZATIONS)
-
AC_MSG_CHECKING([whether to enable Mono bindings])
if test -n "$enable_mono" ; then
if test "$enable_mono" != "no" ; then
@@ -1229,11 +1228,11 @@ AC_SUBST(ENABLE_ODK)
AC_MSG_CHECKING([whether to enable graphite support])
# if test -n "$enable_graphite" -o "$enable_graphite" != "no"; then
if test -n "$enable_graphite" -a "$enable_graphite" != "no"; then
- ENABLE_GRAPHITE=TRUE
- graphite_enabled=yes
+ ENABLE_GRAPHITE=TRUE
+ graphite_enabled=yes
else
- ENABLE_GRAPHITE=FALSE
- graphite_enabled=no
+ ENABLE_GRAPHITE=FALSE
+ graphite_enabled=no
fi
AC_MSG_RESULT([$graphite_enabled])
AC_SUBST(ENABLE_GRAPHITE)
@@ -1256,7 +1255,6 @@ AC_SUBST(ENABLE_ACCESS)
AC_SUBST(MDBTOOLS_SRC)
AC_SUBST(SYSTEM_MDBTOOLS)
-
UNSTABLE_WP=NO
if test -n "$with_unstable_wp" && test "$with_unstable_wp" = "yes"; then
UNSTABLE_WP=YES
@@ -1305,7 +1303,6 @@ fi
AC_SUBST(SYSTEM_LIBWPG)
AC_SUBST(LIBWPG_TARBALL)
-
if test "$with_system_zlib" = "yes"; then
SYSTEM_ZLIB=YES
else
@@ -1313,7 +1310,6 @@ else
fi
AC_SUBST(SYSTEM_ZLIB)
-
AC_MSG_CHECKING([for Sun Professional Template Pack integration (only supported languages
displayed)])
if test "z$with_sun_templates" = "z" -o "z$with_sun_templates" = "zno" ; then
SUNTEMPLATES_LANG=""
@@ -1754,7 +1750,7 @@ else
fi
echo "
-Building openoffice
+Building LibreOffice
source: $OOO_SOURCEDIRNAME
apply rules: $APPLY_DIR/apply
build dir: $OOBUILDDIR
@@ -1822,11 +1818,11 @@ if test "$OOO_GIT" = "" ; then
fi
if test "${DISTRO:0:11}" != "LibreOffice"; then
- echo "Warning:"
- echo " You have configured with --with-distro='$DISTRO'"
- echo " This is -not- recommended until release time. Patches"
- echo " may well not apply for your distro, as they are being"
- echo " rapidly migrated into LibreOffice itself."
- echo ""
+ echo "Warning:"
+ echo " You have configured with --with-distro='$DISTRO'"
+ echo " This is -not- recommended until release time. Patches"
+ echo " may well not apply for your distro, as they are being"
+ echo " rapidly migrated into LibreOffice itself."
+ echo ""
fi
# vim: set ts=4 sw=4 expandtab :
--
1.7.0.4
Context
- [Libreoffice] [PATCH] Cleaning and organizing of configure.in · Niko Rönkkö
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.