* read.c (scm_read_hash_extend): make scm_read_hash_procedures a

[bpt/guile.git] / configure.in

diff --git a/configure.in b/configure.in
dissimilarity index 72%
index 5070442..715a6b6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,66 +1,28 @@
-AC_INIT(Makefile.in)
-
-. $srcdir/GUILE-VERSION
-
-all_subdirs=`cat $srcdir/*/PLUGIN/REQ $srcdir/*/PLUGIN/OPT /dev/null | tsort | xargs echo`
-req_subdirs=`cat $srcdir/*/PLUGIN/REQ /dev/null | tsort | xargs echo`
-opt_subdirs=`cat $srcdir/*/PLUGIN/OPT /dev/null | tsort | xargs echo`
-
-AC_PROG_CC
-
-### Use gtcltk-lib only if we seem to have Tcl installed on the
-### system.  This way of doing this doesn't really fit into the PLUGIN
-### approach, but I'm not sure how to do it more gracefully within
-### that approach.
-AC_CHECK_LIB(tcl7.5, Tcl_CreateInterp, have_tcl=true, have_tcl=false, -lm)
-if $have_tcl; then :; else
-  all_subdirs="`echo $all_subdirs | sed s:gtcltk-lib::`"
-  req_subdirs="`echo $req_subdirs | sed s:gtcltk-lib::`"
-fi  
-
-AC_CONFIG_SUBDIRS($all_subdirs)
-existingdirs=
-for d in $all_subdirs; do
-  if test -d $srcdir/$d ; then
-    existingdirs="$existingdirs $d"
-    if test "x$verbose" = xyes; then
-       if test -f $srcdir/$d/PLUGIN/greet ; then
-         cat $srcdir/$d/PLUGIN/greet
-       else
-        echo ===
-        echo === Configuring plug-in component $d
-        echo ===
-       fi
-    fi
-  fi
-done
-
-for d in $req_subdirs; do
-  if test ! -d $srcdir/$d ; then
-    echo "*******"
-    echo "*******"
-    echo "**\+/**"
-    echo "**=*=**" ERROR: Missing required package: $d
-    echo "**/+\**"
-    echo "*******"
-    echo "*******"
-    exit 1
-  fi
-done
-
-if test "x$verbose" = xyes; then
-  for d in $opt_subdirs; do
-    if test ! -d $srcdir/$d ; then
-      echo "*****"
-      echo "*===*"
-      echo "*=*=*" WARNING: Missing suggested package: $d
-      echo "*===*"
-      echo "*****"
-    fi
-  done
-fi
-
-
-AC_SUBST(existingdirs)
-AC_SUBST(GUILE_VERSION)
-AC_OUTPUT(Makefile doc/Makefile)
+dnl Process this file with autoconf to produce configure.
+AC_INIT(Makefile.in)
+. $srcdir/GUILE-VERSION
+AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AM_MAINTAINER_MODE
+
+dnl FIXME: tsort, xargs not GNU standard.
+all_subdirs=`cat $srcdir/*/PLUGIN/REQ $srcdir/*/PLUGIN/OPT /dev/null | tsort | xargs echo`
+req_subdirs=`cat $srcdir/*/PLUGIN/REQ /dev/null | tsort | xargs echo`
+opt_subdirs=`cat $srcdir/*/PLUGIN/OPT /dev/null | tsort | xargs echo`
+
+AC_CONFIG_SUBDIRS($all_subdirs)
+for d in $all_subdirs; do
+  if test -d $srcdir/$d ; then
+    existingdirs="$existingdirs $d"
+    test -n "$silent" || echo Configuring plug-in component $d
+  fi
+done
+
+for d in $req_subdirs; do
+  test -d $srcdir/$d || {
+     echo ERROR: Missing required package: $d 1>&2
+     exit 1
+  }
+done
+
+AC_SUBST(existingdirs)
+AC_OUTPUT(Makefile doc/Makefile doc/guile-programmer/Makefile doc/guile-user/Makefile newdoc/Makefile newdoc/ref/Makefile newdoc/tutorial/Makefile)