From 96947f376e7c11b57f2a928e91fcd9f1071c9fd2 Mon Sep 17 00:00:00 2001
From: Dalibor Topic <robilad@yahoo.com>
Date: Tue, 17 Apr 2007 19:43:30 +0000
Subject: 2007-04-17  Dalibor Topic  <robilad@kaffe.org>

        * 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.
---
 m4/acinclude.m4 | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'm4')

diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
index e11ccbafc..6cdab2969 100644
--- a/m4/acinclude.m4
+++ b/m4/acinclude.m4
@@ -215,18 +215,12 @@ AC_DEFUN([CLASSPATH_CHECK_JAVAH],
       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 -----------------------------------------------------------
-- 
cgit v1.2.1