Hi all,

I've improved the configure check for javah a little bit.

cheers,
dalibor topic


2007-04-17  Dalibor Topic  <[EMAIL PROTECTED]>

       * m4/acinclude.m4 (CLASSPATH_CHECK_JAVAH):
       Use AC_CHECK_PROGS and AC_MSG_ERROR. Check for
       gjavah, gcjh-wrapper-4.1 and gcjh-4.1. Error out
       when no javah implementation can be found.

Index: m4/acinclude.m4
===================================================================
RCS file: /sources/classpath/classpath/m4/acinclude.m4,v
retrieving revision 1.16
diff -u -r1.16 acinclude.m4
--- m4/acinclude.m4     17 Apr 2007 15:52:38 -0000      1.16
+++ m4/acinclude.m4     17 Apr 2007 19:36:58 -0000
@@ -215,18 +215,12 @@
       AC_PATH_PROG(USER_JAVAH, "$1")
     fi
   else
-    for javah_name in gcjh javah; do
-      AC_PATH_PROG(USER_JAVAH, "$javah_name")
-      if test "x${USER_JAVAH}" != x; then
-        break
-      fi
-    done
+    AC_PATH_PROGS([USER_JAVAH],[gjavah gcjh-wrapper-4.1 gcjh-4.1 gcjh javah])
   fi
   
-#  if test "x${USER_JAVAH}" = x; then
-#    echo "configure: cannot find javah" 1>&2
-#    exit 1
-#  fi
+  if test "x${USER_JAVAH}" = x; then
+    AC_MSG_ERROR([can not find javah])
+  fi
 ])
 
 dnl -----------------------------------------------------------

Reply via email to