strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS cmcfixes23 (1.139.20); FILE MERGED

Browse source 
2006/01/12 12:52:40 cmc 1.139.20.6: disable mozilla implies np_sdk
2006/01/12 10:52:35 cmc 1.139.20.5: RESYNC: (1.139-1.146); FILE MERGED
2005/12/19 10:05:52 cmc 1.139.20.4: #i58817# check for prelinked libgcc to avoid the md5sum mismatch error
2005/12/19 09:51:35 cmc 1.139.20.3: #i59537# nss is a standalone package in fedora core 5
2005/11/30 12:54:41 cmc 1.139.20.2: #i58675# add a TWAIN build_type
2005/11/29 13:56:08 cmc 1.139.20.1: #i44027# enable building out of the box with ntpl
This commit is contained in:
Oliver Bolte 2006-01-20 09:52:29 +00:00
parent c7af4bfa0d
commit 091188c5c2
1 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
config_office/configure.in
View file

@ -3,7 +3,7 @@ dnl * vi:set sw=3 ts=3 et:
dnl * dnl *
dnl * Name: configure.in dnl * Name: configure.in
dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland
dnl * Date: $Date: 2006-01-13 16:37:01 $ dnl * Date: $Date: 2006-01-20 10:52:29 $
dnl * dnl *
dnl * Desc: This file serves as input for the GNU autoconf package dnl * Desc: This file serves as input for the GNU autoconf package
dnl * in order to create a configure script. dnl * in order to create a configure script.
@ -12,7 +12,7 @@ dnl * necessary to build OpenOffice.org
dnl * dnl *
dnl * dnl *
dnl ******************************************************************/ dnl ******************************************************************/
AC_REVISION( $Revision: 1.148 $ ) AC_REVISION( $Revision: 1.149 $ )
AC_PREREQ(2.50) AC_PREREQ(2.50)
AC_INIT() AC_INIT()
echo "$@" >config.parms echo "$@" >config.parms
@ -85,7 +85,7 @@ AC_ARG_ENABLE(evolution2,
],,) ],,)
AC_ARG_WITH(system-stdlibs, AC_ARG_WITH(system-stdlibs,
[ --with-system-stdlibs use libstdc++/libgcc_s already on system [ --with-system-stdlibs use libstdc++/libgcc_s already on system
],,) ],,checkforprelink=yes)
AC_ARG_WITH(system-mspack, AC_ARG_WITH(system-mspack,
[ --with-system-mspack use libmspack already installed on system [ --with-system-mspack use libmspack already installed on system
],,) ],,)
@ -628,6 +628,9 @@ case "$build_os" in
test_gtk=yes test_gtk=yes
test_kde=yes test_kde=yes
test_cups=yes test_cups=yes
if getconf GNU_LIBPTHREAD_VERSION |grep -q NPTL; then
PTHREAD_CFLAGS="-DNPTL"
fi
_os=Linux _os=Linux
;; ;;
gnu) gnu)
@ -737,6 +740,10 @@ else
fi fi
AC_SUBST(ENABLE_CRASHDUMP) AC_SUBST(ENABLE_CRASHDUMP)
if test "$_os" = "WINNT"; then
BUILD_TYPE="$BUILD_TYPE TWAIN"
fi
if test "$_os" = "WINNT"; then if test "$_os" = "WINNT"; then
dnl =================================================================== dnl ===================================================================
dnl Set the ENABLE_VCTK variable. dnl Set the ENABLE_VCTK variable.
@ -2408,6 +2415,15 @@ else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
dnl ===================================================================
dnl Check for prelinked libgcc_s.so.1
dnl ===================================================================
if test -n "$checkforprelink" -a -f /etc/rpm/macros.prelink; then
with_system_stdlibs=yes
AC_MSG_WARN([prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override])
echo "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn
fi
dnl =================================================================== dnl ===================================================================
dnl Check for system stdlibs dnl Check for system stdlibs
dnl =================================================================== dnl ===================================================================
@ -2824,7 +2840,11 @@ if test -n "$with_system_mozilla"; then
PKG_CHECK_MODULES( MOZ_NSPR, mozilla-nspr ) PKG_CHECK_MODULES( MOZ_NSPR, mozilla-nspr )
fi fi
PKG_CHECK_MODULES( MOZ_NSS, $moz_flavour-nss ) PKG_CHECK_MODULES( MOZ_NSS, nss, STANDALONENSS="TRUE", STANDALONENSS="" )
if test -z "$STANDALONENSS"; then
PKG_CHECK_MODULES( MOZ_NSS, $moz_flavour-nss )
fi
save_CPPFLAGS="$CPPFLAGS" save_CPPFLAGS="$CPPFLAGS"
save_LDFLAGS="$LDFLAGS" save_LDFLAGS="$LDFLAGS"
save_LIBS="$LIBS" save_LIBS="$LIBS"
@ -2855,10 +2875,11 @@ Please recompile $tmp with --enable-ldap.])
elif test "$enable_mozilla" = "no"; then elif test "$enable_mozilla" = "no"; then
AC_MSG_RESULT([none]) AC_MSG_RESULT([none])
WITH_MOZILLA=NO WITH_MOZILLA=NO
BUILD_TYPE="$BUILD_TYPE NP_SDK"
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_MOZILLA=NO SYSTEM_MOZILLA=NO
BUILD_TYPE="$BUILD_TYPE MOZ" BUILD_TYPE="$BUILD_TYPE MOZ NP_SDK"
if test -z "$with_mozilla_version"; then if test -z "$with_mozilla_version"; then
MOZILLA_VERSION= MOZILLA_VERSION=
else else