gnustep/libs-sqlclient
0
0
Fork 0
mirror of https://github.com/gnustep/libs-sqlclient.git synced 2025-02-21 02:41:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixup for building 64bit on a 32/64 system

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/sqlclient/trunk@24123 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2006-11-17 12:41:24 +00:00
parent 983774ecce
commit b7dd7a659a
2 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
configure vendored
View file

@ -1771,10 +1771,6 @@ else
{ echo "$as_me:$LINENO: result: no: build if possible" >&5 { echo "$as_me:$LINENO: result: no: build if possible" >&5
echo "${ECHO_T}no: build if possible" >&6; } echo "${ECHO_T}no: build if possible" >&6; }
# FIXME - check for -ljvm: on my machine I have a jni.h (from GCC),
# but no -ljvm, so this config code erroneously decides to compile the
# JDBC bundle, and that fails. :-(
# Get likely subdirectory for system specific java include # Get likely subdirectory for system specific java include
case "$GNUSTEP_HOST_OS" in case "$GNUSTEP_HOST_OS" in
bsdi*) _JNI_SUBDIR="bsdos";; bsdi*) _JNI_SUBDIR="bsdos";;
@ -3659,7 +3655,18 @@ done
if test "$ac_cv_header_jni_h" = "yes"; then if test "$ac_cv_header_jni_h" = "yes"; then
JDBC_VM_LIBS="-ljvm" JDBC_VM_LIBS="-ljvm"
jre_lib="$JAVA_HOME/jre/lib" jre_lib="$JAVA_HOME/jre/lib"
case "$GNUSTEP_HOST_CPU" in # If on a 32/64bit system and compiling for the 64bit model
# adjust the cpu type to be the 64bit version
case "$CFLAGS" in
*-m64*)
if test "$GNUSTEP_HOST_CPU" = "ix86"; then
_CPU="x86_64"
else
_CPU="$GNUSTEP_HOST_CPU"
fi;;
*) _CPU="$GNUSTEP_HOST_CPU";;
esac
case "$_CPU" in
ix86) JAVA_CPU=i386;; ix86) JAVA_CPU=i386;;
x86_64) JAVA_CPU=amd64;; x86_64) JAVA_CPU=amd64;;
sparc) JAVA_CPU=sparc;; sparc) JAVA_CPU=sparc;;

17
configure.ac
View file

@ -55,10 +55,6 @@ if test "$ac_cv_jdbc_bundle" = "no"; then
else else
AC_MSG_RESULT([no: build if possible]) AC_MSG_RESULT([no: build if possible])
# FIXME - check for -ljvm: on my machine I have a jni.h (from GCC),
# but no -ljvm, so this config code erroneously decides to compile the
# JDBC bundle, and that fails. :-(
# Get likely subdirectory for system specific java include # Get likely subdirectory for system specific java include
case "$GNUSTEP_HOST_OS" in case "$GNUSTEP_HOST_OS" in
bsdi*) _JNI_SUBDIR="bsdos";; bsdi*) _JNI_SUBDIR="bsdos";;
@ -77,7 +73,18 @@ AC_CHECK_HEADERS(jni.h)
if test "$ac_cv_header_jni_h" = "yes"; then if test "$ac_cv_header_jni_h" = "yes"; then
JDBC_VM_LIBS="-ljvm" JDBC_VM_LIBS="-ljvm"
jre_lib="$JAVA_HOME/jre/lib" jre_lib="$JAVA_HOME/jre/lib"
case "$GNUSTEP_HOST_CPU" in # If on a 32/64bit system and compiling for the 64bit model
# adjust the cpu type to be the 64bit version
case "$CFLAGS" in
*-m64*)
if test "$GNUSTEP_HOST_CPU" = "ix86"; then
_CPU="x86_64"
else
_CPU="$GNUSTEP_HOST_CPU"
fi;;
*) _CPU="$GNUSTEP_HOST_CPU";;
esac
case "$_CPU" in
ix86) JAVA_CPU=i386;; ix86) JAVA_CPU=i386;;
x86_64) JAVA_CPU=amd64;; x86_64) JAVA_CPU=amd64;;
sparc) JAVA_CPU=sparc;; sparc) JAVA_CPU=sparc;;