Changeset 10917

Show
Ignore:
Timestamp:
17.11.2005 15:30:33 (14 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
Files:
15 modified

Legend:

Unmodified
Added
Removed
  • trunk/gsdl3/src/packages/javagdbm/configure

    r10887 r10917  
    11#! /bin/sh 
    2 # From configure.in Revision: 1.2 . 
     2# From configure.in Revision: 1.3 . 
    33# Guess values for system-dependent variables and create Makefiles. 
    44# Generated by GNU Autoconf 2.59. 
     
    43754375# we need to set an extended JNI path for Mac OS/Darwin, as jni.h is on 
    43764376# a non-standard Path 
    4377 echo "$as_me:$LINENO: checking for Apple MacOS X/Darwin" >&5 
    4378 echo $ECHO_N "checking for Apple MacOS X/Darwin... $ECHO_C" >&6 
     4377# is there a better way to do this?? 
     4378echo "$as_me:$LINENO: checking for OS to set JNI options" >&5 
     4379echo $ECHO_N "checking for OS to set JNI options... $ECHO_C" >&6 
     4380# set defaults 
     4381JNIINC="" 
     4382JNISUFFIX="so" 
     4383JNIFLAGS="-shared" 
     4384 
    43794385if test "`(uname -s) 2> /dev/null`" = 'Darwin'; then 
    4380   echo "$as_me:$LINENO: result: yes" >&5 
    4381 echo "${ECHO_T}yes" >&6 
     4386  echo "$as_me:$LINENO: result: Darwin" >&5 
     4387echo "${ECHO_T}Darwin" >&6 
    43824388  JNIINC="-I/System/Library/Frameworks/JavaVM.framework/Headers/ " 
    43834389  JNISUFFIX="jnilib" 
    4384   JNIFLAGS="-dynamiclib -fno-common -framework JavaVM" 
    4385 else 
    4386   echo "$as_me:$LINENO: result: no" >&5 
    4387 echo "${ECHO_T}no" >&6 
    4388   JNIINC="" 
    4389   JNISUFFIX="so" 
    4390   JNIFLAGS="-shared" 
    4391 fi 
     4390  JNIFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM" 
     4391fi 
     4392if test "`(uname -s) 2> /dev/null`" = 'SunOS'; then 
     4393  echo "$as_me:$LINENO: result: Solaris" >&5 
     4394echo "${ECHO_T}Solaris" >&6 
     4395  JNIINC="-I\$(JAVA_HOME)/include/solaris " 
     4396fi 
     4397if test "`(uname -s) 2> /dev/null`" = 'Linux'; then 
     4398  echo "$as_me:$LINENO: result: Linux" >&5 
     4399echo "${ECHO_T}Linux" >&6 
     4400  JNIINC="-I\$(JAVA_HOME)/include/linux " 
     4401fi 
     4402 
    43924403 
    43934404 
  • trunk/gsdl3/src/packages/javagdbm/configure.in

    r10887 r10917  
    164164# we need to set an extended JNI path for Mac OS/Darwin, as jni.h is on 
    165165# a non-standard Path 
    166 AC_MSG_CHECKING(for Apple MacOS X/Darwin) 
     166# is there a better way to do this?? 
     167AC_MSG_CHECKING(for OS to set JNI options) 
     168# set defaults 
     169JNIINC="" 
     170JNISUFFIX="so" 
     171JNIFLAGS="-shared" 
     172 
    167173if test "`(uname -s) 2> /dev/null`" = 'Darwin'; then 
    168   AC_MSG_RESULT(yes) 
     174  AC_MSG_RESULT(Darwin) 
    169175  JNIINC="-I/System/Library/Frameworks/JavaVM.framework/Headers/ " 
    170176  JNISUFFIX="jnilib" 
    171   JNIFLAGS="-dynamiclib -fno-common -framework JavaVM" 
    172 else 
    173   AC_MSG_RESULT(no) 
    174   JNIINC="" 
    175   JNISUFFIX="so" 
    176   JNIFLAGS="-shared" 
     177  JNIFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM" 
    177178fi 
     179if test "`(uname -s) 2> /dev/null`" = 'SunOS'; then 
     180  AC_MSG_RESULT(Solaris) 
     181  JNIINC="-I\$(JAVA_HOME)/include/solaris " 
     182fi 
     183if test "`(uname -s) 2> /dev/null`" = 'Linux'; then 
     184  AC_MSG_RESULT(Linux) 
     185  JNIINC="-I\$(JAVA_HOME)/include/linux " 
     186fi 
     187 
    178188AC_SUBST(JNIINC) 
    179189AC_SUBST(JNISUFFIX) 
  • trunk/gsdl3/src/packages/javagdbm/jni/Makefile.in

    r10895 r10917  
    2323 
    2424CC=@CC@ 
    25 JDK=@JAVA_HOME@ 
    26 INC=-I. -I$(JDK)/include -I$(JDK)/include/linux @GDBM_INCLUDE@  
    2725CFLAGS=-c @CFLAGS@ $(INC) -DWRAPPER_VERSION=\"$(WRAPPER_VERSION)\"  
    2826#PKG=@PKG@ 
     
    3331JNISUFFIX=@JNISUFFIX@ 
    3432JNIINC=@JNIINC@ 
     33INC=-I. -I$(JAVA_HOME)/include @GDBM_INCLUDE@ @JNIINC@ 
     34 
    3535 
    3636# TODO: Build versioned shared libraries? 
  • trunk/gsdl3/src/packages/mg/configure

    r10887 r10917  
    60576057# we need to set an extended JNI path for Mac OS/Darwin, as jni.h is on 
    60586058# 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?? 
     6060echo "$as_me:$LINENO: checking for OS to set JNI options" >&5 
     6061echo $ECHO_N "checking for OS to set JNI options... $ECHO_C" >&6 
     6062# set defaults 
     6063JNIINC="" 
     6064JNISUFFIX="so" 
     6065JNIFLAGS="-shared" 
     6066 
    60616067if test "`(uname -s) 2> /dev/null`" = 'Darwin'; then 
    6062   echo "$as_me:$LINENO: result: yes" >&5 
    6063 echo "${ECHO_T}yes" >&6 
     6068  echo "$as_me:$LINENO: result: Darwin" >&5 
     6069echo "${ECHO_T}Darwin" >&6 
    60646070  JNIINC="-I/System/Library/Frameworks/JavaVM.framework/Headers/ " 
    60656071  JNISUFFIX="jnilib" 
    60666072  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 
     6073fi 
     6074if test "`(uname -s) 2> /dev/null`" = 'SunOS'; then 
     6075  echo "$as_me:$LINENO: result: Solaris" >&5 
     6076echo "${ECHO_T}Solaris" >&6 
     6077  JNIINC="-I\$(JAVA_HOME)/include/solaris " 
     6078fi 
     6079if test "`(uname -s) 2> /dev/null`" = 'Linux'; then 
     6080  echo "$as_me:$LINENO: result: Linux" >&5 
     6081echo "${ECHO_T}Linux" >&6 
     6082  JNIINC="-I\$(JAVA_HOME)/include/linux " 
     6083fi 
     6084 
    60746085 
    60756086 
  • trunk/gsdl3/src/packages/mg/configure.in

    r10887 r10917  
    8686# we need to set an extended JNI path for Mac OS/Darwin, as jni.h is on 
    8787# a non-standard Path 
    88 AC_MSG_CHECKING(for Apple MacOS X/Darwin) 
     88# is there a better way to do this?? 
     89AC_MSG_CHECKING(for OS to set JNI options) 
     90# set defaults 
     91JNIINC="" 
     92JNISUFFIX="so" 
     93JNIFLAGS="-shared" 
     94 
    8995if test "`(uname -s) 2> /dev/null`" = 'Darwin'; then 
    90   AC_MSG_RESULT(yes) 
     96  AC_MSG_RESULT(Darwin) 
    9197  JNIINC="-I/System/Library/Frameworks/JavaVM.framework/Headers/ " 
    9298  JNISUFFIX="jnilib" 
    9399  JNIFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM" 
    94 else 
    95   AC_MSG_RESULT(no) 
    96   JNIINC="" 
    97   JNISUFFIX="so" 
    98   JNIFLAGS="-shared" 
    99100fi 
     101if test "`(uname -s) 2> /dev/null`" = 'SunOS'; then 
     102  AC_MSG_RESULT(Solaris) 
     103  JNIINC="-I\$(JAVA_HOME)/include/solaris " 
     104fi 
     105if test "`(uname -s) 2> /dev/null`" = 'Linux'; then 
     106  AC_MSG_RESULT(Linux) 
     107  JNIINC="-I\$(JAVA_HOME)/include/linux " 
     108fi 
     109 
    100110AC_SUBST(JNIINC) 
    101111AC_SUBST(JNISUFFIX) 
  • trunk/gsdl3/src/packages/mg/jni/Makefile.in

    r10191 r10917  
    4343 
    4444# 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) 
     45INCLUDES = -I.. -I../lib -I../src/text -I$(JAVA_HOME)/include $(JNIINC) 
    4646 
    4747all: compile link 
  • trunk/indexers/mg/configure

    r10887 r10917  
    60576057# we need to set an extended JNI path for Mac OS/Darwin, as jni.h is on 
    60586058# 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?? 
     6060echo "$as_me:$LINENO: checking for OS to set JNI options" >&5 
     6061echo $ECHO_N "checking for OS to set JNI options... $ECHO_C" >&6 
     6062# set defaults 
     6063JNIINC="" 
     6064JNISUFFIX="so" 
     6065JNIFLAGS="-shared" 
     6066 
    60616067if test "`(uname -s) 2> /dev/null`" = 'Darwin'; then 
    6062   echo "$as_me:$LINENO: result: yes" >&5 
    6063 echo "${ECHO_T}yes" >&6 
     6068  echo "$as_me:$LINENO: result: Darwin" >&5 
     6069echo "${ECHO_T}Darwin" >&6 
    60646070  JNIINC="-I/System/Library/Frameworks/JavaVM.framework/Headers/ " 
    60656071  JNISUFFIX="jnilib" 
    60666072  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 
     6073fi 
     6074if test "`(uname -s) 2> /dev/null`" = 'SunOS'; then 
     6075  echo "$as_me:$LINENO: result: Solaris" >&5 
     6076echo "${ECHO_T}Solaris" >&6 
     6077  JNIINC="-I\$(JAVA_HOME)/include/solaris " 
     6078fi 
     6079if test "`(uname -s) 2> /dev/null`" = 'Linux'; then 
     6080  echo "$as_me:$LINENO: result: Linux" >&5 
     6081echo "${ECHO_T}Linux" >&6 
     6082  JNIINC="-I\$(JAVA_HOME)/include/linux " 
     6083fi 
     6084 
    60746085 
    60756086 
  • trunk/indexers/mg/configure.in

    r10887 r10917  
    8686# we need to set an extended JNI path for Mac OS/Darwin, as jni.h is on 
    8787# a non-standard Path 
    88 AC_MSG_CHECKING(for Apple MacOS X/Darwin) 
     88# is there a better way to do this?? 
     89AC_MSG_CHECKING(for OS to set JNI options) 
     90# set defaults 
     91JNIINC="" 
     92JNISUFFIX="so" 
     93JNIFLAGS="-shared" 
     94 
    8995if test "`(uname -s) 2> /dev/null`" = 'Darwin'; then 
    90   AC_MSG_RESULT(yes) 
     96  AC_MSG_RESULT(Darwin) 
    9197  JNIINC="-I/System/Library/Frameworks/JavaVM.framework/Headers/ " 
    9298  JNISUFFIX="jnilib" 
    9399  JNIFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM" 
    94 else 
    95   AC_MSG_RESULT(no) 
    96   JNIINC="" 
    97   JNISUFFIX="so" 
    98   JNIFLAGS="-shared" 
    99100fi 
     101if test "`(uname -s) 2> /dev/null`" = 'SunOS'; then 
     102  AC_MSG_RESULT(Solaris) 
     103  JNIINC="-I\$(JAVA_HOME)/include/solaris " 
     104fi 
     105if test "`(uname -s) 2> /dev/null`" = 'Linux'; then 
     106  AC_MSG_RESULT(Linux) 
     107  JNIINC="-I\$(JAVA_HOME)/include/linux " 
     108fi 
     109 
    100110AC_SUBST(JNIINC) 
    101111AC_SUBST(JNISUFFIX) 
  • trunk/indexers/mg/jni/Makefile.in

    r10191 r10917  
    4343 
    4444# 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) 
     45INCLUDES = -I.. -I../lib -I../src/text -I$(JAVA_HOME)/include $(JNIINC) 
    4646 
    4747all: compile link 
  • trunk/indexers/mgpp/configure

    r10887 r10917  
    62406240 
    62416241 
    6242  
    62436242# we need to set an extended JNI path for Mac OS/Darwin, as jni.h is on 
    62446243# a non-standard Path 
    6245 echo "$as_me:$LINENO: checking for Apple MacOS X/Darwin" >&5 
    6246 echo $ECHO_N "checking for Apple MacOS X/Darwin... $ECHO_C" >&6 
     6244# is there a better way to do this?? 
     6245echo "$as_me:$LINENO: checking for OS to set JNI options" >&5 
     6246echo $ECHO_N "checking for OS to set JNI options... $ECHO_C" >&6 
     6247# set defaults 
     6248JNIINC="" 
     6249JNISUFFIX="so" 
     6250JNIFLAGS="-shared" 
     6251 
    62476252if test "`(uname -s) 2> /dev/null`" = 'Darwin'; then 
    6248   echo "$as_me:$LINENO: result: yes" >&5 
    6249 echo "${ECHO_T}yes" >&6 
     6253  echo "$as_me:$LINENO: result: Darwin" >&5 
     6254echo "${ECHO_T}Darwin" >&6 
    62506255  JNIINC="-I/System/Library/Frameworks/JavaVM.framework/Headers/ " 
    62516256  JNISUFFIX="jnilib" 
    6252   JNIFLAGS="-dynamiclib -fno-common -framework JavaVM" 
    6253 else 
    6254   echo "$as_me:$LINENO: result: no" >&5 
    6255 echo "${ECHO_T}no" >&6 
    6256   JNIINC="" 
    6257   JNISUFFIX="so" 
    6258   JNIFLAGS="-shared" 
    6259 fi 
     6257  JNIFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM" 
     6258fi 
     6259if test "`(uname -s) 2> /dev/null`" = 'SunOS'; then 
     6260  echo "$as_me:$LINENO: result: Solaris" >&5 
     6261echo "${ECHO_T}Solaris" >&6 
     6262  JNIINC="-I\$(JAVA_HOME)/include/solaris " 
     6263fi 
     6264if test "`(uname -s) 2> /dev/null`" = 'Linux'; then 
     6265  echo "$as_me:$LINENO: result: Linux" >&5 
     6266echo "${ECHO_T}Linux" >&6 
     6267  JNIINC="-I\$(JAVA_HOME)/include/linux " 
     6268fi 
     6269 
    62606270 
    62616271 
  • trunk/indexers/mgpp/configure.in

    r10887 r10917  
    8181AC_CHECK_FUNC(textdomain, AC_DEFINE(ENABLE_NLS ,1) ) 
    8282 
    83  
    8483# we need to set an extended JNI path for Mac OS/Darwin, as jni.h is on 
    8584# a non-standard Path 
    86 AC_MSG_CHECKING(for Apple MacOS X/Darwin) 
     85# is there a better way to do this?? 
     86AC_MSG_CHECKING(for OS to set JNI options) 
     87# set defaults 
     88JNIINC="" 
     89JNISUFFIX="so" 
     90JNIFLAGS="-shared" 
     91 
    8792if test "`(uname -s) 2> /dev/null`" = 'Darwin'; then 
    88   AC_MSG_RESULT(yes) 
     93  AC_MSG_RESULT(Darwin) 
    8994  JNIINC="-I/System/Library/Frameworks/JavaVM.framework/Headers/ " 
    9095  JNISUFFIX="jnilib" 
    91   JNIFLAGS="-dynamiclib -fno-common -framework JavaVM" 
    92 else 
    93   AC_MSG_RESULT(no) 
    94   JNIINC="" 
    95   JNISUFFIX="so" 
    96   JNIFLAGS="-shared" 
     96  JNIFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM" 
    9797fi 
     98if test "`(uname -s) 2> /dev/null`" = 'SunOS'; then 
     99  AC_MSG_RESULT(Solaris) 
     100  JNIINC="-I\$(JAVA_HOME)/include/solaris " 
     101fi 
     102if test "`(uname -s) 2> /dev/null`" = 'Linux'; then 
     103  AC_MSG_RESULT(Linux) 
     104  JNIINC="-I\$(JAVA_HOME)/include/linux " 
     105fi 
     106 
    98107AC_SUBST(JNIINC) 
    99108AC_SUBST(JNISUFFIX) 
  • trunk/indexers/mgpp/jni/Makefile.in

    r10192 r10917  
    4646 
    4747# can we get rid of JAVA_HOME from here?? 
    48 INCLUDES = -I.. -I../lib -I../text -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(JNIINC) 
     48INCLUDES = -I.. -I../lib -I../text -I$(JAVA_HOME)/include $(JNIINC) 
    4949 
    5050all: compile link 
  • trunk/mgpp/configure

    r10887 r10917  
    62406240 
    62416241 
    6242  
    62436242# we need to set an extended JNI path for Mac OS/Darwin, as jni.h is on 
    62446243# a non-standard Path 
    6245 echo "$as_me:$LINENO: checking for Apple MacOS X/Darwin" >&5 
    6246 echo $ECHO_N "checking for Apple MacOS X/Darwin... $ECHO_C" >&6 
     6244# is there a better way to do this?? 
     6245echo "$as_me:$LINENO: checking for OS to set JNI options" >&5 
     6246echo $ECHO_N "checking for OS to set JNI options... $ECHO_C" >&6 
     6247# set defaults 
     6248JNIINC="" 
     6249JNISUFFIX="so" 
     6250JNIFLAGS="-shared" 
     6251 
    62476252if test "`(uname -s) 2> /dev/null`" = 'Darwin'; then 
    6248   echo "$as_me:$LINENO: result: yes" >&5 
    6249 echo "${ECHO_T}yes" >&6 
     6253  echo "$as_me:$LINENO: result: Darwin" >&5 
     6254echo "${ECHO_T}Darwin" >&6 
    62506255  JNIINC="-I/System/Library/Frameworks/JavaVM.framework/Headers/ " 
    62516256  JNISUFFIX="jnilib" 
    6252   JNIFLAGS="-dynamiclib -fno-common -framework JavaVM" 
    6253 else 
    6254   echo "$as_me:$LINENO: result: no" >&5 
    6255 echo "${ECHO_T}no" >&6 
    6256   JNIINC="" 
    6257   JNISUFFIX="so" 
    6258   JNIFLAGS="-shared" 
    6259 fi 
     6257  JNIFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM" 
     6258fi 
     6259if test "`(uname -s) 2> /dev/null`" = 'SunOS'; then 
     6260  echo "$as_me:$LINENO: result: Solaris" >&5 
     6261echo "${ECHO_T}Solaris" >&6 
     6262  JNIINC="-I\$(JAVA_HOME)/include/solaris " 
     6263fi 
     6264if test "`(uname -s) 2> /dev/null`" = 'Linux'; then 
     6265  echo "$as_me:$LINENO: result: Linux" >&5 
     6266echo "${ECHO_T}Linux" >&6 
     6267  JNIINC="-I\$(JAVA_HOME)/include/linux " 
     6268fi 
     6269 
    62606270 
    62616271 
  • trunk/mgpp/configure.in

    r10887 r10917  
    8181AC_CHECK_FUNC(textdomain, AC_DEFINE(ENABLE_NLS ,1) ) 
    8282 
    83  
    8483# we need to set an extended JNI path for Mac OS/Darwin, as jni.h is on 
    8584# a non-standard Path 
    86 AC_MSG_CHECKING(for Apple MacOS X/Darwin) 
     85# is there a better way to do this?? 
     86AC_MSG_CHECKING(for OS to set JNI options) 
     87# set defaults 
     88JNIINC="" 
     89JNISUFFIX="so" 
     90JNIFLAGS="-shared" 
     91 
    8792if test "`(uname -s) 2> /dev/null`" = 'Darwin'; then 
    88   AC_MSG_RESULT(yes) 
     93  AC_MSG_RESULT(Darwin) 
    8994  JNIINC="-I/System/Library/Frameworks/JavaVM.framework/Headers/ " 
    9095  JNISUFFIX="jnilib" 
    91   JNIFLAGS="-dynamiclib -fno-common -framework JavaVM" 
    92 else 
    93   AC_MSG_RESULT(no) 
    94   JNIINC="" 
    95   JNISUFFIX="so" 
    96   JNIFLAGS="-shared" 
     96  JNIFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM" 
    9797fi 
     98if test "`(uname -s) 2> /dev/null`" = 'SunOS'; then 
     99  AC_MSG_RESULT(Solaris) 
     100  JNIINC="-I\$(JAVA_HOME)/include/solaris " 
     101fi 
     102if test "`(uname -s) 2> /dev/null`" = 'Linux'; then 
     103  AC_MSG_RESULT(Linux) 
     104  JNIINC="-I\$(JAVA_HOME)/include/linux " 
     105fi 
     106 
    98107AC_SUBST(JNIINC) 
    99108AC_SUBST(JNISUFFIX) 
  • trunk/mgpp/jni/Makefile.in

    r10192 r10917  
    4646 
    4747# can we get rid of JAVA_HOME from here?? 
    48 INCLUDES = -I.. -I../lib -I../text -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(JNIINC) 
     48INCLUDES = -I.. -I../lib -I../text -I$(JAVA_HOME)/include $(JNIINC) 
    4949 
    5050all: compile link