* configure.in: generate utils/Makefile

  * utils/configure.in: removed so top level configure will take over this
    subdir

diff --git a/ChangeLog b/ChangeLog
index 45ce2b5aec1f90e31de931e27ee21bfe69f9af7e..f73d54f84b294acf41a16b86dc1dd45dbd4c2858 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Nov 26 18:09:17 EST 1999 Ben Collins <bcollins@debian.org>
+
+  * configure.in: generate utils/Makefile
+  * utils/configure.in: removed so top level configure will take over this
+    subdir
+
 Fri Nov 26 02:21:56 CET 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * Fix .so-entries for script manpages

diff --git a/autogen.sh b/autogen.sh
index c874bc00d9106fcf12b05efec486cbc6ec837884..279a37ef2a298546689634a3a21d09c02e359d37 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,13 +8,3 @@ gettextize $copy -f
 libtoolize --force $copy
 autoheader
 autoconf
-
-# Utils has it's own configure, so we need to repeat this there
-cd utils
-aclocal -I ../automake
-autoheader
-autoconf -l ../
-
-# Return to the previous directory
-cd ..
-

diff --git a/configure.in b/configure.in
index e17389761cda394354458b98d6e79ff46f649c47..0ac543c66d1a8c568fa5b0d69e1d1a3598773a8a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -156,8 +156,6 @@ LOCALSTATEDIR=`eval echo $localstatedir`
 AC_DEFINE_UNQUOTED(LLIBDIR, "$LLIBDIR")
 AC_DEFINE_UNQUOTED(LOCALSTATEDIR, "$LOCALSTATEDIR")
 
-AC_CONFIG_SUBDIRS(utils)
-
 AC_OUTPUT(
 Makefile.conf
 Makefile
@@ -172,4 +170,5 @@ scripts/Makefile
 main/Makefile
 dselect/Makefile
 methods/Makefile
+utils/Makefile
 po/Makefile.in)

diff --git a/utils/configure.in b/utils/configure.in
deleted file mode 100644 (file)
index 0b9e6d7..0000000
--- a/utils/configure.in
+++ /dev/null
@@ -1,23 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ([2.12])
-
-AC_INIT(start-stop-daemon.c)
-
-AC_CHECK_TOOL(CC, gcc)
-AC_PROG_CC
-AC_CANONICAL_SYSTEM
-AC_CHECK_TOOL_PREFIX
-
-AM_INIT_AUTOMAKE(start-stop-daemon,[`cat ${srcdir}/../version-nr`])
-
-AC_PREFIX_DEFAULT(/)
-
-AC_PROG_INSTALL
-
-AC_CHECK_HEADERS(error.h hurd.h ps.h hurd/ihash.h)
-
-AC_CHECK_LIB(shouldbeinlibc, fmt_past_time)
-AC_CHECK_LIB(ps, proc_stat_list_pid_proc_stat)
-
-AC_OUTPUT(Makefile)