diff --git a/ChangeLog b/ChangeLog index 40ea0b86e..002703755 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sat Mar 15 01:11:44 1997 Mikael Djurfeldt + + * guile.m4 (AM_INIT_GUILE_MODULE): Replaced AM_INIT_AUTOMAKE macro + with its definition and commented out definition of PACKAGE. This + changed seemed necessary after having removed PACKAGE from + libguile/acconfig.h. + Mon Feb 24 21:43:26 1997 Mikael Djurfeldt * ltconfig, ltmain.sh: New versions from libtool-0.9. diff --git a/guile.m4 b/guile.m4 index 58ee47661..10ff57ea3 100644 --- a/guile.m4 +++ b/guile.m4 @@ -7,7 +7,18 @@ dnl top-level srcdir, and will initialize automake. It also dnl defines the `module' variable. AC_DEFUN([AM_INIT_GUILE_MODULE],[ . $srcdir/../GUILE-VERSION -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) +## Beginning of AM_INIT_AUTOMAKE macro +AC_REQUIRE([AM_PROG_INSTALL]) +PACKAGE=[$1] +AC_SUBST(PACKAGE) +## AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") +VERSION=[$2] +AC_SUBST(VERSION) +AC_DEFINE_UNQUOTED(VERSION, "$VERSION") +AM_SANITY_CHECK +AC_ARG_PROGRAM +AC_PROG_MAKE_SET +## End of AM_INIT_AUTOMAKE macro AC_CONFIG_AUX_DIR(..) module=[$1] AC_SUBST(module)])