mirror of
https://github.com/gnustep/libs-sqlclient.git
synced 2025-02-15 16:11:42 +00:00
simplify jdbc config
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/sqlclient/trunk@23509 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
85adb41c19
commit
cbbde8719f
2 changed files with 4 additions and 4 deletions
4
configure
vendored
4
configure
vendored
|
@ -3602,7 +3602,7 @@ done
|
|||
if test "$ac_cv_header_jni_h" = "yes"; then
|
||||
INCD="$INCD -I$JAVA_HOME/include"
|
||||
JDBC=yes
|
||||
JDBC_VM_LIBS="-ljava -ljvm -lhpi"
|
||||
JDBC_VM_LIBS="-ljvm"
|
||||
jre_lib="$JAVA_HOME/jre/lib"
|
||||
case "$GNUSTEP_HOST_CPU" in
|
||||
ix86) JAVA_CPU=i386;;
|
||||
|
@ -3610,7 +3610,7 @@ if test "$ac_cv_header_jni_h" = "yes"; then
|
|||
*) JAVA_CPU=i386;;
|
||||
esac
|
||||
jre_cpu="$jre_lib/$JAVA_CPU"
|
||||
JDBC_VM_LIBDIRS="-L$jre_cpu -L$jre_cpu/native_threads -L$jre_cpu/classic -L$jre_cpu/server"
|
||||
JDBC_VM_LIBDIRS="-L$jre_cpu/server"
|
||||
else
|
||||
JDBC=
|
||||
JDBC_VM_LIBS=
|
||||
|
|
|
@ -54,7 +54,7 @@ AC_CHECK_HEADERS(jni.h)
|
|||
if test "$ac_cv_header_jni_h" = "yes"; then
|
||||
INCD="$INCD -I$JAVA_HOME/include"
|
||||
JDBC=yes
|
||||
JDBC_VM_LIBS="-ljava -ljvm -lhpi"
|
||||
JDBC_VM_LIBS="-ljvm"
|
||||
jre_lib="$JAVA_HOME/jre/lib"
|
||||
case "$GNUSTEP_HOST_CPU" in
|
||||
ix86) JAVA_CPU=i386;;
|
||||
|
@ -62,7 +62,7 @@ if test "$ac_cv_header_jni_h" = "yes"; then
|
|||
*) JAVA_CPU=i386;;
|
||||
esac
|
||||
jre_cpu="$jre_lib/$JAVA_CPU"
|
||||
JDBC_VM_LIBDIRS="-L$jre_cpu -L$jre_cpu/native_threads -L$jre_cpu/classic -L$jre_cpu/server"
|
||||
JDBC_VM_LIBDIRS="-L$jre_cpu/server"
|
||||
else
|
||||
JDBC=
|
||||
JDBC_VM_LIBS=
|
||||
|
|
Loading…
Reference in a new issue