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

INTEGRATION: CWS cloph04 (1.187.4); FILE MERGED

Browse source 
2006/11/28 11:30:33 cloph 1.187.4.8: fix typo in the warn-message (systay → systray)
2006/11/21 23:09:31 cloph 1.187.4.7: Issue number: #i71740#
Only warn about systray when GTK is enabled
2006/11/21 18:59:01 cloph 1.187.4.6: Issue number: #i71740#
Submitted by: cloph
Check for gtk before setting build type to GTK on mac,
forcely disable gtk-systray AKA quickstarter on mac
let pkg-config remove duplicate libs/cflags (make it one single call)
2006/11/21 17:00:12 cloph 1.187.4.5: Issue number: #i71826#
Submitted by: cloph
restrict oowintool to windows..
2006/11/20 21:02:16 cloph 1.187.4.4: Issue number: #i69221#,#i69893#,#i69894#
Submitted by: cloph
add auto-detection of JAVA_HOME on Mac
2006/11/20 19:25:00 cloph 1.187.4.3: ssue number: #i69711#
Use one AC_PATH_PROGS statement instead of two AC_PATH_PROG ones...
2006/11/20 10:13:17 cloph 1.187.4.2: Issue number: #i69711#
Submitted by: cloph
Don't assume GNU cp is always installed as gnucp
2006/11/20 00:07:02 cloph 1.187.4.1: Issue number: #i71752#
Submitted by: cloph
add prerequisite checks to build mozilla from source and restrict to gtk2 backend for mac
This commit is contained in:
Rüdiger Timm 2006-12-01 13:52:44 +00:00
parent 94811c81de
commit 73a2d5d4e4
1 changed files with 52 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
config_office/configure.in
View file

@ -3,7 +3,7 @@ dnl * vi:set sw=3 ts=3 et:
dnl *
dnl * Name: configure.in
dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland
dnl * Date: $Date: 2006-12-01 14:17:02 $
dnl * Date: $Date: 2006-12-01 14:52:44 $
dnl *
dnl * Desc: This file serves as input for the GNU autoconf package
dnl * in order to create a configure script.
@ -12,7 +12,7 @@ dnl * necessary to build OpenOffice.org
dnl *
dnl *
dnl ******************************************************************/
AC_REVISION( $Revision: 1.188 $ )
AC_REVISION( $Revision: 1.189 $ )
AC_PREREQ(2.50)
AC_INIT()
echo "$@" >config.parms
@ -754,9 +754,14 @@ case "$build_os" in
darwin*) # Mac OS X
test_x=no
test_cups=yes
test_gtk=no
test_gtk=yes
build_cairo=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
;;
freebsd*)
test_x=yes
@ -2065,7 +2070,7 @@ if test "$_os" = "Linux" && echo $build_cpu | grep -E 'i[[3456]]86' 2>/dev/null
fi
AC_SUBST(LANG)
if test -z "$with_jdk_home"; then
if test -z "$with_jdk_home" && test "$_os" = "WINNT"; then
_jdk_home=`./oowintool --jdk-home`
if test -d "$_jdk_home"; then
with_jdk_home="$_jdk_home"
@ -2281,7 +2286,10 @@ if test "$SOLAR_JAVA" != ""; then
# 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
JAVA_HOME=$(readlink $(readlink $JAVACOMPILER) | $SED -e s,/bin/javac$,,)
JAVA_HOME=$(readlink $(readlink $JAVACOMPILER))
elif readlink $JAVACOMPILER >/dev/null 2>/dev/null; then
# maybe only one level of symlink (e.g. on Mac)
JAVA_HOME=$(readlink $JAVACOMPILER)
else
# else warn
AC_MSG_WARN([JAVA_HOME is set to /usr - this is very likely to be incorrect])
@ -2289,9 +2297,24 @@ if test "$SOLAR_JAVA" != ""; then
echo "JAVA_HOME is set to /usr - this is very likely to be incorrect" >> warn
echo "if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >> warn
fi
dnl now that we have the path to the real javac, make a JAVA_HOME out of it..
if test "$JAVA_HOME" != "/usr"; then
if test "$_os" = "Darwin"; then
JAVA_HOME=$(echo $JAVA_HOME | $SED -e s,Commands/javac$,Home,)
else
JAVA_HOME=$(echo $JAVA_HOME | $SED -e s,/bin/javac$,,)
fi
fi
fi
# now check if $JAVA_HOME is really valid
if test ! -d "$JAVA_HOME/jre" -a "x$with_jdk_home" = "x"; then
if test "$_os" = "Darwin"; then
if test ! -f "$JAVA_HOME/lib/jvm.cfg" -a "x$with_jdk_home" = "x"; then
JAVA_HOME_OK="NO"
fi
elif test ! -d "$JAVA_HOME/jre" -a "x$with_jdk_home" = "x"; then
JAVA_HOME_OK="NO"
fi
if test "$JAVA_HOME_OK" = "NO"; then
AC_MSG_WARN([JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script])
AC_MSG_WARN([attempted to find JAVA_HOME automatically, but apparently it failed])
AC_MSG_WARN([in case JAVA_HOME is incorrectly set, some projects with not be built correctly])
@ -3429,8 +3452,8 @@ fi
AC_SUBST(MOZILLA_VERSION)
AC_MSG_CHECKING([for toolkit mozilla should use])
if test -z "$with_mozilla_toolkit"; then
AC_MSG_CHECKING([for toolkit mozilla should use])
if test "$_os" != "WINNT"; then
MOZILLA_TOOLKIT=gtk2
AC_MSG_RESULT([gtk2])
@ -3440,6 +3463,11 @@ else
enable_build_mozilla=1
AC_MSG_RESULT([$MOZILLA_TOOLKIT])
fi
if test "$_os" = "Darwin" && test "$MOZILLA_TOOLKIT" != "gtk2"; then
#only gtk2 toolkit supported - xlib or cocoa nees glib1 and libIDL1 - the latter is not
#available using fink, mac (carbon) doesn't work because xcode installs conflicting headers
AC_MSG_ERROR([Only gtk2 toolkit supported on Mac, sorry.])
fi
AC_SUBST(MOZILLA_TOOLKIT)
@ -3499,7 +3527,9 @@ AC_MSG_ERROR([One or more of the following archives is missing in moz/download/
AC_MSG_RESULT([ok])
fi
elif test "$_os" = "Darwin"; then
AC_MSG_WARN([Mozilla build environment for MacOSX not checked. Do it yourself or supply patches.])
# only gtk2 supported - see above
AC_MSG_NOTICE([checking whether mozilla can be built...])
PKG_CHECK_MODULES(MOZGTK2, gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8, AC_MSG_NOTICE([OK - can build mozilla]), AC_MSG_ERROR([Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages]))
else
# Generic Unix/Linux section
if test "$MOZILLA_TOOLKIT" = "gtk2"; then
@ -3589,6 +3619,8 @@ dnl see if we have the AppKit framework for building with Quartz graphics.
if test "$_os" = "Darwin" -a "x$with_x" != "xyes" -a "x$x_includes" = "xNONE" -a "x$x_libraries" = "xNONE"; then
dnl System is either Mac OS X or pure Darwin, and --with-x was not specified
dnl Default to Aqua graphics if available.
AC_MSG_WARN([building without-x is not fully supported yet. Specify --with-x or be ready to face build problems])
echo "building without-x is not fully supported yet. Specify --with-x or be ready to face build problems" >>warn
AC_MSG_CHECKING([for /System/Library/Frameworks/AppKit.framework])
if test -d "/System/Library/Frameworks/AppKit.framework/"; then
AC_MSG_RESULT([yes])
@ -4181,7 +4213,10 @@ if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then
dnl We also need to check for --with-gnu-cp
if test -z "$with_gnu_cp"; then
GNUCP=gnucp
AC_PATH_PROGS(GNUCP, gnucp cp)
if test -z $GNUCP; then
AC_MSG_ERROR([Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it])
fi
else
if test -x "$with_gnu_cp"; then
GNUCP=$with_gnu_cp
@ -4509,18 +4544,15 @@ GTK_LIBS=""
ENABLE_SYSTRAY_GTK=""
if test "$test_gtk" = "yes"; then
if test "$ENABLE_GTK" = "TRUE" ; then
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4)
PKG_CHECK_MODULES(GDKPIXBUF, gdk-pixbuf-xlib-2.0 >= 2.2)
GTK_CFLAGS="$GTK_CFLAGS $GDKPIXBUF_CFLAGS"
GTK_LIBS="$GTK_LIBS $GDKPIXBUF_LIBS"
BUILD_TYPE="$BUILD_TYPE GTK"
if test "$ENABLE_GTK" = "TRUE" ; then
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 ,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages]))
BUILD_TYPE="$BUILD_TYPE GTK"
if test "x$enable_systray" = "xyes"; then
ENABLE_SYSTRAY_GTK="TRUE"
BUILD_TYPE="$BUILD_TYPE SYSTRAY_GTK"
fi
fi
if test "x$enable_systray" = "xyes"; then
ENABLE_SYSTRAY_GTK="TRUE"
BUILD_TYPE="$BUILD_TYPE SYSTRAY_GTK"
fi
fi
fi
AC_SUBST(ENABLE_SYSTRAY_GTK)