The R Project SVN R

Rev

Rev 46732 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 46732 Rev 51823
Line 81... Line 81...
81 
[r_cv_javac_works=no
 81 
[r_cv_javac_works=no
82 
if test -n "${JAVAC}"; then
 82 
if test -n "${JAVAC}"; then
83 
  rm -f A.java A.class
 83 
  rm -f A.java A.class
84 
  echo "public class A { }" > A.java
 84 
  echo "public class A { }" > A.java
85 
  if "${JAVAC}" A.java 2>&AS_MESSAGE_LOG_FD; then
 85 
  if "${JAVAC}" A.java 2>&AS_MESSAGE_LOG_FD; then
86 
    if test -e A.class; then
 86 
    if test -f A.class; then
87 
      r_cv_javac_works=yes
 87 
      r_cv_javac_works=yes
88 
    fi
 88 
    fi
89 
  fi
 89 
  fi
90 
  rm -rf A.java A.class
 90 
  rm -rf A.java A.class
91 
fi])
 91 
fi])
Line 94... Line 94...
94 
[r_cv_javac14_works=no
 94 
[r_cv_javac14_works=no
95 
if test "${r_cv_javac_works}" = yes; then
 95 
if test "${r_cv_javac_works}" = yes; then
96 
  rm -f A.java A.class
 96 
  rm -f A.java A.class
97 
  echo "public class A { }" > A.java
 97 
  echo "public class A { }" > A.java
98 
  if "${JAVAC}" -source 1.4 -target 1.4 A.java 2>&AS_MESSAGE_LOG_FD; then
 98 
  if "${JAVAC}" -source 1.4 -target 1.4 A.java 2>&AS_MESSAGE_LOG_FD; then
99 
    if test -e A.class; then
 99 
    if test -f A.class; then
100 
      r_cv_javac14_works=yes
 100 
      r_cv_javac14_works=yes
101 
    fi
 101 
    fi
102 
  fi
 102 
  fi
103 
  rm -rf A.java A.class
 103 
  rm -rf A.java A.class
104 
fi
 104 
fi
Line 176... Line 176...
176 
	JAVA_LD_LIBRARY_PATH=`echo ${JAVA_LD_LIBRARY_PATH} | sed -e s:${JAVA_HOME}:\$\(JAVA_HOME\):g`
 176 
	JAVA_LD_LIBRARY_PATH=`echo ${JAVA_LD_LIBRARY_PATH} | sed -e s:${JAVA_HOME}:\$\(JAVA_HOME\):g`
177 
 
 177 
 
178 
	## includes consist of two parts - jni.h and machine-dependent jni_md.h
 178 
	## includes consist of two parts - jni.h and machine-dependent jni_md.h
179 
	jinc=''
 179 
	jinc=''
180 
	for pinc in include ../include jre/include; do
180 
	for pinc in include ../include jre/include; do
181 
	  if test -e "${JAVA_HOME}/${pinc}/jni.h"; then jinc="${JAVA_HOME}/${pinc}"; break; fi
 181 
	  if test -f "${JAVA_HOME}/${pinc}/jni.h"; then jinc="${JAVA_HOME}/${pinc}"; break; fi
182 
	done
 182 
	done
183 
	## only if we get jni.h we can try to find jni_md.h
 183 
	## only if we get jni.h we can try to find jni_md.h
184 
	if test -n "${jinc}"; then
 184 
	if test -n "${jinc}"; then
185 
	   JAVA_CPPFLAGS="-I${jinc}"
 185 
	   JAVA_CPPFLAGS="-I${jinc}"
186 
	   mdinc=''
 186 
	   mdinc=''
Line 194... Line 194...
194 
	     freebsd*) jmdirs=freebsd;;
 194 
	     freebsd*) jmdirs=freebsd;;
195 
	   esac
 195 
	   esac
196 
	   ## prepend . and append less-likely ones
 196 
	   ## prepend . and append less-likely ones
197 
	   jmdirs=". ${jmdirs} genunix ppc x86 iris hp-ux aix win32 cygwin openbsd"
 197 
	   jmdirs=". ${jmdirs} genunix ppc x86 iris hp-ux aix win32 cygwin openbsd"
198 
	   for pimd in ${jmdirs}; do
 198 
	   for pimd in ${jmdirs}; do
199 
	     if test -e "${jinc}/${pimd}/jni_md.h"; then jmdinc="${jinc}/${pimd}"; break; fi
 199 
	     if test -f "${jinc}/${pimd}/jni_md.h"; then jmdinc="${jinc}/${pimd}"; break; fi
200 
	   done
 200 
	   done
201 
	   if test -z "${jmdinc}"; then
 201 
	   if test -z "${jmdinc}"; then
202 
	     # ultima-ratio: use find and pray that it works
 202 
	     # ultima-ratio: use find and pray that it works
203 
	     jmdinc=`find "${jinc}/" -name jni_md.h 2>/dev/null |head -n 1 2>/dev/null`
 203 
	     jmdinc=`find "${jinc}/" -name jni_md.h 2>/dev/null |head -n 1 2>/dev/null`
204 
	     if test -n "${jmdinc}"; then jmdinc=`dirname "${jmdinc}"`; fi
 204 
	     if test -n "${jmdinc}"; then jmdinc=`dirname "${jmdinc}"`; fi