From 0daf42dd5347ff31d41df0e41c1f20f12baa026a Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Wed, 26 Jul 2000 19:56:32 +0000 Subject: [PATCH] * configure.in (AM_PROG_GCJ): Moved definition... * libtool.m4: ... here. --- ChangeLog | 3 +++ configure.in | 12 +----------- libtool.m4 | 11 +++++++++++ 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 15e761309..8b5113192 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2000-07-26 Alexandre Oliva + * 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 b59372f69..df2eb6865 100644 --- 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 05c56ccba..6468495e2 100644 --- 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) +])]) -- 2.47.3