Regenerated.

libguile/Makefile.in

@@ -37,21 +37,21 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
-host_triplet = @host@
 host_alias = @host_alias@
+host_triplet = @host@
+RANLIB = @RANLIB@
+LIBTOOL = @LIBTOOL@
+AWK = @AWK@
+module = @module@
+LIBLOBJS = @LIBLOBJS@
+CC = @CC@
+PACKAGE = @PACKAGE@
 ERRNO_EXTRACT = @ERRNO_EXTRACT@
 FD_SETTER = @FD_SETTER@
-LIBLOBJS = @LIBLOBJS@
-AWK = @AWK@
-LIBTOOL = @LIBTOOL@
 VERSION = @VERSION@
-module = @module@
-CC = @CC@
-RANLIB = @RANLIB@
-MAINT = @MAINT@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 xtra_PLUGIN_guile_libs = @xtra_PLUGIN_guile_libs@
-PACKAGE = @PACKAGE@
+MAINT = @MAINT@
 
 AUTOMAKE_OPTIONS = foreign
 
@@ -133,7 +133,7 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@
 DATA =  $(modinclude_DATA)
 
-HEADERS =  $(include_HEADERS) $(modinclude_HEADERS)
+HEADERS =  $(modinclude_HEADERS) $(include_HEADERS)
 
 DIST_COMMON =  COPYING ChangeLog Makefile.am Makefile.in acconfig.h \
 acinclude.m4 aclocal.m4 configure configure.in fd.h.in guile-snarf.in \
@@ -297,19 +297,6 @@ uninstall-modincludeDATA:
 	  rm -f $(modincludedir)/$$p; \
 	done
 
-install-includeHEADERS: $(include_HEADERS)
-	$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(includedir)
-	@list="$(include_HEADERS)"; for p in $$list; do \
-	  echo "$(INSTALL_DATA) $(srcdir)/$$p $(includedir)/$$p"; \
-	  $(INSTALL_DATA) $(srcdir)/$$p $(includedir)/$$p; \
-	done
-
-uninstall-includeHEADERS:
-	list="$(include_HEADERS)"; for p in $$list; do \
-	  rm -f $(includedir)/$$p; \
-	done
-
 install-modincludeHEADERS: $(modinclude_HEADERS)
 	$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(modincludedir)
@@ -323,6 +310,19 @@ uninstall-modincludeHEADERS:
 	  rm -f $(modincludedir)/$$p; \
 	done
 
+install-includeHEADERS: $(include_HEADERS)
+	$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(includedir)
+	@list="$(include_HEADERS)"; for p in $$list; do \
+	  echo "$(INSTALL_DATA) $(srcdir)/$$p $(includedir)/$$p"; \
+	  $(INSTALL_DATA) $(srcdir)/$$p $(includedir)/$$p; \
+	done
+
+uninstall-includeHEADERS:
+	list="$(include_HEADERS)"; for p in $$list; do \
+	  rm -f $(includedir)/$$p; \
+	done
+
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES)
@@ -419,21 +419,21 @@ installcheck:
 install-exec: install-libPROGRAMS install-binSCRIPTS
 	$(NORMAL_INSTALL)
 
-install-data: install-modincludeDATA install-includeHEADERS install-modincludeHEADERS
+install-data: install-modincludeDATA install-modincludeHEADERS install-includeHEADERS
 	$(NORMAL_INSTALL)
 
 install: install-exec install-data all
 	@:
 
-uninstall: uninstall-libPROGRAMS uninstall-binSCRIPTS uninstall-modincludeDATA uninstall-includeHEADERS uninstall-modincludeHEADERS
+uninstall: uninstall-libPROGRAMS uninstall-binSCRIPTS uninstall-modincludeDATA uninstall-modincludeHEADERS uninstall-includeHEADERS
 
 all: $(PROGRAMS) $(SCRIPTS) $(DATA) $(HEADERS) Makefile scmconfig.h
 
 install-strip:
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 installdirs:
-	$(mkinstalldirs)  $(libdir) $(bindir) $(modincludedir) $(includedir) \
-		$(modincludedir)
+	$(mkinstalldirs)  $(libdir) $(bindir) $(modincludedir) $(modincludedir) \
+		$(includedir)
 
 
 mostlyclean-generic:
@@ -478,10 +478,10 @@ install-libPROGRAMS mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 clean-libtool maintainer-clean-libtool uninstall-binSCRIPTS \
 install-binSCRIPTS uninstall-modincludeDATA install-modincludeDATA \
-uninstall-includeHEADERS install-includeHEADERS \
-uninstall-modincludeHEADERS install-modincludeHEADERS tags \
-mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
-distdir mostlyclean-depend distclean-depend clean-depend \
+uninstall-modincludeHEADERS install-modincludeHEADERS \
+uninstall-includeHEADERS install-includeHEADERS tags mostlyclean-tags \
+distclean-tags clean-tags maintainer-clean-tags distdir \
+mostlyclean-depend distclean-depend clean-depend \
 maintainer-clean-depend info dvi installcheck install-exec install-data \
 install uninstall all installdirs mostlyclean-generic distclean-generic \
 clean-generic maintainer-clean-generic clean mostlyclean distclean \

libguile/aclocal.m4

@@ -80,31 +80,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)
-AC_CONFIG_AUX_DIR(..)
-module=[$1]
-AC_SUBST(module)])
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version)
-
-AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AM_PROG_INSTALL])
+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])
+AC_PROG_MAKE_SET
+AC_CONFIG_AUX_DIR(..)
+module=[$1]
+AC_SUBST(module)])
 
 
 # serial 1
@@ -158,7 +145,8 @@ AC_DEFUN(AM_MAINTAINER_MODE,
 ]
 )
 
-# serial 1 AM_PROG_LIBTOOL
+
+# serial 4 AM_PROG_LIBTOOL
 AC_DEFUN(AM_PROG_LIBTOOL,
 [AC_REQUIRE([AC_CANONICAL_HOST])
 AC_REQUIRE([AC_PROG_CC])
@@ -178,9 +166,24 @@ libtool_flags="$libtool_shared"
 test "$silent" = yes && libtool_flags="$libtool_flags --silent"
 test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
 
+[case "$host" in
+*-*-irix6*)
+  # For IRIX 6, ld needs -n32 if cc uses it.
+  if echo " $CC $CFLAGS " | egrep -e '[ 	]-n32[	 ]' > /dev/null; then
+    LD="${LD-ld} -n32"
+  fi
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  CFLAGS="$CFLAGS -belf"
+  ;;
+esac]
+
 # Actually configure libtool.  ac_aux_dir is where install-sh is found.
 CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" LD="$LD" RANLIB="$RANLIB" \
-$ac_aux_dir/ltconfig $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || AC_MSG_ERROR([libtool configure failed])
 ])