From 256ca74949406db57c86dc232110c29f4e1b3b78 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Mon, 10 Jul 2000 04:33:52 +0000 Subject: [PATCH] * 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 hooks here, so that they can be far simpler! --- ChangeLog | 7 ++++++ libtool.m4 | 67 ++++++++++++++++++------------------------------------ 2 files changed, 29 insertions(+), 45 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b9075184..dacaaa02f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2000-07-10 Alexandre Oliva + + * 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 + hooks here, so that they can be far simpler! + 2000-06-17 Syd Polk * libtool.m4 (AC_LIBTOOL_SETUP): Do not generate a libtool based diff --git a/libtool.m4 b/libtool.m4 index 3ed28daeb..87105962d 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -22,7 +22,28 @@ ## the same distribution terms that you use for the rest of that program. # serial 45 AC_PROG_LIBTOOL -AC_DEFUN(AC_PROG_LIBTOOL,[AC_REQUIRE([_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. + 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. + 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 +])])])])]) + AC_DEFUN(_AC_PROG_LIBTOOL, [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl @@ -788,50 +809,6 @@ CFLAGS="$lt_save_CFLAGS" exec 5>>./config.log ]) -# If both AC_PROG_CXX and AC_PROG_LIBTOOL have already been expanded, -# run AC_LIBTOOL_CXX immediately, otherwise, only expand it after the -# latter of them. -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [AC_PROVIDE_IFELSE([AC_PROG_LIBTOOL], - [AC_LIBTOOL_CXX], - [define([AC_PROG_LIBTOOL], - defn([AC_PROG_LIBTOOL])[AC_LIBTOOL_CXX -])])], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[AC_PROVIDE_IFELSE([AC_PROG_LIBTOOL], - [AC_LIBTOOL_CXX], - [define([AC_PROG_LIBTOOL], - defn([AC_PROG_LIBTOOL])[AC_LIBTOOL_CXX -])])])]) - -# If both A[CM]_PROG_CXX and AC_PROG_LIBTOOL have already been -# expanded, run AC_LIBTOOL_GCJ immediately, otherwise, only expand it -# after the latter of them. -AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [AC_PROVIDE_IFELSE([AC_PROG_LIBTOOL], - [AC_LIBTOOL_GCJ], - [define([AC_PROG_LIBTOOL], - defn([AC_PROG_LIBTOOL])[AC_LIBTOOL_GCJ -])])], - [define([AC_PROG_GCJ], - defn([AC_PROG_GCJ])[AC_PROVIDE_IFELSE([AC_PROG_LIBTOOL], - [AC_LIBTOOL_GCJ], - [define([AC_PROG_LIBTOOL], - defn([AC_PROG_LIBTOOL])[AC_LIBTOOL_GCJ -])])])]) -AC_PROVIDE_IFELSE([AM_PROG_GCJ], - [AC_PROVIDE_IFELSE([AC_PROG_LIBTOOL], - [AC_LIBTOOL_GCJ], - [define([AC_PROG_LIBTOOL], - defn([AC_PROG_LIBTOOL])[AC_LIBTOOL_GCJ -])])], - [define([AM_PROG_GCJ], - defn([AM_PROG_GCJ])[AC_PROVIDE_IFELSE([AC_PROG_LIBTOOL], - [AC_LIBTOOL_GCJ], - [define([AC_PROG_LIBTOOL], - defn([AC_PROG_LIBTOOL])[AC_LIBTOOL_GCJ -])])])]) - dnl old names AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl -- 2.47.3