Regenerated.

diff --git a/ice-9/aclocal.m4 b/ice-9/aclocal.m4
index 9d95760..9f362ec 100644 (file)
--- a/ice-9/aclocal.m4
+++ b/ice-9/aclocal.m4
@@ -8,9 +8,9 @@ dnl defines the `module' variable.
 AC_DEFUN([AM_INIT_GUILE_MODULE],[
 . $srcdir/../GUILE-VERSION
 AC_REQUIRE([AM_PROG_INSTALL])
-PACKAGE=[$1]
+PACKAGE=$PACKAGE
 AC_SUBST(PACKAGE)
-VERSION=[$2]
+VERSION=$VERSION
 AC_SUBST(VERSION)
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AM_SANITY_CHECK

diff --git a/ice-9/configure b/ice-9/configure
index a28556c..f5918c9 100755 (executable)
--- a/ice-9/configure
+++ b/ice-9/configure
@@ -606,9 +606,9 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 
 . $srcdir/../GUILE-VERSION
 
-PACKAGE=ice-9
+PACKAGE=$PACKAGE
 
-VERSION=
+VERSION=$VERSION
 
 cat >> confdefs.h <<EOF
 #define VERSION "$VERSION"

diff --git a/libguile/aclocal.m4 b/libguile/aclocal.m4
index 3f2610c..3dd5c1e 100644 (file)
--- a/libguile/aclocal.m4
+++ b/libguile/aclocal.m4
@@ -81,9 +81,9 @@ dnl defines the `module' variable.
 AC_DEFUN([AM_INIT_GUILE_MODULE],[
 . $srcdir/../GUILE-VERSION
 AC_REQUIRE([AM_PROG_INSTALL])
-PACKAGE=[$1]
+PACKAGE=$PACKAGE
 AC_SUBST(PACKAGE)
-VERSION=[$2]
+VERSION=$VERSION
 AC_SUBST(VERSION)
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AM_SANITY_CHECK
@@ -187,6 +187,21 @@ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || AC_MSG_ERROR([libtool configure failed])
 ])
 
+dnl From Jim Meyering.
+
+# serial 1
+
+AC_DEFUN(AM_SYS_POSIX_TERMIOS,
+[AC_CACHE_CHECK([POSIX termios], am_cv_sys_posix_termios,
+  [AC_TRY_LINK([#include <sys/types.h>
+#include <unistd.h>
+#include <termios.h>],
+  [/* SunOS 4.0.3 has termios.h but not the library calls.  */
+   tcgetattr(0, 0);],
+  am_cv_sys_posix_termios=yes,
+  am_cv_sys_posix_termios=no)])
+])
+
 dnl
 dnl CY_AC_WITH_THREADS determines which thread library the user intends
 dnl to put underneath guile.  Pass it the path to find the guile top-level

diff --git a/libguile/configure b/libguile/configure
index 65f0ea2..fffdf1e 100755 (executable)
--- a/libguile/configure
+++ b/libguile/configure
@@ -619,9 +619,9 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 
 . $srcdir/../GUILE-VERSION
 
-PACKAGE=libguile
+PACKAGE=$PACKAGE
 
-VERSION=
+VERSION=$VERSION
 
 cat >> confdefs.h <<EOF
 #define VERSION "$VERSION"

diff --git a/qt/aclocal.m4 b/qt/aclocal.m4
index 46e0d3a..451d665 100644 (file)
--- a/qt/aclocal.m4
+++ b/qt/aclocal.m4
@@ -8,9 +8,9 @@ dnl defines the `module' variable.
 AC_DEFUN([AM_INIT_GUILE_MODULE],[
 . $srcdir/../GUILE-VERSION
 AC_REQUIRE([AM_PROG_INSTALL])
-PACKAGE=[$1]
+PACKAGE=$PACKAGE
 AC_SUBST(PACKAGE)
-VERSION=[$2]
+VERSION=$VERSION
 AC_SUBST(VERSION)
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AM_SANITY_CHECK

diff --git a/qt/configure b/qt/configure
index 3c401ad..5369a2c 100755 (executable)
--- a/qt/configure
+++ b/qt/configure
@@ -608,9 +608,9 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 
 . $srcdir/../GUILE-VERSION
 
-PACKAGE=qt
+PACKAGE=$PACKAGE
 
-VERSION=
+VERSION=$VERSION
 
 cat >> confdefs.h <<EOF
 #define VERSION "$VERSION"