diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-25 14:45:19 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-25 14:45:19 +0000 |
| commit | a4b6dd432adb28867259c7a00b5ae718dacb0f87 (patch) | |
| tree | e5b70646dc06a6bb72161c39d7c87820603bc6c4 /config_office/configure.in | |
| parent | bfbb85ef15b0a77caf1a15d918f5cd4d6f688475 (diff) | |
INTEGRATION: CWS javastuffor231_SRC680 (1.216.2.2.10); FILE MERGED
2007/10/22 14:08:48 rene 1.216.2.2.10.1: #81616# fix jawt check
Diffstat (limited to 'config_office/configure.in')
| -rw-r--r-- | config_office/configure.in | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/config_office/configure.in b/config_office/configure.in index 2b58ca61ea57..f1afeb23d1d5 100644 --- a/config_office/configure.in +++ b/config_office/configure.in @@ -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: 2007-10-04 07:48:20 $ +dnl * Date: $Date: 2007-10-25 15:45:19 $ 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.221 $ ) +AC_REVISION( $Revision: 1.222 $ ) AC_PREREQ(2.50) AC_INIT() echo "$@" >config.parms @@ -2466,9 +2466,6 @@ if test "$SOLAR_JAVA" != ""; then 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, [ AWTLIB="-lgcjawt -lgcj"] ) - if test -z "$AWTLIB"; then - AC_CHECK_LIB(jawt, JAWT_GetAWT, [ AWTLIB="-ljawt -lgcj"] ) - fi exec 6>&1 # output on again CFLAGS=$save_CFLAGS LDFLAGS=$save_LDFLAGS |