[llvm-commits] CVS: llvm-java/autoconf/configure.ac

[Alkis Evlogimenos]

Changes in directory llvm-java/autoconf:

configure.ac updated: 1.10 -> 1.11
---
Log message:

Find javah executable at configuration time.


---
Diffs of the changes:  (+9 -2)

Index: llvm-java/autoconf/configure.ac
diff -u llvm-java/autoconf/configure.ac:1.10 llvm-java/autoconf/configure.ac:1.11
--- llvm-java/autoconf/configure.ac:1.10	Wed Dec  8 00:32:14 2004
+++ llvm-java/autoconf/configure.ac	Wed Dec  8 00:37:37 2004
@@ -34,10 +34,12 @@
 dnl **************************************************************************
 dnl * Check for programs.
 dnl **************************************************************************
-AC_ARG_VAR(JAVAC, [The java compiler (used for testing)])
-AC_CHECK_PROG(JAVAC, javac, javac)
 AC_ARG_VAR(JAVA, [The Java Virtual Machine (used for testing)])
 AC_CHECK_PROG(JAVA, java, java)
+AC_ARG_VAR(JAVAC, [The java compiler (used for testing)])
+AC_CHECK_PROG(JAVAC, javac, javac)
+AC_ARG_VAR(JAVAH, [The java JNI header generator (used for testing)])
+AC_CHECK_PROG(JAVAH, javah, javah)
 
 if test -z "$JAVA"
 then
@@ -49,6 +51,11 @@
   AC_MSG_WARN([A Java compiler is required for the test suite, but it was not found])
 fi
 
+if test -z "$JAVAC"
+then
+  AC_MSG_WARN([A Java JNI header generator is required for the test suite, but it was not found])
+fi
+
 dnl Verify that the source directory is valid
 AC_CONFIG_SRCDIR(Makefile.common.in)