* libtool.m4 (AC_LIBTOOL_GCJ): Require either AC_PROG_GCJ or

AM_PROG_GCJ.
(AC_PROG_LIBTOOL): Change internal comments to dnl, so that they
don't make it to the `configure' script.

diff --git a/ChangeLog b/ChangeLog
index 9924db062b475934993a02f49206900be58512fd..e95f3c8032fa87a81cb21f5c5f023ad548184d24 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2000-07-10  Alexandre Oliva  <aoliva@lsd.ic.unicamp.br>
 
+       * libtool.m4 (AC_LIBTOOL_GCJ): Require either AC_PROG_GCJ or
+       AM_PROG_GCJ.
+       (AC_PROG_LIBTOOL): Change internal comments to dnl, so that they
+       don't make it to the `configure' script.
+
        * configure.in (AM_PROG_GCJ): Re-enable, with definition copied
        from CVS automake.
 

diff --git a/libtool.m4 b/libtool.m4
index 87105962dff3715b983902ef495479949f0b8f9b..8501515cad8e75bdfbd873c92492e1033e3a6e95 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -23,23 +23,23 @@
 
 # serial 45 AC_PROG_LIBTOOL
 AC_DEFUN(AC_PROG_LIBTOOL,[AC_REQUIRE([_AC_PROG_LIBTOOL])
-# If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-# immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
   AC_PROVIDE_IFELSE([AC_PROG_CXX],
     [AC_LIBTOOL_CXX],
     [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
 ])])
-#
-# Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-# If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-# AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+
+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
   AC_PROVIDE_IFELSE([AC_PROG_GCJ],
     [AC_LIBTOOL_GCJ],
     [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
         [AC_LIBTOOL_GCJ],
        [ifdef([AC_PROG_GCJ],
               [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])#
+])])
         ifdef([A][M_PROG_GCJ],
               [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ
 ])])])])])
@@ -785,7 +785,11 @@ exec 5>>./config.log
 AC_DEFUN(AC_LIBTOOL_GCJ,[AC_REQUIRE([_AC_LIBTOOL_GCJ])])
 AC_DEFUN(_AC_LIBTOOL_GCJ,
 [AC_REQUIRE([AC_PROG_LIBTOOL])
-AC_REQUIRE([AC_PROG_GCJ])
+AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
+    [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
+       [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
+         [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])
 LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh"
 lt_save_CC="$CC"
 lt_save_CFLAGS="$CFLAGS"