Changeset 10191 for trunk/gsdl3/packages/mg/configure.in

Timestamp:

2005-06-29T12:33:27+12:00 (19 years ago)

Author:

kjdon

Message:

changes to jni stuff for Mac OS -configure now sets JNIINC, JNISUFFIX, JNIFLAGS for use in jni/Makefile.in - Mac OS has a different extension for the shared library, also uses different linker options

File:

• trunk/gsdl3/packages/mg/configure.in (modified) (3 diffs)

trunk/gsdl3/packages/mg/configure.in

@@ -77 +77 @@
 if test "`(uname -s) 2> /dev/null`" = 'HP-UX'; then
   AC_MSG_RESULT(yes)
-  LIBOBJS="$LIBOBJS gmalloc.o"
+  AC_LIBOBJ(gmalloc)
   AC_DEFINE(HAVE_VALLOC)
 else
@@ -83 +83 @@
   AC_CHECK_FUNCS(valloc)
 fi
+
+# 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)
+if test "`(uname -s) 2> /dev/null`" = 'Darwin'; then
+  AC_MSG_RESULT(yes)
+  JNIINC="-I/System/Library/Frameworks/JavaVM.framework/Headers/ "
+  JNISUFFIX="jnilib"
+  JNIFLAGS="-dynamiclib -fno-common -single_module"
+  LDFLAGS="-framework JavaVM"
+else
+  AC_MSG_RESULT(no)
+  JNIINC=""
+  JNISUFFIX="so"
+  JNIFLAGS="-shared"
+fi
+AC_SUBST(JNIINC)
+AC_SUBST(JNISUFFIX)
+AC_SUBST(JNIFLAGS)
 
 fp_WITH_DMALLOC
@@ -90 +109 @@
 if test "$ac_cv_func_alloca" = 'no'; then
 dnl    support functions for alloca.c
-  LIBOBJS="$LIBOBJS xmalloc.o error.o"
+  AC_LIBOBJ(xmalloc)
+  AC_LIBOBJ(error)
 fi