* libtool.m4 (AM_PROG_GCJ): Removed.

(LT_AC_PROG_GCJ): Use AC_CHECK_TOOL.  Set GCJ to `no' if not
found.
* configure.in: Use LT_AC_PROG_GCJ.
Reported by Nick Hudson <nick@nthcliff.demon.co.uk>

diff --git a/ChangeLog b/ChangeLog
index 0db4cfa7232b7c54aa9c563d5ea7d7a57432cef2..393636da2418f13951cc4b851358cf8d06064903 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2000-09-03  Alexandre Oliva  <aoliva@redhat.com>
 
+       * libtool.m4 (AM_PROG_GCJ): Removed.
+       (LT_AC_PROG_GCJ): Use AC_CHECK_TOOL.  Set GCJ to `no' if not
+       found.
+       * configure.in: Use LT_AC_PROG_GCJ.
+       Reported by Nick Hudson <nick@nthcliff.demon.co.uk>
+
        * tests/quote.test: Move the match test out of case statements, to
        work around bug in /bin/sh of several OSs.
 

diff --git a/configure.in b/configure.in
index 4209e4509aa1422d0184ad4b0b4340dbed8e3159..88250c51c0bab57eacf05e32bf87ee0288226ede 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -61,9 +61,7 @@ AC_PROG_CXX
 popdef([AC_MSG_ERROR])
 AM_CONDITIONAL(HAVE_CXX, [test "x$CXX" != xno])
 
-pushdef([AC_MSG_ERROR], [GCJ=no])
-ifdef([AC_PROG_GCJ],[AC_PROG_GCJ],[AM_PROG_GCJ])
-popdef([AC_MSG_ERROR])
+LT_AC_PROG_GCJ
 AM_CONDITIONAL(HAVE_GCJ, [test "x$GCJ" != xno])
 
 AC_ARG_ENABLE(ltdl-install,

diff --git a/libtool.m4 b/libtool.m4
index 90db175dfccce6b1db89588eea1c179e3ef7dbc1..8696233d3fdcda49c80cdb9f8ff7031056dcfd65 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -826,13 +826,8 @@ AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
 dnl This is just to silence aclocal about the macro not being used
 ifelse([AC_DISABLE_FAST_INSTALL])dnl
 
-ifdef([AM_PROG_GCJ],,[
-# Stolen from automake
-AC_DEFUN([AM_PROG_GCJ],[
-  AC_CHECK_PROGS(GCJ, gcj, gcj)
-  dnl Automake uses ``='' in the test below, it seems wrong
-  if test "x${GCJFLAGS+set}" != xset; then
-    GCJFLAGS="-g -O2"
-  fi
+AC_DEFUN([LT_AC_PROG_GCJ],[
+  AC_CHECK_TOOL(GCJ, gcj, no)
+  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
   AC_SUBST(GCJFLAGS)
 ])])