Changeset 10917 for trunk/indexers/mg
- Timestamp:
- 2005-11-17T15:30:33+13:00 (18 years ago)
- Location:
- trunk/indexers/mg
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/indexers/mg/configure
r10887 r10917 6057 6057 # we need to set an extended JNI path for Mac OS/Darwin, as jni.h is on 6058 6058 # a non-standard Path 6059 echo "$as_me:$LINENO: checking for Apple MacOS X/Darwin" >&5 6060 echo $ECHO_N "checking for Apple MacOS X/Darwin... $ECHO_C" >&6 6059 # is there a better way to do this?? 6060 echo "$as_me:$LINENO: checking for OS to set JNI options" >&5 6061 echo $ECHO_N "checking for OS to set JNI options... $ECHO_C" >&6 6062 # set defaults 6063 JNIINC="" 6064 JNISUFFIX="so" 6065 JNIFLAGS="-shared" 6066 6061 6067 if test "`(uname -s) 2> /dev/null`" = 'Darwin'; then 6062 echo "$as_me:$LINENO: result: yes" >&56063 echo "${ECHO_T} yes" >&66068 echo "$as_me:$LINENO: result: Darwin" >&5 6069 echo "${ECHO_T}Darwin" >&6 6064 6070 JNIINC="-I/System/Library/Frameworks/JavaVM.framework/Headers/ " 6065 6071 JNISUFFIX="jnilib" 6066 6072 JNIFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM" 6067 else 6068 echo "$as_me:$LINENO: result: no" >&5 6069 echo "${ECHO_T}no" >&6 6070 JNIINC="" 6071 JNISUFFIX="so" 6072 JNIFLAGS="-shared" 6073 fi 6073 fi 6074 if test "`(uname -s) 2> /dev/null`" = 'SunOS'; then 6075 echo "$as_me:$LINENO: result: Solaris" >&5 6076 echo "${ECHO_T}Solaris" >&6 6077 JNIINC="-I\$(JAVA_HOME)/include/solaris " 6078 fi 6079 if test "`(uname -s) 2> /dev/null`" = 'Linux'; then 6080 echo "$as_me:$LINENO: result: Linux" >&5 6081 echo "${ECHO_T}Linux" >&6 6082 JNIINC="-I\$(JAVA_HOME)/include/linux " 6083 fi 6084 6074 6085 6075 6086 -
trunk/indexers/mg/configure.in
r10887 r10917 86 86 # we need to set an extended JNI path for Mac OS/Darwin, as jni.h is on 87 87 # a non-standard Path 88 AC_MSG_CHECKING(for Apple MacOS X/Darwin) 88 # is there a better way to do this?? 89 AC_MSG_CHECKING(for OS to set JNI options) 90 # set defaults 91 JNIINC="" 92 JNISUFFIX="so" 93 JNIFLAGS="-shared" 94 89 95 if test "`(uname -s) 2> /dev/null`" = 'Darwin'; then 90 AC_MSG_RESULT( yes)96 AC_MSG_RESULT(Darwin) 91 97 JNIINC="-I/System/Library/Frameworks/JavaVM.framework/Headers/ " 92 98 JNISUFFIX="jnilib" 93 99 JNIFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM" 94 else95 AC_MSG_RESULT(no)96 JNIINC=""97 JNISUFFIX="so"98 JNIFLAGS="-shared"99 100 fi 101 if test "`(uname -s) 2> /dev/null`" = 'SunOS'; then 102 AC_MSG_RESULT(Solaris) 103 JNIINC="-I\$(JAVA_HOME)/include/solaris " 104 fi 105 if test "`(uname -s) 2> /dev/null`" = 'Linux'; then 106 AC_MSG_RESULT(Linux) 107 JNIINC="-I\$(JAVA_HOME)/include/linux " 108 fi 109 100 110 AC_SUBST(JNIINC) 101 111 AC_SUBST(JNISUFFIX) -
trunk/indexers/mg/jni/Makefile.in
r10191 r10917 43 43 44 44 # can we get rid of JAVA_HOME from here?? 45 INCLUDES = -I.. -I../lib -I../src/text -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux$(JNIINC)45 INCLUDES = -I.. -I../lib -I../src/text -I$(JAVA_HOME)/include $(JNIINC) 46 46 47 47 all: compile link
Note:
See TracChangeset
for help on using the changeset viewer.