1.1 --- a/acinclude.m4	Tue Jan 31 19:09:09 2006 +0000
     1.2 +++ b/acinclude.m4	Tue Jan 31 19:40:25 2006 +0000
     1.3 @@ -377,18 +377,40 @@
     1.4  # ---------------
     1.5  AC_DEFUN([AC_PROG_LIBTOOL],
     1.6  [AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
     1.7 -dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
     1.8 -dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
     1.9 +dnl Quote A][M_PROG_CXX so that aclocal doesn't bring it in needlessly.
    1.10 +dnl If either AC_PROG_CXX or A][M_PROG_CXX have already been expanded, run
    1.11 +dnl AC_LIBTOOL_CXX immediately, otherwise, hook it in at the end of both.
    1.12    AC_PROVIDE_IFELSE([AC_PROG_CXX],
    1.13      [AC_LIBTOOL_CXX],
    1.14 -    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
    1.15 -  ])])
    1.16 -dnl And a similar setup for Fortran 77 support
    1.17 +    [AC_PROVIDE_IFELSE([A][M_PROG_CXX],
    1.18 +      [AC_LIBTOOL_CXX],
    1.19 +      [AC_PROVIDE_IFELSE([LT_AC_PROG_CXX],
    1.20 +	[AC_LIBTOOL_CXX],
    1.21 +      [ifdef([AC_PROG_CXX],
    1.22 +	     [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX])])
    1.23 +       ifdef([A][M_PROG_CXX],
    1.24 +	     [define([A][M_PROG_CXX], defn([A][M_PROG_CXX])[AC_LIBTOOL_CXX])])
    1.25 +       ifdef([LT_AC_PROG_CXX],
    1.26 +	     [define([LT_AC_PROG_CXX],
    1.27 +		defn([LT_AC_PROG_CXX])[AC_LIBTOOL_CXX])])])])
    1.28 +  ])
    1.29 +dnl Quote A][M_PROG_F77 so that aclocal doesn't bring it in needlessly.
    1.30 +dnl If either AC_PROG_F77 or A][M_PROG_F77 have already been expanded, run
    1.31 +dnl AC_LIBTOOL_F77 immediately, otherwise, hook it in at the end of both.
    1.32    AC_PROVIDE_IFELSE([AC_PROG_F77],
    1.33      [AC_LIBTOOL_F77],
    1.34 -    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
    1.35 -])])
    1.36 -
    1.37 +    [AC_PROVIDE_IFELSE([A][M_PROG_F77],
    1.38 +      [AC_LIBTOOL_F77],
    1.39 +      [AC_PROVIDE_IFELSE([LT_AC_PROG_F77],
    1.40 +	[AC_LIBTOOL_F77],
    1.41 +      [ifdef([AC_PROG_F77],
    1.42 +	     [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77])])
    1.43 +       ifdef([A][M_PROG_F77],
    1.44 +	     [define([A][M_PROG_F77], defn([A][M_PROG_F77])[AC_LIBTOOL_F77])])
    1.45 +       ifdef([LT_AC_PROG_F77],
    1.46 +	     [define([LT_AC_PROG_F77],
    1.47 +		defn([LT_AC_PROG_F77])[AC_LIBTOOL_F77])])])])
    1.48 +  ])
    1.49  dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
    1.50  dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
    1.51  dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
    1.52 @@ -405,7 +427,8 @@
    1.53         ifdef([LT_AC_PROG_GCJ],
    1.54  	     [define([LT_AC_PROG_GCJ],
    1.55  		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
    1.56 -])])# AC_PROG_LIBTOOL
    1.57 +  ])
    1.58 +])# AC_PROG_LIBTOOL
    1.59  
    1.60  
    1.61  # _AC_PROG_LIBTOOL