Allow empty args in --with and --enable options

diff --git a/ChangeLog b/ChangeLog
index f1d0a6f979b7b1391c6c59667f2c03e654a5ef01..59f06d8ce77107ed76c099e82d5080a28c7c5726 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 28 13:45:16 1995  David J. MacKenzie  <djm@catapult.va.pubnix.com>
+
+       * acgeneral.m4 (AC_ARG_ENABLE, AC_ARG_WITH): Allow an empty value
+         for --enable and --with args.
+
 Tue Jun 27 13:29:54 1995  David J. MacKenzie  <djm@catapult.va.pubnix.com>
 
        * acgeneral.m4 (AC_INIT_PARSE_ARGS, AC_INIT_PREPARE): Add options

diff --git a/NEWS b/NEWS
index 364034f5362eefc8f0a1487f41f7a302f7925665..3eb9fae474e477df5c57aa4c9efdefe8129004d5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 Major changes in release 2.5:
 
-* New configure options --bindir, --libdir, --datadir, etc.
+* New configure options --bindir, --libdir, --datadir, etc., with
+  corresponding output variables.
 * config.log contains the command being run as well as any output from it.
 * AC_CHECK_LIB can check for libraries with "." or "/" in their name.
 * AC_PROG_INSTALL doesn't cache a path to install-sh, for sharing caches.

diff --git a/acgeneral.m4 b/acgeneral.m4
index 82f7e542a1af6d41368f4bca23c17efe43ee7936..4c3505096502ef3da6c26c397d61e08d67a5e161 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -680,18 +680,18 @@ AC_SUBST(exec_prefix)dnl
 AC_SUBST(prefix)dnl
 AC_SUBST(program_transform_name)dnl
 dnl Installation directory options.
-AC_SUBST(bindir)
-AC_SUBST(sbindir)
-AC_SUBST(libexecdir)
-AC_SUBST(datadir)
-AC_SUBST(sysconfdir)
-AC_SUBST(sharedstatedir)
-AC_SUBST(localstatedir)
-AC_SUBST(libdir)
-AC_SUBST(includedir)
-AC_SUBST(oldincludedir)
-AC_SUBST(infodir)
-AC_SUBST(mandir)
+AC_SUBST(bindir)dnl
+AC_SUBST(sbindir)dnl
+AC_SUBST(libexecdir)dnl
+AC_SUBST(datadir)dnl
+AC_SUBST(sysconfdir)dnl
+AC_SUBST(sharedstatedir)dnl
+AC_SUBST(localstatedir)dnl
+AC_SUBST(libdir)dnl
+AC_SUBST(includedir)dnl
+AC_SUBST(oldincludedir)dnl
+AC_SUBST(infodir)dnl
+AC_SUBST(mandir)dnl
 ])
 
 
@@ -705,8 +705,8 @@ ac_help="$ac_help
 [$2]"
 AC_DIVERT_POP()dnl
 [#] Check whether --enable-[$1] or --disable-[$1] was given.
-enableval="[$enable_]patsubst([$1], -, _)"
-if test -n "$enableval"; then
+if test "[${enable_]patsubst([$1], -, _)+set}" = set; then
+  enableval="[$enable_]patsubst([$1], -, _)"
   ifelse([$3], , :, [$3])
 ifelse([$4], , , [else
   $4
@@ -730,8 +730,8 @@ ac_help="$ac_help
 [$2]"
 AC_DIVERT_POP()dnl
 [#] Check whether --with-[$1] or --without-[$1] was given.
-withval="[$with_]patsubst([$1], -, _)"
-if test -n "$withval"; then
+if test "[${with_]patsubst([$1], -, _)+set}" = set; then
+  withval="[$with_]patsubst([$1], -, _)"
   ifelse([$3], , :, [$3])
 ifelse([$4], , , [else
   $4

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 82f7e542a1af6d41368f4bca23c17efe43ee7936..4c3505096502ef3da6c26c397d61e08d67a5e161 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -680,18 +680,18 @@ AC_SUBST(exec_prefix)dnl
 AC_SUBST(prefix)dnl
 AC_SUBST(program_transform_name)dnl
 dnl Installation directory options.
-AC_SUBST(bindir)
-AC_SUBST(sbindir)
-AC_SUBST(libexecdir)
-AC_SUBST(datadir)
-AC_SUBST(sysconfdir)
-AC_SUBST(sharedstatedir)
-AC_SUBST(localstatedir)
-AC_SUBST(libdir)
-AC_SUBST(includedir)
-AC_SUBST(oldincludedir)
-AC_SUBST(infodir)
-AC_SUBST(mandir)
+AC_SUBST(bindir)dnl
+AC_SUBST(sbindir)dnl
+AC_SUBST(libexecdir)dnl
+AC_SUBST(datadir)dnl
+AC_SUBST(sysconfdir)dnl
+AC_SUBST(sharedstatedir)dnl
+AC_SUBST(localstatedir)dnl
+AC_SUBST(libdir)dnl
+AC_SUBST(includedir)dnl
+AC_SUBST(oldincludedir)dnl
+AC_SUBST(infodir)dnl
+AC_SUBST(mandir)dnl
 ])
 
 
@@ -705,8 +705,8 @@ ac_help="$ac_help
 [$2]"
 AC_DIVERT_POP()dnl
 [#] Check whether --enable-[$1] or --disable-[$1] was given.
-enableval="[$enable_]patsubst([$1], -, _)"
-if test -n "$enableval"; then
+if test "[${enable_]patsubst([$1], -, _)+set}" = set; then
+  enableval="[$enable_]patsubst([$1], -, _)"
   ifelse([$3], , :, [$3])
 ifelse([$4], , , [else
   $4
@@ -730,8 +730,8 @@ ac_help="$ac_help
 [$2]"
 AC_DIVERT_POP()dnl
 [#] Check whether --with-[$1] or --without-[$1] was given.
-withval="[$with_]patsubst([$1], -, _)"
-if test -n "$withval"; then
+if test "[${with_]patsubst([$1], -, _)+set}" = set; then
+  withval="[$with_]patsubst([$1], -, _)"
   ifelse([$3], , :, [$3])
 ifelse([$4], , , [else
   $4