Changeset 806

Timestamp:

03/08/06 14:33:12 (6 years ago)

Author:

faa59

Message:

Look for fastjar as an alternative to jar and also make sure
/usr/include/linux is not passsed as a JAVAINLCUDE

File:

• trunk/configure.ac (modified) (2 diffs)

trunk/configure.ac

@@ -137 +137 @@
         fi
         AC_PATH_PROGS(JAVADOC,javadoc,,[$javaroot/bin:$PATH])
-        AC_PATH_PROGS(JAR,jar,,[$javaroot/bin:$PATH])
+        AC_PATH_PROGS(JAR,jar fastjar,,[$javaroot/bin:$PATH])
         AC_PATH_PROGS(JAVA,gij java,,[$javaroot/bin:$PATH])
         AC_PATH_PROGS(JAVAH,gcjh javah,,[$javaroot/bin:$PATH])
@@ -286 +286 @@
 
 if test ! -z "$JAVAINCLUDE" -a ! -z "$java_host"; then
-    JAVAINCLUDE="$JAVAINCLUDE -I$javaroot/include/$java_host"
+# avoid adding /usr/include/linux to include path
+    if test "$javaroot" != "/usr" -a "$javaroot" != "/usr/"; then
+        JAVAINCLUDE="$JAVAINCLUDE -I$javaroot/include/$java_host"
+    fi
 fi