Changeset 10917 for trunk/gsdl3/src/packages/javagdbm/configure.in

Timestamp:

2005-11-17T15:30:33+13:00 (18 years ago)

Author:

kjdon

Message:

removed java_home/include/linux from include path in makefile, made the configure script include this in JNIINC for linux, and use JAVA_HOME/include/solaris for solaris machines

File:

• trunk/gsdl3/src/packages/javagdbm/configure.in (modified) (1 diff)

trunk/gsdl3/src/packages/javagdbm/configure.in

@@ -164 +164 @@
 # we need to set an extended JNI path for Mac OS/Darwin, as jni.h is on
 # a non-standard Path
-AC_MSG_CHECKING(for Apple MacOS X/Darwin)
+# is there a better way to do this??
+AC_MSG_CHECKING(for OS to set JNI options)
+# set defaults
+JNIINC=""
+JNISUFFIX="so"
+JNIFLAGS="-shared"
+
 if test "`(uname -s) 2> /dev/null`" = 'Darwin'; then
-  AC_MSG_RESULT(yes)
+  AC_MSG_RESULT(Darwin)
   JNIINC="-I/System/Library/Frameworks/JavaVM.framework/Headers/ "
   JNISUFFIX="jnilib"
-  JNIFLAGS="-dynamiclib -fno-common -framework JavaVM"
-else
-  AC_MSG_RESULT(no)
-  JNIINC=""
-  JNISUFFIX="so"
-  JNIFLAGS="-shared"
+  JNIFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM"
 fi
+if test "`(uname -s) 2> /dev/null`" = 'SunOS'; then
+  AC_MSG_RESULT(Solaris)
+  JNIINC="-I\$(JAVA_HOME)/include/solaris "
+fi
+if test "`(uname -s) 2> /dev/null`" = 'Linux'; then
+  AC_MSG_RESULT(Linux)
+  JNIINC="-I\$(JAVA_HOME)/include/linux "
+fi
+
 AC_SUBST(JNIINC)
 AC_SUBST(JNISUFFIX)