Changes to use automake-generated Makefile.ins everywhere

libguile/ChangeLog

@@ -1,3 +1,12 @@
+Sun Dec  1 00:00:49 1996  Tom Tromey  <tromey@cygnus.com>
+
+	* guile-snarf.sh: Removed.
+	* PLUGIN/guile.libs: Added dependency for -lm.
+	* acinclude.m4: Renamed from aclocal.m4.
+	* PLUGIN/greet: Removed.
+	* Makefile.am, aclocal.m4: New files.
+	* configure.in: Updated for Automake.
+
 Thu Nov 28 00:23:55 1996  Marius Vollmer  <mvo@zagadka.ping.de>
 
 	* eval.c (scm_definedp): Use top_level_lookup_closure_var

libguile/Makefile.am

@@ -0,0 +1,56 @@
+## Process this file with Automake to create Makefile.in
+
+AUTOMAKE_OPTIONS = foreign
+
+## Check for headers in $(srcdir)/.., so that #include
+## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
+## building.
+INCLUDES = -I.. -I$(srcdir)/..
+
+lib_LIBRARIES = libguile.a
+libguile_a_SOURCES = alist.c append.c appinit.c arbiters.c async.c \
+backtrace.c boolean.c chars.c continuations.c debug.c dynwind.c eq.c \
+error.c eval.c extchrs.c fdsocket.c feature.c filesys.c fports.c gc.c \
+gdbint.c genio.c gsubr.c hash.c hashtab.c inet_aton.c init.c ioext.c \
+kw.c list.c load.c mallocs.c markers.c mbstrings.c numbers.c objprop.c \
+options.c pairs.c ports.c posix.c print.c procprop.c procs.c ramap.c \
+read.c root.c scmsigs.c sequences.c simpos.c smob.c socket.c srcprop.c \
+stackchk.c stacks.c stime.c strerror.c strings.c strop.c strorder.c \
+strports.c struct.c symbols.c tag.c throw.c unif.c variable.c \
+vectors.c version.c vports.c weaks.c _scm.h
+
+include_HEADERS = libguile.h
+
+# These are headers visible as <libguile/mumble.h>.
+modincludedir = $(includedir)/@module@
+modinclude_HEADERS = __scm.h alist.h append.h arbiters.h async.h \
+backtrace.h boolean.h chars.h continuations.h debug.h dynwind.h eq.h \
+error.h eval.h extchrs.h fdsocket.h feature.h filesys.h fports.h gc.h \
+gdb_interface.h gdbint.h genio.h gsubr.h hash.h hashtab.h init.h ioext.h \
+kw.h list.h load.h mallocs.h markers.h mbstrings.h numbers.h objprop.h \
+options.h pairs.h ports.h posix.h print.h procprop.h procs.h ramap.h read.h \
+root.h scmhob.h scmsigs.h sequences.h simpos.h smob.h socket.h srcprop.h \
+stackchk.h stacks.h stime.h strings.h strop.h strorder.h strports.h struct.h \
+symbols.h tag.h tags.h throw.h unif.h variable.h vectors.h version.h \
+vports.h weaks.h snarf.h
+
+## This file is generated at configure time.
+modinclude_DATA = scmconfig.h
+
+EXTRA_DIST = gscm.c gscm.h ChangeLog-scm PLUGIN/REQ PLUGIN/guile.config \
+PLUGIN/guile.libs
+
+## FIXME: shouldn't directly generate file; instead generate temp file
+## and "mv".  Consider using timestamp file as well, to avoid
+## unnecessary rebuilds.
+libpath.h: Makefile
+	echo '/* generated by Makefile */' > libpath.h
+	echo '#define LIBRARY_PATH "$(pkgdatadir)/$(VERSION)"' >> libpath.h
+
+SUFFIXES = .x
+.c.x:
+	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) \
+	   -DSCM_MAGIC_SNARFER $< | grep "^%%%" | sed -e "s/^%%%//" > $@
+
+## Add -MG to make the .x magic work with auto-dep code.
+MKDEP = gcc -M -MG $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)

libguile/acconfig.h

@@ -73,3 +73,6 @@
 
 /* Define if using any sort of threads.  */
 #undef USE_THREADS
+
+/* Name of this package.  */
+#undef PACKAGE

libguile/aclocal.m4

@@ -1,3 +1,5 @@
+dnl aclocal.m4 generated automatically by aclocal 1.1i
+
 dnl  On the NeXT, #including <utime.h> doesn't give you a definition for
 dnl  struct utime, unless you #define _POSIX_SOURCE.
 
@@ -57,3 +59,182 @@ AC_DEFUN([GUILE_HEADER_LIBC_WITH_UNISTD],
     fi
   ]
 )
+
+# Like AC_CONFIG_HEADER, but automatically create stamp file.
+
+AC_DEFUN(AM_CONFIG_HEADER,
+[AC_PREREQ([2.12])
+AC_CONFIG_HEADER([$1])
+dnl When config.status generates a header, we must update the stamp-h file.
+dnl This file resides in the same directory as the config header
+dnl that is generated.  We must strip everything past the first ":",
+dnl and everything past the last "/".
+AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
+test -z "<<$>>CONFIG_HEADER" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl
+changequote([,]))])
+
+
+dnl Usage: AM_INIT_GUILE_MODULE(module-name)
+dnl This macro will automatically get the guile version from the
+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])
+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])
+
+
+# serial 1
+
+AC_DEFUN(AM_PROG_INSTALL,
+[AC_REQUIRE([AC_PROG_INSTALL])
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+AC_SUBST(INSTALL_SCRIPT)dnl
+])
+
+#
+# Check to make sure that the build environment is sane.
+#
+
+AC_DEFUN(AM_SANITY_CHECK,
+[AC_MSG_CHECKING([whether build environment is sane])
+echo timestamp > conftestfile
+# Do this in a subshell so we don't clobber the current shell's
+# arguments.  FIXME: maybe try `-L' hack like GETLOADAVG test?
+if (set X `ls -t $srcdir/configure conftestfile`; test "[$]2" = conftestfile)
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+rm -f conftest*
+AC_MSG_RESULT(yes)])
+
+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
+dnl source directory.  Eg CY_AC_WITH_THREADS(../..) for tcl/unix.
+dnl
+
+AC_DEFUN([CY_AC_WITH_THREADS],[
+AC_CACHE_CHECK("threads package type",cy_cv_threads_package,[
+AC_CACHE_VAL(cy_cv_threads_cflags,[
+AC_CACHE_VAL(cy_cv_threads_libs,[
+use_threads=no;
+AC_ARG_WITH(threads,[  --with-threads          thread interface],
+            use_threads=$withval, use_threads=no)
+test -n "$use_threads" || use_threads=qt
+threads_package=unknown
+if test "$use_threads" != no; then
+dnl
+dnl Test for the qt threads package - used for cooperative threads
+dnl This may not necessarily be built yet - so just check for the
+dnl header files.
+dnl
+  if test "$use_threads" = yes || test "$use_threads" = qt; then
+     # Look for qt in source directory.  This is a hack: we look in
+     # "./qt" because this check might be run at the top level.
+     if test -f $srcdir/../qt/qt.c || test -f $srcdir/qt/qt.c; then
+	threads_package=COOP
+	cy_cv_threads_cflags="-I$srcdir/../qt -I../qt"
+	cy_cv_threads_libs="../threads/libthreads.a ../qt/libqt.a"
+     fi
+  else
+     if test -f $use_threads/qt.c; then
+	# FIXME seems as though we should try to use an installed qt here.
+	threads_package=COOP
+	cy_cv_threads_cflags="-I$use_threads -I../qt"
+	cy_cv_threads_libs="../threads/libthreads.a ../qt/libqt.a"
+     fi
+  fi
+  if test "$use_threads" = pthreads; then
+     # Look for pthreads in srcdir.  See above to understand why
+     # we always set threads_package.
+     if test -f $srcdir/../../pthreads/pthreads/queue.c \
+	  || test -f $srcdir/../pthreads/pthreads/queue.c; then
+	threads_package=MIT
+	cy_cv_threads_cflags="-I$srcdir/../../pthreads/include"
+	cy_cv_threads_libs="-L../../pthreads/lib -lpthread"
+     fi
+  fi
+  saved_CPP="$CPPFLAGS"
+  saved_LD="$LDFLAGS"
+  saved_LIBS="$LIBS"
+  if test "$threads_package" = unknown; then
+dnl
+dnl Test for the FSU threads package
+dnl
+    CPPFLAGS="-I$use_threads/include"
+    LDFLAGS="-L$use_threads/lib"
+    LIBS="-lgthreads -lmalloc"
+    AC_TRY_LINK([#include <pthread.h>],[
+pthread_equal(NULL,NULL);
+], threads_package=FSU)
+  fi
+  if test "$threads_package" = unknown; then
+dnl
+dnl Test for the MIT threads package
+dnl
+    LIBS="-lpthread"
+    AC_TRY_LINK([#include <pthread.h>],[
+pthread_equal(NULL,NULL);
+], threads_package=MIT)
+  fi
+  if test "$threads_package" = unknown; then
+dnl
+dnl Test for the PCthreads package
+dnl
+    LIBS="-lpthreads"
+    AC_TRY_LINK([#include <pthread.h>],[
+pthread_equal(NULL,NULL);
+], threads_package=PCthreads)
+  fi
+dnl
+dnl Set the appropriate flags!
+dnl 
+  cy_cv_threads_cflags="$CPPFLAGS $cy_cv_threads_cflags"
+  cy_cv_threads_libs="$LDFLAGS $LIBS $cy_cv_threads_libs"
+  cy_cv_threads_package=$threads_package
+  CPPFLAGS="$saved_CPP"
+  LDFLAGS="$saved_LD"
+  LIBS="$saved_LIBS"
+  if test "$threads_package" = unknown; then
+    AC_MSG_ERROR("cannot find thread library installation")
+  fi
+fi
+])
+])
+],
+dnl
+dnl Set flags according to what is cached.
+dnl
+CPPFLAGS="$cy_cv_threads_cflags"
+LIBS="$cy_cv_threads_libs"
+)
+])
+

libguile/configure.in

@@ -1,7 +1,6 @@
 AC_INIT(eval.c)
-AC_CONFIG_HEADER(scmconfig.h)
-
-. $srcdir/../GUILE-VERSION
+AM_CONFIG_HEADER(scmconfig.h)
+AM_INIT_GUILE_MODULE(libguile)
 
 #--------------------------------------------------------------------
 #
@@ -19,9 +18,6 @@ fi
 
 #--------------------------------------------------------------------
 
-test -z "$CFLAGS" && CFLAGS=-g
-test -z "$LDFLAGS" && LDFLAGS=-g
-
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_RANLIB
@@ -30,9 +26,7 @@ AC_AIX
 AC_ISC_POSIX
 AC_MINIX
 
-builtin(sinclude, ../aclocal.m4)
 CY_AC_WITH_THREADS
-CFLAGS="$CPPFLAGS $CFLAGS"
 
 AC_C_CONST
 
@@ -203,14 +197,7 @@ AC_DEFINE_UNQUOTED(GUILE_MAJOR_VERSION, "$GUILE_MAJOR_VERSION")
 AC_DEFINE_UNQUOTED(GUILE_MINOR_VERSION, "$GUILE_MINOR_VERSION")
 AC_DEFINE_UNQUOTED(GUILE_VERSION, "$GUILE_VERSION")
 
-AC_SUBST(CFLAGS)
-AC_SUBST(LDFLAGS)
-AC_SUBST(LIBOBJS)
 AC_SUBST(FD_SETTER)
-AC_SUBST(XINCLUDES)
-AC_SUBST(GUILE_MAJOR_VERSION)
-AC_SUBST(GUILE_MINOR_VERSION)
-AC_SUBST(GUILE_VERSION)
 AC_OUTPUT(Makefile fd.h)
 
 dnl Local Variables:

libguile/scmconfig.h.in

@@ -127,6 +127,9 @@
 /* Define if using any sort of threads.  */
 #undef USE_THREADS
 
+/* Name of this package.  */
+#undef PACKAGE
+
 /* Define if you have the ctermid function.  */
 #undef HAVE_CTERMID
 
@@ -139,6 +142,9 @@
 /* Define if you have the geteuid function.  */
 #undef HAVE_GETEUID
 
+/* Define if you have the inet_aton function.  */
+#undef HAVE_INET_ATON
+
 /* Define if you have the lstat function.  */
 #undef HAVE_LSTAT
 
@@ -181,6 +187,9 @@
 /* Define if you have the setsid function.  */
 #undef HAVE_SETSID
 
+/* Define if you have the strerror function.  */
+#undef HAVE_STRERROR
+
 /* Define if you have the strftime function.  */
 #undef HAVE_STRFTIME