21 lines
1.5 KiB
Diff
21 lines
1.5 KiB
Diff
|
--- configure.ac 2011-02-08 09:17:35.000000000 +0100
|
||
|
|
+++ configure.ac-gil 2011-02-08 09:17:51.000000000 +0100
|
||
|
|
@@ -747,7 +747,7 @@
|
||
|
|
else
|
||
|
|
LDFLAGS_save=$LDFLAGS
|
||
|
|
# Provide known paths where distribs/OS can store JNI libs
|
||
|
|
- LDFLAGS="-L/usr/lib/jni -L/usr/lib64/jni/ -L$SCI_SRCDIR/thirdparty/ -L$SCI_SRCDIR/bin/"
|
||
|
|
+ LDFLAGS="-L/usr/lib/java -L/usr/lib64/java/ -L$SCI_SRCDIR/thirdparty/ -L$SCI_SRCDIR/bin/"
|
||
|
|
AC_CHECK_LIB([jogl], [glTexParameterf], [JOGL_LIBS="-ljogl"],[AC_MSG_WARN([Could not link against -ljogl. Will try against -ljogl -lGL])])
|
||
|
|
if test -z "$JOGL_LIBS"; then # The previous test failed add more options to the LDFLAGS
|
||
|
|
# the space after "jogl" in the following line is on
|
||
|
|
@@ -775,7 +775,7 @@
|
||
|
|
else
|
||
|
|
LDFLAGS_save=$LDFLAGS
|
||
|
|
# Provide known paths where distribs/OS can store JNI libs
|
||
|
|
- LDFLAGS="-L/usr/lib/jni -L/usr/lib64/jni/ -ldl -L$SCI_SRCDIR/thirdparty/ -L$SCI_SRCDIR/bin/"
|
||
|
|
+ LDFLAGS="-L/usr/lib/java -L/usr/lib64/java/ -ldl -L$SCI_SRCDIR/thirdparty/ -L$SCI_SRCDIR/bin/"
|
||
|
|
symbol="Java_com_sun_gluegen_runtime_UnixDynamicLinkerImpl_dlclose__J"
|
||
|
|
AC_CHECK_LIB([gluegen-rt], [$symbol], [GLUEGEN_RT_LIBS="-lgluegen-rt"],
|
||
|
|
[AC_MSG_ERROR([libgluegen-rt: Library missing (Cannot find symbol glTexParameterf). Check if libgluegen-rt - C/Java (JNI) interface for GLUEGEN - is installed and if the version is correct. Note that you might have to update etc/librarypath.xml to provide the actual path the the JNI libraries.])],
|