diff options
author | Petr Mladek <pmladek@suse.cz> | 2011-07-08 12:01:56 +0200 |
---|---|---|
committer | Petr Mladek <pmladek@suse.cz> | 2011-07-11 20:30:31 +0200 |
commit | 8124bdf39b719c66e61355c0bc64f8235c4fbec0 (patch) | |
tree | a7a8f52492191bdea7e142358698fab5a2081817 /configure.in | |
parent | 19111fe556a28befac2bc364fd4d8b5ec5c8c348 (diff) |
better support for distro packaging
This is port from the build repo. The main differences are:
+ splits package-ooo into several scripts (bin/distro-install-*)
+ renames many variables to avoid OOO prefix and to better fit
the variables produced by the current bootstrap configure.in
+ uses OOO_VENDOR from bootstrap/configure.in to add distro specific hacks;
the conditions have been updated only for "Novell, inc."
+ install most of the desktop integration from sysui using
sysui/desktop/share/create_tree.sh
+ do not install two extra templates:
$OOINSTBASE/basis$VERSION/share/template/en-US/forms/resume.ott
$OOINSTBASE/basis$VERSION/share/template/en-US/officorr/project-proposal.ott
should get merged with other templates
+ do not install pyunorc-update64;
it is needed only when you want to run 32-bit LO on 64-bit system;
is anyone using it?
+ do not call install-dictionaries:
+ do not call build-galleries:
is anyone using them?
+ do not install ootool and ooconfig
is anyone using them? are they still working?
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@gmail.com>
Diffstat (limited to 'configure.in')
-rwxr-xr-x | configure.in | 97 |
1 files changed, 92 insertions, 5 deletions
diff --git a/configure.in b/configure.in index f12dcdf4edf7..6969becc6cc0 100755 --- a/configure.in +++ b/configure.in @@ -276,6 +276,18 @@ AC_ARG_ENABLE(broffice, locale is removed, giving uniform branding.]), ,enable_broffice=no) +AC_ARG_ENABLE(split-app-modules, + AS_HELP_STRING([--enable-split-app-modules], + [Split file lists for app modules, e.g. base, calc. + Has effect only with make distro-pack-install]), +,) + +AC_ARG_ENABLE(split-opt-features, + AS_HELP_STRING([--enable-split-opt-features], + [Split file lists for some optional features, .e.g. pyuno, testtool. + Has effect only with make distro-pack-install]), +,) + AC_ARG_ENABLE(cairo, AS_HELP_STRING([--disable-cairo], [Determines whether to use Cairo library on platforms where Cairo is @@ -1230,6 +1242,13 @@ AC_ARG_WITH(unix-wrapper, ], ,) +AC_ARG_WITH(compat-oowrappers, + AS_HELP_STRING([--with-compat-oowrappers], + [Install oo* wrappers in parallel with + lo* ones to keep backward compatibility. + Has effect only with make distro-pack-install]), +,) + AC_ARG_WITH(asm-home, AS_HELP_STRING([--with-asm-home], [For Windows, please supply the path for the ml.exe or ml64.exe assembler.]) @@ -6172,6 +6191,18 @@ else fi AC_SUBST(ENABLE_BROFFICE) +SPLIT_APP_MODULES="" +if test "$enable_split_app_modules" = "yes"; then + SPLIT_APP_MODULES="YES" +fi +AC_SUBST(SPLIT_APP_MODULES) + +SPLIT_OPT_FEATURES="" +if test "$enable_split_opt_features" = "yes"; then + SPLIT_OPT_FEATURES="YES" +fi +AC_SUBST(SPLIT_OPT_FEATURES) + dnl =================================================================== dnl Check whether the Cairo libraries are available. dnl =================================================================== @@ -7834,6 +7865,14 @@ fi AC_SUBST(OOO_JUNIT_JAR) dnl =================================================================== +dnl Product version +dnl =================================================================== +AC_MSG_CHECKING([for product version]) +[eval $(sed -n -e 's/ //g' -e '/PRODUCTVERSION=/p' solenv/inc/productversion.mk)] +AC_MSG_RESULT([$PRODUCTVERSION]) +AC_SUBST(PRODUCTVERSION) + +dnl =================================================================== dnl Dealing with l10n options dnl =================================================================== GIT_REPO_NAMES="artwork base calc components extensions extras filters help impress libs-core libs-extern libs-extern-sys libs-gui postprocess sdk testing ure writer" @@ -7865,8 +7904,11 @@ for lang in $WITH_LANG ; do test `echo "$all_langs" | sed "s|.* $lang .*|found|"` = "found" && continue; AC_MSG_ERROR([invalid language: $lang; supported languages are: $ALL_LANGS]) done +# list with substituted ALL +WITH_LANG_LIST=`echo $WITH_LANG | sed "s/ALL/$ALL_LANGS/"` AC_SUBST(ALL_LANGS) AC_SUBST(WITH_LANG) +AC_SUBST(WITH_LANG_LIST) AC_SUBST(GIT_REPO_NAMES) AC_MSG_CHECKING([for another 'intro' bitmap]) @@ -7917,13 +7959,58 @@ else fi AC_SUBST(UNIXWRAPPERNAME) -INSTALL_DIRNAME=`echo AC_PACKAGE_NAME | tr [[:upper:]] [[:lower:]]` +AC_MSG_CHECKING([whether to install the compat oo* wrappers]) +if test "$with_compat_oowrappers" = "yes" ; then + WITH_COMPAT_OOWRAPPERS=YES + AC_MSG_RESULT(yes) +else + WITH_COMPAT_OOWRAPPERS= + AC_MSG_RESULT(no) +fi +AC_SUBST(WITH_COMPAT_OOWRAPPERS) + +AC_MSG_CHECKING([for product name]) +PRODUCTNAME=AC_PACKAGE_NAME +AC_MSG_RESULT([$PRODUCTNAME]) +AC_SUBST(PRODUCTNAME) + +INSTALLDIRNAME=`echo AC_PACKAGE_NAME | tr [[:upper:]] [[:lower:]]` AC_MSG_CHECKING([for install dirname]) if test -n "$with_install_dirname" -a "$with_install_dirname" != "no" -a "$with_install_dirname" != "yes" ; then - INSTALL_DIRNAME="$with_install_dirname" -fi -AC_MSG_RESULT([$INSTALL_DIRNAME]) -AC_SUBST(INSTALL_DIRNAME) + INSTALLDIRNAME="$with_install_dirname" +fi +AC_MSG_RESULT([$INSTALLDIRNAME]) +AC_SUBST(INSTALLDIRNAME) + +AC_MSG_CHECKING([for prefix]) +PREFIXDIR="$prefix" +AC_MSG_RESULT([$PREFIXDIR]) +AC_SUBST(PREFIXDIR) + +AC_MSG_CHECKING([for install dir]) +INSTALLDIR="$libdir/$INSTALLDIRNAME" +AC_MSG_RESULT([$INSTALLDIR]) +AC_SUBST(INSTALLDIR) + +AC_MSG_CHECKING([for libdir]) +LIBDIR=[$(eval echo $(eval echo $libdir))] +AC_MSG_RESULT([$LIBDIR]) +AC_SUBST(LIBDIR) + +AC_MSG_CHECKING([for data dir]) +DATADIR=[$(eval echo $(eval echo $datadir))] +AC_MSG_RESULT([$DATADIR]) +AC_SUBST(DATADIR) + +AC_MSG_CHECKING([for man dir]) +MANDIR=[$(eval echo $(eval echo $mandir))] +AC_MSG_RESULT([$MANDIR]) +AC_SUBST(MANDIR) + +AC_MSG_CHECKING([for doc dir]) +DOCDIR=[$(eval echo $(eval echo $docdir))] +AC_MSG_RESULT([$DOCDIR]) +AC_SUBST(DOCDIR) AC_MSG_CHECKING([whether to statically link to Gtk]) if test -n "$enable_static_gtk" && test "$enable_static_gtk" != "no"; then |