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

INTEGRATION: CWS cmcfixes9 (1.119.6); FILE MERGED

Browse source 
2005/06/14 11:33:17 cmc 1.119.6.3: #i50567# centralize in AWTLIB
2005/06/10 11:28:39 cmc 1.119.6.2: #i50567# gcj will be changing the name from libjawt to libgcjawt
2005/06/10 09:24:31 cmc 1.119.6.1: #i50567# gcj will be changing the name from libjawt to libgcjawt
This commit is contained in:
Oliver Bolte 2005-06-16 13:38:04 +00:00
parent 5ba95fbd1a
commit f9abb8ff83
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
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: 2005-06-09 14:14:33 $
dnl * Date: $Date: 2005-06-16 14:38:04 $
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.120 $ )
AC_REVISION( $Revision: 1.121 $ )
AC_PREREQ(2.50)
AC_INIT()
echo "$@" >config.parms
@ -1886,10 +1886,23 @@ fi
if test "$JDK" = "gcj"; then
save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS
CFLAGS="$CFLAGS -I$JAVA_HOME/include"
LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
AC_CHECK_HEADER(jni.h, [],
[AC_MSG_ERROR([jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?])], [])
AC_CHECK_LIB(gcjawt, JAWT_GetAWT, [ GCJAWTLIB=-lgcjawt ] )
if test -z "$AWTLIB"; then
AC_CHECK_LIB(jawt, JAWT_GetAWT, [ GCJAWTLIB=-ljawt ] )
fi
if test -z "$AWTLIB"; then
AC_MSG_ERROR([either -lgcjawt or -ljawt with JAWT_GetAWT is required to build wih gcj])
fi
AC_SUBST(AWTLIB)
CFLAGS=$save_CFLAGS
LDFLAGS=$save_LDFLAGS
fi
AC_SUBST(JAVA_HOME)