summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Djurfeldt <djurfeldt@nada.kth.se>1997-03-15 01:07:38 +0000
committerMikael Djurfeldt <djurfeldt@nada.kth.se>1997-03-15 01:07:38 +0000
commit3b0d0eb8ed95f5a05d9567a82e5d3d0c7ab31294 (patch)
tree6da55c5be8cf1dfd52912b6628c2366aaaf6824f
parentdfa84eae7b007d95dbbcd1f4b206b7d4ae00192b (diff)
downloadguile-3b0d0eb8ed95f5a05d9567a82e5d3d0c7ab31294.tar.gz
* 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.
-rw-r--r--ChangeLog7
-rw-r--r--guile.m413
2 files changed, 19 insertions, 1 deletions
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 <mdj@mdj.nada.kth.se>
+
+ * 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 <mdj@mdj.nada.kth.se>
* 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)])