(INCLUDE_CURRENT): Was formerly include_current.

(SRCTOPDIR, BUILDTOPDIR, INCLUDE_CURRENT): AC_SUBST them.
(descend, @CLEAN@, GENERIC-MOSTLYCLEAN, GENERIC-DISTCLEAN,
	*_DESCEND, @CFLAGS@, @STDLYSKOM@ and others): Removed. The
	functionality is now in mkmi.m4.
(AC_OUTPUT): Don't generate src/libraries/regex/{doc,test}/Makefile.

configure.in

-dnl $Id: configure.in,v 1.13 1994/02/24 11:47:01 ceder Exp $
+dnl $Id: configure.in,v 1.14 1994/03/03 00:53:56 ceder Exp $
 dnl Configuration for LysKOM
-AC_REVISION($Revision: 1.13 $)
+AC_REVISION($Revision: 1.14 $)
 AC_INIT(src/server/lyskomd.h)
 AC_PROG_CC
 AC_SUBST(CFLAGS)
 AC_SUBST(DEPENDFLAG)
-include_current=-I.
+AC_SUBST(INCLUDE_CURRENT)
+INCLUDE_CURRENT=-I.
 [if test -n "$GCC"; then
 	test -n "$verbose" && echo adding -g -O -ansi -Wall -pipe
 	CFLAGS="$CFLAGS -g -O -Wall -ansi -pipe"
@@ -15,7 +16,7 @@ else
 	CFLAGS="$CFLAGS -g"
 	case "$CC" in
 		*vcc) DEPENDFLAG=-Em
-			include_current='-I`pwd`';;
+			INCLUDE_CURRENT='-I`pwd`';;
 		*) DEPENDFLAG=-M;;
 	esac
 fi
@@ -38,51 +39,10 @@ AC_COMPILE_CHECK([_HPUX_SOURCE to fix problems], dnl
 [struct sockaddr foo;], dnl
 AC_DEFINE(_HPUX_SOURCE), dnl
 [test -n "$verbose" && echo '	'Problem remains])])dnl
+AC_SUBST(SRCTOPDIR)
 [SRCTOPDIR=`cd $srcdir;pwd`]
+AC_SUBST(BUILDTOPDIR)
 [BUILDTOPDIR=`pwd`]
-dnl
-dnl descend(foo) will define FOO_DESCEND as a Makefile excerpt
-dnl
-define([descend], [AC_SUBST(translit($1, [a-z], [A-Z])[_DESCEND])
-translit($1, [a-z], [A-Z])[_DESCEND='.PHONY: ]$1 \
-$1: [do]$1 \
-	[for i in DuMmY $(SUBDIRS); do \\\
-		if test -d $$i ; then \\\
-			echo making] $1 [in directory $$i; \\\
-			(cd $$i; $(MAKE) ] $1 [)\\\
-		fi; \\\
-	done\
-']])dnl
-dnl
-descend(binaries)
-descend(mostlyclean)
-descend(clean)
-descend(distclean)
-descend(realclean)
-descend(pure)
-descend(depend)
-descend(includes)
-descend(libraries)
-descend(install)
-dnl
-dnl  Define CLEAN to handle all the "make *clean" rules.
-dnl
-AC_SUBST(CLEAN)
-[CLEAN="$MOSTLYCLEAN_DESCEND\\
-$CLEAN_DESCEND\\
-$DISTCLEAN_DESCEND\\
-$REALCLEAN_DESCEND\\
-$PURE_DESCEND\\
-GENERIC-MOSTLYCLEAN = *.o lib*.a core temp-Makefile temp-?-Makefile\\
-GENERIC-DISTCLEAN = *~ .\\\\#* TAGS dependencies Makefile"]
-dnl
-dnl  Enhance "make depend"
-dnl
-[DEPEND_DESCEND="dependencies:\\
-	touch dependencies\\
-\\
-$DEPEND_DESCEND\\
-"]
 AC_PROG_INSTALL
 AC_PROG_RANLIB
 AC_PROG_AWK
@@ -102,56 +62,6 @@ AC_HAVE_LIBRARY(i) dnl For setlocale() on Ultrix.
 AC_HAVE_FUNCS(difftime getdtablesize sysconf getcwd vfprintf)
 AC_REPLACE_FUNCS(memcpy difftime strerror remove strchr memset memchr)
 [DEFS="$DEFS -DBUGGY_INET_NTOA=1 -DENCRYPT_PASSWORDS=1 -DSERVER=1"]
-AC_SUBST(ALL_DESCEND)
-[ALL_DESCEND="$INCLUDES_DESCEND\\
-$LIBRARIES_DESCEND\\
-$BINARIES_DESCEND\\
-$INSTALL_DESCEND\\
-$DEPEND_DESCEND\\
-$CLEAN\\
-"]
-[CFLAGS="$CFLAGS $include_current -I\$(srcdir)"]
-[CFLAGS="$CFLAGS -I$BUILDTOPDIR/include -I$BUILDTOPDIR/include/server"]
-[CFLAGS="$CFLAGS -I/usr/local/include"]
-dnl Adding DEFS to CFLAGS must be the last thing done to CFLAGS,
-dnl since it breaks the compile tests generated by autoconf.
-dnl +++This probably violates the GNU Coding Standards as well,
-dnl and should be fixed before the upcoming release.
-[CFLAGS="$CFLAGS \$(DEFS)" ]
-AC_SUBST(STDLYSKOM)
-[STDLYSKOM="# BEGIN section from @STDLYSKOM@\\
-SHELL = /bin/sh \\
-\\
-AWK = $AWK\\
-CC = $CC\\
-CFLAGS = $CFLAGS\\
-DEPENDFLAG = $DEPENDFLAG\\
-INSTALL = $INSTALL\\
-INSTALL_DATA = $INSTALL_DATA\\
-INSTALL_PROGRAM = $INSTALL_PROGRAM\\
-LEX = $LEX\\
-MKDIR = mkdir\\
-RANLIB = $RANLIB\\
-RM = rm -f\\
-SED = $SED\\
-SYMLINK = $LN_S\\
-TOUCHLIB = $RANLIB\\
-YACC = $YACC\\
-\\
-INCLUDEDIR = $BUILDTOPDIR/include\\
-LIBDIR = $BUILDTOPDIR/lib\\
-prefix = /usr/lyskom\\
-exec_prefix = \$(prefix)\\
-bindir = \$(exec_prefix)/bin\\
-dbdir = \$(exec_prefix)/db\\
-etcdir = \$(exec_prefix)/etc\\
-coredir = \$(exec_prefix)/cores\\
-\\
-DEFS = $DEFS\\
-LDFLAGS = $LDFLAGS\\
-SCRIPTDIR = $SRCTOPDIR/scripts\\
-# END section from @STDLYSKOM@\\
-"]
 AC_OUTPUT(Makefile
 doc/Makefile
 doc/man/Makefile
@@ -166,6 +76,4 @@ src/libraries/libisc-new/Makefile
 src/libraries/libisc-new/src/Makefile
 src/libraries/libmisc/Makefile
 src/libraries/regex/Makefile
-src/libraries/regex/doc/Makefile
-src/libraries/regex/test/Makefile
 src/server/Makefile)