diff --git a/configure.in b/configure.in
index b2ca652339344ba32e5fcbc8c7dec2d1d9173b66..d0c4835cbfc34489e7dd94cf2c3da61dc821cd06 100644
--- a/configure.in
+++ b/configure.in
@@ -2,11 +2,11 @@ dnl Process this file with autoconf to produce a configure script.
 dnl This configure.in was derived from the configure.in in the
 dnl GNU regex package, rel 0.11.  Since LysKOM uses that package,
 dnl this configure script must include everything it needs.
-AC_REVISION($Id: configure.in,v 1.3 1993/10/08 18:33:04 linus Exp $)
+AC_REVISION($Id: configure.in,v 1.4 1993/10/10 11:20:23 ceder Exp $)
 AC_INIT(src/server/lyskomd.h)
 AC_PROG_CC
-AC_SUBST(TOPDIR)
-[TOPDIR=`cd $srcdir;pwd`]
+[SRCTOPDIR=`cd $srcdir;pwd`]
+[BUILDTOPDIR=`pwd`]
 dnl
 dnl descend(foo) will define FOO_DESCEND as a Makefile excerpt
 dnl
@@ -22,8 +22,11 @@ $1: [do]$1 \
 ']])dnl
 dnl
 descend(binaries)
+descend(mostlyclean)
 descend(clean)
 descend(distclean)
+descend(realclean)
+descend(pure)
 descend(depend)
 descend(includes)
 descend(libraries)
@@ -32,8 +35,11 @@ dnl
 dnl  Define CLEAN to handle all the "make *clean" rules.
 dnl
 AC_SUBST(CLEAN)
-[CLEAN="$CLEAN_DESCEND\\
-$DISTCLEAN_DESCEND"]
+[CLEAN="$MOSTLYCLEAN_DESCEND\\
+$CLEAN_DESCEND\\
+$DISTCLEAN_DESCEND\\
+$REALCLEAN_DESCEND\\
+$PURE_DESCEND"]
 dnl
 dnl  Enhance "make depend"
 dnl
@@ -55,13 +61,14 @@ AC_PROG_YACC
 AC_PROG_LEX
 AC_STDC_HEADERS
 AC_PROGRAMS_CHECK(SED, /usr/gnu/bin/sed /usr/local/gnu/bin/sed sed)
-AC_HAVE_HEADERS(string.h memory.h)
+AC_HAVE_HEADERS(string.h memory.h sys/param.h sys/time.h)
+AC_TIME_WITH_SYS_TIME
 dnl AC_USG is used by regex, but is obsolete.
 AC_USG
 AC_ALLOCA
 AC_HAVE_LIBRARY(resolv)
 AC_HAVE_LIBRARY(authuser)
-AC_HAVE_FUNCS(difftime getdtablesize)
+AC_HAVE_FUNCS(difftime getdtablesize sysconf getcwd)
 AC_REPLACE_FUNCS(memcpy difftime mktime strerror)
 [DEFS="$DEFS -DBUGGY_INET_NTOA=1 -DHAVE_LOCALE=1 -DENCRYPT_PASSWORDS=1 \
 	-DSERVER=1"]
@@ -74,10 +81,11 @@ $DEPEND_DESCEND\\
 $CLEAN\\
 "]
 AC_SUBST(CFLAGS)
-[CFLAGS="$CFLAGS -I$TOPDIR/include -I$TOPDIR/include/server "]
-[CFLAGS="$CFLAGS -g -O -Wall -ansi -pipe $DEFS" ]
+[CFLAGS="$CFLAGS -I$BUILDTOPDIR/include -I$BUILDTOPDIR/include/server -I. "]
+[CFLAGS="$CFLAGS -g -O -Wall -ansi -pipe \$(DEFS)" ]
 AC_SUBST(STDLYSKOM)
-[STDLYSKOM="SHELL = /bin/sh \\
+[STDLYSKOM="# BEGIN section from @STDLYSKOM@\\
+SHELL = /bin/sh \\
 \\
 AWK = $AWK\\
 CC = $CC\\
@@ -94,24 +102,25 @@ SYMLINK = $LN_S\\
 TOUCHLIB = $RANLIB\\
 YACC = $YACC\\
 \\
-srcdir = $srcdir\\
-VPATH = $srcdir\\
-INCLUDEDIR = $TOPDIR/include\\
-LIBDIR = $TOPDIR/lib\\
+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\\
+exec_prefix = \$(prefix)\\
+bindir = \$(exec_prefix)/bin\\
+dbdir = \$(exec_prefix)/db\\
+etcdir = \$(exec_prefix)/etc\\
+coredir = \$(exec_prefix)/cores\\
 \\
 DEFS = $DEFS\\
 LDFLAGS = $LDFLAGS\\
-SCRIPTDIR = $TOPDIR/scripts\\
+SCRIPTDIR = $SRCTOPDIR/scripts\\
+GENERIC-MOSTLYCLEAN = *.o lib*.a core temp-Makefile temp-?-Makefile\\
+GENERIC-DISTCLEAN = *~ TAGS dependencies Makefile\\
+# END section from @STDLYSKOM@\\
 "]
-[rm -rf $srcdir/include
-mkdir $srcdir/include]
-[mkdir $srcdir/lib]
+[rm -rf $BUILDTOPDIR/include
+mkdir $BUILDTOPDIR/include]
+[mkdir $BUILDTOPDIR/lib]
 AC_OUTPUT(Makefile
 doc/Makefile
 doc/man/Makefile
@@ -126,5 +135,7 @@ 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
 )