From b8d96d831bbf49adf36606cb5eda0ec2d43c95ed Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Mon, 10 Jul 2000 05:28:31 +0000 Subject: [PATCH] * configure.in (AM_PROG_GCJ): Re-enable, with definition copied from CVS automake. --- ChangeLog | 3 +++ configure.in | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index dacaaa02f..9924db062 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2000-07-10 Alexandre Oliva + * 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 32f10f423..b59372f69 100644 --- 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]) -- 2.47.3