Changeset 10917 for trunk/indexers/mgpp

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

Location:

trunk/indexers/mgpp

Files:

• configure (modified) (1 diff)
• configure.in (modified) (1 diff)
• jni/Makefile.in (modified) (1 diff)

trunk/indexers/mgpp/configure

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

trunk/indexers/mgpp/configure.in

@@ -81 +81 @@
 AC_CHECK_FUNC(textdomain, AC_DEFINE(ENABLE_NLS ,1) )
 
-
 # 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)

trunk/indexers/mgpp/jni/Makefile.in

@@ -46 +46 @@
 
 # can we get rid of JAVA_HOME from here??
-INCLUDES = -I.. -I../lib -I../text -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(JNIINC)
+INCLUDES = -I.. -I../lib -I../text -I$(JAVA_HOME)/include $(JNIINC)
 
 all: compile link