* configure.in (AM_PROG_GCJ): Re-enable, with definition copied

from CVS automake.

diff --git a/ChangeLog b/ChangeLog
index dacaaa02f9481c85cca7414c5595ea5f8d1fc9a0..9924db062b475934993a02f49206900be58512fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-07-10  Alexandre Oliva  <aoliva@lsd.ic.unicamp.br>
 
+       * configure.in (AM_PROG_GCJ): Re-enable, with definition copied
+       from CVS automake.
+
        * libtool.m4 (AM_PROG_GCJ): Quote it so that aclocal won't bring
        it in if it only appears in libtool.m4.
        (AC_PROG_LIBTOOL): Move AC_PROG_CXX, AC_PROG_GCJ and AM_PROG_GCJ

diff --git a/configure.in b/configure.in
index 32f10f423ed492c65bc41f74c3f441261e457712..b59372f6993d3b99f5de64cd7705871152b01719 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -39,7 +39,7 @@ AM_PROG_NM
 AC_SUBST(NM)
 AC_PROG_LN_S
 
-dnl For the `lineno' script (which puts line numbers into `ltconfig').
+# For the `lineno' script (which puts line numbers into `ltconfig').
 AC_PROG_AWK
 
 dnl Check for dlopen support
@@ -59,7 +59,17 @@ popdef([AC_MSG_ERROR])
 AM_CONDITIONAL(HAVE_CXX, [test "x$CXX" != xno])
 
 pushdef([AC_MSG_ERROR], [GCJ=no])
-#AM_PROG_GCJ
+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])
 popdef([AC_MSG_ERROR])
 AM_CONDITIONAL(HAVE_GCJ, [test "x$GCJ" != xno])