#i10000# generated with changes from cws cmcfixes23 and macosx20xfixes01
This commit is contained in:
Oliver Bolte
parent
01f2a2bade
commit
574cd0fd1b
1 changed files with 119 additions and 3 deletions
122
config_office/configure
vendored
122
config_office/configure
vendored
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.in Revision: 1.148 .
|
||||
# From configure.in Revision: 1.150 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.59.
|
||||
#
|
||||
|
|
@ -1800,6 +1800,8 @@ fi;
|
|||
if test "${with_system_stdlibs+set}" = set; then
|
||||
withval="$with_system_stdlibs"
|
||||
|
||||
else
|
||||
checkforprelink=yes
|
||||
fi;
|
||||
|
||||
# Check whether --with-system-mspack or --without-system-mspack was given.
|
||||
|
|
@ -2669,6 +2671,9 @@ echo "$as_me: error: only sparc and i386 processors are supported" >&2;}
|
|||
test_gtk=yes
|
||||
test_kde=yes
|
||||
test_cups=yes
|
||||
if getconf GNU_LIBPTHREAD_VERSION |grep -q NPTL; then
|
||||
PTHREAD_CFLAGS="-DNPTL"
|
||||
fi
|
||||
_os=Linux
|
||||
;;
|
||||
gnu)
|
||||
|
|
@ -2787,6 +2792,10 @@ echo "$as_me: error: --enable-crashdump only accepts yes, no, TRUE or STATIC as
|
|||
fi
|
||||
|
||||
|
||||
if test "$_os" = "WINNT"; then
|
||||
BUILD_TYPE="$BUILD_TYPE TWAIN"
|
||||
fi
|
||||
|
||||
if test "$_os" = "WINNT"; then
|
||||
echo "$as_me:$LINENO: checking whether to check for the MS VC Toolkit 2003" >&5
|
||||
echo $ECHO_N "checking whether to check for the MS VC Toolkit 2003... $ECHO_C" >&6
|
||||
|
|
@ -8503,7 +8512,7 @@ echo $ECHO_N "checking which PackageMaker EPM thinks to use... $ECHO_C" >&6
|
|||
{ { echo "$as_me:$LINENO: 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)" >&5
|
||||
echo "$as_me: 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)" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
elif test "$_pm" = "Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"; then
|
||||
elif test "$_pm" = "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"; then
|
||||
echo "$as_me:$LINENO: result: $_pm, ok" >&5
|
||||
echo "${ECHO_T}$_pm, ok" >&6
|
||||
else # we never should get here, but go safe
|
||||
|
|
@ -8814,6 +8823,13 @@ else
|
|||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
if test -n "$checkforprelink" -a -f /etc/rpm/macros.prelink; then
|
||||
with_system_stdlibs=yes
|
||||
{ echo "$as_me:$LINENO: WARNING: prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&5
|
||||
echo "$as_me: WARNING: prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&2;}
|
||||
echo "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn
|
||||
fi
|
||||
|
||||
echo "$as_me:$LINENO: checking whether to provide libstdc++/libgcc_s in the installset" >&5
|
||||
echo $ECHO_N "checking whether to provide libstdc++/libgcc_s in the installset... $ECHO_C" >&6
|
||||
if test -n "$with_system_stdlibs" -o -n "$with_system_libs" && \
|
||||
|
|
@ -11831,6 +11847,103 @@ esac
|
|||
fi
|
||||
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
|
||||
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
|
||||
echo "${ECHO_T}$PKG_CONFIG" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
if test "$PKG_CONFIG" = "no" ; then
|
||||
echo "*** The pkg-config script could not be found. Make sure it is"
|
||||
echo "*** in your path, or set the PKG_CONFIG environment variable"
|
||||
echo "*** to the full path to pkg-config."
|
||||
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
|
||||
else
|
||||
PKG_CONFIG_MIN_VERSION=0.9.0
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
|
||||
echo "$as_me:$LINENO: checking for nss" >&5
|
||||
echo $ECHO_N "checking for nss... $ECHO_C" >&6
|
||||
|
||||
if $PKG_CONFIG --exists "nss" ; then
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
succeeded=yes
|
||||
|
||||
echo "$as_me:$LINENO: checking MOZ_NSS_CFLAGS" >&5
|
||||
echo $ECHO_N "checking MOZ_NSS_CFLAGS... $ECHO_C" >&6
|
||||
MOZ_NSS_CFLAGS=`$PKG_CONFIG --cflags "nss"`
|
||||
echo "$as_me:$LINENO: result: $MOZ_NSS_CFLAGS" >&5
|
||||
echo "${ECHO_T}$MOZ_NSS_CFLAGS" >&6
|
||||
|
||||
echo "$as_me:$LINENO: checking MOZ_NSS_LIBS" >&5
|
||||
echo $ECHO_N "checking MOZ_NSS_LIBS... $ECHO_C" >&6
|
||||
MOZ_NSS_LIBS=`$PKG_CONFIG --libs "nss"`
|
||||
echo "$as_me:$LINENO: result: $MOZ_NSS_LIBS" >&5
|
||||
echo "${ECHO_T}$MOZ_NSS_LIBS" >&6
|
||||
else
|
||||
MOZ_NSS_CFLAGS=""
|
||||
MOZ_NSS_LIBS=""
|
||||
## If we have a custom action on failure, don't print errors, but
|
||||
## do set a variable so people can do so.
|
||||
MOZ_NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nss"`
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
else
|
||||
echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
|
||||
echo "*** See http://www.freedesktop.org/software/pkgconfig"
|
||||
fi
|
||||
fi
|
||||
|
||||
if test $succeeded = yes; then
|
||||
STANDALONENSS="TRUE"
|
||||
else
|
||||
STANDALONENSS=""
|
||||
fi
|
||||
|
||||
if test -z "$STANDALONENSS"; then
|
||||
|
||||
succeeded=no
|
||||
|
||||
if test -z "$PKG_CONFIG"; then
|
||||
# Extract the first word of "pkg-config", so it can be a program name with args.
|
||||
set dummy pkg-config; ac_word=$2
|
||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
case $PKG_CONFIG in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
|
||||
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
|
||||
echo "${ECHO_T}$PKG_CONFIG" >&6
|
||||
|
|
@ -11891,6 +12004,8 @@ echo "${ECHO_T}$MOZ_NSS_LIBS" >&6
|
|||
{ { echo "$as_me:$LINENO: error: Library requirements ($moz_flavour-nss ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
|
||||
echo "$as_me: error: Library requirements ($moz_flavour-nss ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
save_CPPFLAGS="$CPPFLAGS"
|
||||
|
|
@ -12008,11 +12123,12 @@ elif test "$enable_mozilla" = "no"; then
|
|||
echo "$as_me:$LINENO: result: none" >&5
|
||||
echo "${ECHO_T}none" >&6
|
||||
WITH_MOZILLA=NO
|
||||
BUILD_TYPE="$BUILD_TYPE NP_SDK"
|
||||
else
|
||||
echo "$as_me:$LINENO: result: internal" >&5
|
||||
echo "${ECHO_T}internal" >&6
|
||||
SYSTEM_MOZILLA=NO
|
||||
BUILD_TYPE="$BUILD_TYPE MOZ"
|
||||
BUILD_TYPE="$BUILD_TYPE MOZ NP_SDK"
|
||||
if test -z "$with_mozilla_version"; then
|
||||
MOZILLA_VERSION=
|
||||
else
|
||||
|
|
|
|||
Loading…
Reference in a new issue