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

INTEGRATION: CWS gcjsix (1.156.8); FILE MERGED

Browse source 
2006/08/03 12:17:51 cmc 1.156.8.5: #i67465# pretty up configure output
2006/08/02 13:03:45 cmc 1.156.8.4: #i67465# and allow JAVA_HOME to be set with gcj
2006/08/02 12:40:49 cmc 1.156.8.3: #i67465# silly me
2006/08/02 12:36:26 cmc 1.156.8.2: #i67465# pretty up configure output
2006/08/02 10:45:12 cmc 1.156.8.1: #i67465# gcc's 4.1.2 libawt is like sun's now, and doesn't require linking against -lgcj, make test only for older versions
This commit is contained in:
Jens-Heiner Rechtien 2006-08-11 15:59:11 +00:00
parent 2826f4e96b
commit 5a41b36a06
1 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
config_office/configure vendored
View file

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Revision: 1.173 .
# From configure.in Revision .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59.
#
@ -7900,7 +7900,9 @@ echo "$as_me: WARNING: EXPERIMENTAL: Kaffe is not a full JDK replacement - some
JDK=gcj
echo "$as_me:$LINENO: result: checked (gcj)" >&5
echo "${ECHO_T}checked (gcj)" >&6
JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*$WITH_JAVA,,p"`
if test -z "$JAVA_HOME"; then
JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*$WITH_JAVA,,p"`
fi
elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "BEA"` -gt 0; then
JDK=bea
@ -8200,12 +8202,16 @@ echo "$as_me: WARNING: in case JAVA_HOME is incorrectly set, some projects with
fi
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"
if test "${ac_cv_header_jni_h+set}" = set; then
if test "$SOLAR_JAVA" != ""; then
echo "$as_me:$LINENO: checking for jawt lib name" >&5
echo $ECHO_N "checking for jawt lib name... $ECHO_C" >&6
if test "$JDK" = "gcj"; then
save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS
CFLAGS="$CFLAGS -I$JAVA_HOME/include"
LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
exec 6>/dev/null # no output
if test "${ac_cv_header_jni_h+set}" = set; then
echo "$as_me:$LINENO: checking for jni.h" >&5
echo $ECHO_N "checking for jni.h... $ECHO_C" >&6
if test "${ac_cv_header_jni_h+set}" = set; then
@ -8351,8 +8357,7 @@ echo "$as_me: error: jni.h could not be found. Mismatch between gcc and libgcj o
fi
echo "$as_me:$LINENO: checking for JAWT_GetAWT in -lgcjawt" >&5
echo "$as_me:$LINENO: checking for JAWT_GetAWT in -lgcjawt" >&5
echo $ECHO_N "checking for JAWT_GetAWT in -lgcjawt... $ECHO_C" >&6
if test "${ac_cv_lib_gcjawt_JAWT_GetAWT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@ -8417,11 +8422,11 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_gcjawt_JAWT_GetAWT" >&5
echo "${ECHO_T}$ac_cv_lib_gcjawt_JAWT_GetAWT" >&6
if test $ac_cv_lib_gcjawt_JAWT_GetAWT = yes; then
AWTLIB=-lgcjawt
AWTLIB="-lgcjawt -lgcj"
fi
if test -z "$AWTLIB"; then
echo "$as_me:$LINENO: checking for JAWT_GetAWT in -ljawt" >&5
if test -z "$AWTLIB"; then
echo "$as_me:$LINENO: checking for JAWT_GetAWT in -ljawt" >&5
echo $ECHO_N "checking for JAWT_GetAWT in -ljawt... $ECHO_C" >&6
if test "${ac_cv_lib_jawt_JAWT_GetAWT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@ -8486,19 +8491,20 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_jawt_JAWT_GetAWT" >&5
echo "${ECHO_T}$ac_cv_lib_jawt_JAWT_GetAWT" >&6
if test $ac_cv_lib_jawt_JAWT_GetAWT = yes; then
AWTLIB=-ljawt
AWTLIB="-ljawt -lgcj"
fi
fi
exec 6>&1 # output on again
CFLAGS=$save_CFLAGS
LDFLAGS=$save_LDFLAGS
fi
if test -z "$AWTLIB"; then
{ { echo "$as_me:$LINENO: error: either -lgcjawt or -ljawt with JAWT_GetAWT is required to build wih gcj" >&5
echo "$as_me: error: either -lgcjawt or -ljawt with JAWT_GetAWT is required to build wih gcj" >&2;}
{ (exit 1); exit 1; }; }
AWTLIB=-ljawt
fi
echo "$as_me:$LINENO: result: $AWTLIB" >&5
echo "${ECHO_T}$AWTLIB" >&6
CFLAGS=$save_CFLAGS
LDFLAGS=$save_LDFLAGS
fi
if test "$SOLAR_JAVA" != ""; then