* configure.in (AM_PROG_GCJ): Moved definition...

* libtool.m4: ... here.

diff --git a/ChangeLog b/ChangeLog
index 15e761309393a549ba754b26efe8ff524c94ed93..8b51131925ac5dc8f59fcb87d0bafc8d5f25ec90 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-07-26  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
 
+       * configure.in (AM_PROG_GCJ): Moved definition...
+       * libtool.m4: ... here.
+
        * ltmain.in (tagname): Use `case' instead of `grep' to infer it.
        Match even when there are changes in white-space.
        (link): Accumulate base_compile so that -L flags that are part of

diff --git a/configure.in b/configure.in
index b59372f6993d3b99f5de64cd7705871152b01719..df2eb686524db4ef73a9635497d667230dcfcdbb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -59,17 +59,7 @@ 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],
-  [ifdef([AM_PROG_GCJ],[],[
-    # Stolen from automake
-    AC_DEFUN([AM_PROG_GCJ],[
-      AC_CHECK_PROGS(GCJ, gcj, gcj)
-      if test "x${GCJFLAGS+set}" = xset; then
-        GCJFLAGS="-g -O2"
-      fi
-      AC_SUBST(GCJFLAGS)
-    ])])
-  AM_PROG_GCJ])
+ifdef([AC_PROG_GCJ],[AC_PROG_GCJ],[AM_PROG_GCJ])
 popdef([AC_MSG_ERROR])
 AM_CONDITIONAL(HAVE_GCJ, [test "x$GCJ" != xno])
 

diff --git a/libtool.m4 b/libtool.m4
index 05c56ccbaf6fab89eeebda0743fb5a472fae3c75..6468495e2697533f517ded1df508ea74e2464fae 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -822,3 +822,14 @@ 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_SUBST(GCJFLAGS)
+])])