Make it possible to not build dselect

diff --git a/ChangeLog b/ChangeLog
index 8a0ce9171ea5b1b8fc09ee1a74f998a0cee4742b..e8dde0fb87a18ffb5dd8ba8b530170959515f295 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 15 00:18:30 CET 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Add option to disable building dselect
+  * Add config.sub and config.guess
+
 Tue Dec 14 20:08:58 CET 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * automake/sysconf.m4: really add the file this time

diff --git a/Makefile.in b/Makefile.in
index 9ab4c17f2d3923bca3d8262ac169545bc969e11b..d496a2a13280a7b53f14bf83ee31d1ce07ee61fe 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,7 +9,7 @@ GENFILES        = version.h
 include Makefile.conf
 
 SUBDIRS                = include lib dpkg-deb split scripts utils main \
-                 utils doc dselect po methods
+                 utils doc @DSELECTDIR@ po methods
 
 all: version.h all-recursive
 

diff --git a/configure.in b/configure.in
index cd2713c8a7a2f0a2839972631af34601fcfa888c..64033abdb8cf5846f89b1f54832d369db25097dd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,15 +4,21 @@ AC_PREREQ([2.12])
 
 AC_INIT(include/dpkg.h.in)
 AC_CONFIG_HEADER(config.h)
-
+DSELECTDIR="dselect"
+AC_ARG_WITH(dselect,
+[  --with-dselect          the dselect package-management frontend],
+[case "$withval" in
+  "false" | "no" )
+    DSELECTDIR=""
+    ;;
+ esac])
+AC_SUBST(DSELECTDIR)
 
 AC_CHECK_TOOL_PREFIX
+AC_CANONICAL_SYSTEM
 
 AC_CHECK_TOOL(CC, gcc)
 AC_PROG_CC
-AC_CANONICAL_SYSTEM
-AC_CHECK_TOOL_PREFIX
-
 AC_PROG_CXX
 AM_CONDITIONAL(HAVE_CPLUSPLUS, [test "$CXX" != ""])