configure.ac: convert all help strings to use AS_HELP_STRING

Some help strings were using the deprecated AC_HELP_STRING, and others
were completely hard-coded.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

3 files changed, 81 insertions, 75 deletions

diff --git a/configure b/configure
index 6b8b7f4b5..2b3796291 100755
--- a/configure
+++ b/configure
@@ -1536,44 +1536,51 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-maintainer-mode enable makefile rules useful for maintainers
-  --enable-symlink-install use symlinks when installing instead of hard links
-  --enable-relative-symlinks use relative symlinks when installing
+  --enable-maintainer-mode
+                          enable makefile rules useful for maintainers
+  --enable-symlink-install
+                          use symlinks when installing instead of hard links
+  --enable-relative-symlinks
+                          use relative symlinks when installing
 
   --enable-symlink-build  use symlinks while building instead of hard links
-  --enable-verbose-makecmds enable verbose make command output
-  --enable-elf-shlibs	  select ELF shared libraries
-  --enable-bsd-shlibs	  select BSD shared libraries
-  --enable-profile	  build profiling libraries
-  --enable-gcov	  	  build for coverage testing using gcov
-  --enable-hardening	  	  build for coverage testing using gcov
-  --enable-jbd-debug  	  enable journal debugging
+  --enable-verbose-makecmds
+                          enable verbose make command output
+  --enable-elf-shlibs     select ELF shared libraries
+  --enable-bsd-shlibs     select BSD shared libraries
+  --enable-profile        build profiling libraries
+  --enable-gcov           build for coverage testing using gcov
+  --enable-hardening      build for coverage testing using gcov
+  --enable-jbd-debug      enable journal debugging
   --enable-blkid-debug    enable blkid debugging
-  --disable-testio-debug  disable the use of the test I/O manager for debugging
-  --enable-developer-features  enable features for use by ext4 developers
-  --enable-libuuid	  build and use private uuid library
-  --enable-libblkid	  build and use private blkid library
-  --enable-subset  	  enable subset-only build
-  --disable-backtrace	  disable use backtrace
-  --disable-debugfs   	  disable support of debugfs program
-  --disable-imager   	  disable support of e2image program
-  --disable-resizer   	  disable support of e2resize program
-  --disable-defrag   	  disable support of e4defrag program
+  --disable-testio-debug  disable the use of the test I/O manager for
+                          debugging
+  --enable-developer-features
+                          enable features for use by ext4 developers
+  --enable-libuuid        build and use private uuid library
+  --enable-libblkid       build and use private blkid library
+  --enable-subset         enable subset-only build
+  --disable-backtrace     disable use backtrace
+  --disable-debugfs       disable support of debugfs program
+  --disable-imager        disable support of e2image program
+  --disable-resizer       disable support of e2resize program
+  --disable-defrag        disable support of e4defrag program
   --enable-fsck           build fsck wrapper program
-  --enable-e2initrd-helper build e2initrd-helper program
+  --enable-e2initrd-helper
+                          build e2initrd-helper program
   --disable-tls           disable use of thread local support
   --disable-uuidd         disable building the uuid daemon
   --disable-mmp           disable support mmp, Multi Mount Protection
   --disable-tdb           disable tdb support
-  --disable-bmap-stats    disable collection of bitmap stats.
+  --disable-bmap-stats    disable collection of bitmap stats
   --enable-bmap-stats-ops enable collection of additional bitmap stats
   --disable-nls           do not use Native Language Support
   --disable-rpath         do not hardcode runtime library paths
-  --disable-fuse2fs	  do not build fuse2fs
-  --enable-lto		  enable link time optimization
-  --enable-ubsan	  enable undefined behavior sanitizer
-  --enable-addrsan	  enable address sanitizer
-  --enable-threadsan	  enable thread sanitizer
+  --disable-fuse2fs       do not build fuse2fs
+  --enable-lto            enable link time optimization
+  --enable-ubsan          enable undefined behavior sanitizer
+  --enable-addrsan        enable address sanitizer
+  --enable-threadsan      enable thread sanitizer
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1582,14 +1589,16 @@ Optional Packages:
   --with-cc               no longer supported, use CC= instead
   --with-ccopts           no longer supported, use CFLAGS= instead
   --with-ldopts           no longer supported, use LDFLAGS= instead
-  --with-root-prefix=PREFIX override prefix variable for files to be placed in the root
+  --with-root-prefix=PREFIX
+                          override prefix variable for files to be placed in
+                          the root
   --without-pthread       disable use of pthread support
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
   --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
   --without-libintl-prefix     don't search for libintl in includedir and libdir
-  --with-multiarch=ARCH specify the multiarch triplet
+  --with-multiarch=ARCH   specify the multiarch triplet
   --with-udev-rules-dir[=DIR]
                           Install udev rules into DIR.
   --with-crond-dir[=DIR]  Install system crontabs into DIR.
diff --git a/configure.ac b/configure.ac
index 42b6f4862..4c4b55235 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT(version.h)
-AC_PREREQ(2.54)
+AC_PREREQ(2.69)
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_HEADERS([lib/config.h])
 AH_BOTTOM([#include <dirpaths.h>])
@@ -69,7 +69,7 @@ dnl Use diet libc
 dnl 
 WITH_DIET_LIBC=
 AC_ARG_WITH([diet-libc],
-[  --with-diet-libc        use diet libc],
+AS_HELP_STRING([--with-diet-libc],[use diet libc]),
 CC="diet cc -nostdinc"
 WITH_DIET_LIBC=yes
 if test -z "$LIBS"
@@ -89,15 +89,15 @@ AC_CHECK_LIB(dl, dlopen,DLOPEN_LIB=-ldl)
 AC_SUBST(DLOPEN_LIB)
 dnl
 AC_ARG_WITH([cc],
-AC_HELP_STRING([--with-cc],[no longer supported, use CC= instead]),
+AS_HELP_STRING([--with-cc],[no longer supported, use CC= instead]),
 AC_MSG_ERROR([--with-cc no longer supported; use CC= instead]))
 dnl
 AC_ARG_WITH([ccopts],
-AC_HELP_STRING([--with-ccopts],[no longer supported, use CFLAGS= instead]),
+AS_HELP_STRING([--with-ccopts],[no longer supported, use CFLAGS= instead]),
 AC_MSG_ERROR([--with-ccopts no longer supported; use CFLAGS= instead]))
 dnl
 AC_ARG_WITH([ldopts],
-AC_HELP_STRING([--with-ldopts],[no longer supported, use LDFLAGS= instead]),
+AS_HELP_STRING([--with-ldopts],[no longer supported, use LDFLAGS= instead]),
 AC_MSG_ERROR([--with-ldopts no longer supported; use LDFLAGS= instead]))
 dnl
 AC_PROG_CC
@@ -135,14 +135,14 @@ dnl
 dnl Allow separate `root_prefix' to be specified
 dnl
 AC_ARG_WITH([root-prefix],
-[  --with-root-prefix=PREFIX override prefix variable for files to be placed in the root],
+AS_HELP_STRING([--with-root-prefix=PREFIX],[override prefix variable for files to be placed in the root]),
 root_prefix=$withval,
 root_prefix=NONE)dnl
 dnl
 dnl handle --enable-maintainer-mode
 dnl
 AC_ARG_ENABLE([maintainer-mode],
-[  --enable-maintainer-mode enable makefile rules useful for maintainers],
+AS_HELP_STRING([--enable-maintainer-mode],[enable makefile rules useful for maintainers]),
 if test "$enableval" = "no"
 then
 	MAINTAINER_CMT=#
@@ -160,7 +160,7 @@ dnl
 dnl handle --enable-symlink-install
 dnl
 AC_ARG_ENABLE([symlink-install],
-[  --enable-symlink-install use symlinks when installing instead of hard links],
+AS_HELP_STRING([--enable-symlink-install],[use symlinks when installing instead of hard links]),
 if test "$enableval" = "no"
 then
 	LINK_INSTALL_FLAGS=-f
@@ -179,7 +179,7 @@ dnl handle --enable-relative-symlinks
 dnl
 relative_symlink_defined=
 AC_ARG_ENABLE([relative-symlinks],
-[  --enable-relative-symlinks use relative symlinks when installing],
+AS_HELP_STRING([--enable-relative-symlinks],[use relative symlinks when installing]),
 if test "$enableval" = "no"
 then
 	SYMLINK_RELATIVE=
@@ -211,7 +211,7 @@ dnl
 dnl handle --enable-symlink-build
 dnl
 AC_ARG_ENABLE([symlink-build],
-[  --enable-symlink-build  use symlinks while building instead of hard links],
+AS_HELP_STRING([--enable-symlink-build],[use symlinks while building instead of hard links]),
 if test "$enableval" = "no"
 then
 	LINK_BUILD_FLAGS=
@@ -229,7 +229,7 @@ dnl
 dnl handle --enable-verbose-makecmds
 dnl
 AC_ARG_ENABLE([verbose-makecmds],
-[  --enable-verbose-makecmds enable verbose make command output],
+AS_HELP_STRING([--enable-verbose-makecmds],[enable verbose make command output]),
 if test "$enableval" = "no"
 then
 	AC_MSG_RESULT([Disabling verbose make commands])
@@ -261,7 +261,7 @@ dnl
 dnl handle --enable-elf-shlibs
 dnl
 AC_ARG_ENABLE([elf-shlibs],
-[  --enable-elf-shlibs	  select ELF shared libraries],
+AS_HELP_STRING([--enable-elf-shlibs],[select ELF shared libraries]),
 if test "$enableval" = "no"
 then
 	ELF_CMT=#
@@ -293,7 +293,7 @@ dnl
 dnl handle --enable-bsd-shlibs
 dnl
 AC_ARG_ENABLE([bsd-shlibs],
-[  --enable-bsd-shlibs	  select BSD shared libraries],
+AS_HELP_STRING([--enable-bsd-shlibs],[select BSD shared libraries]),
 if test "$enableval" = "no"
 then
 	BSDLIB_CMT=#
@@ -323,7 +323,7 @@ dnl
 dnl handle --enable-profile
 dnl
 AC_ARG_ENABLE([profile],
-[  --enable-profile	  build profiling libraries],
+AS_HELP_STRING([--enable-profile],[build profiling libraries]),
 if test "$enableval" = "no"
 then
 	PROFILE_CMT=#
@@ -346,7 +346,7 @@ dnl
 dnl handle --enable-gcov
 dnl
 AC_ARG_ENABLE([gcov],
-[  --enable-gcov	  	  build for coverage testing using gcov],
+AS_HELP_STRING([--enable-gcov],[build for coverage testing using gcov]),
 if test "$enableval" = "yes"
 then
 	CFLAGS="-g -fprofile-arcs -ftest-coverage"
@@ -362,7 +362,7 @@ CFLAGS_STLIB="${CFLAGS_STLIB:-$CFLAGS}"
 LDFLAGS_SHLIB=${LDFLAGS_SHLIB:-$LDFLAGS}
 LDFLAGS_STATIC=${LDFLAGS_STATIC:-$LDFLAGS}
 AC_ARG_ENABLE([hardening],
-[  --enable-hardening	  	  build for coverage testing using gcov],
+AS_HELP_STRING([--enable-hardening],[build for coverage testing using gcov]),
 if test "$enableval" = "yes"
 then
 	HARDEN_CFLAGS="-D_FORTIFY_SOURCE=2 -fstack-protector-strong"
@@ -388,7 +388,7 @@ dnl
 dnl handle --enable-jbd-debug
 dnl
 AC_ARG_ENABLE([jbd-debug],
-[  --enable-jbd-debug  	  enable journal debugging],
+AS_HELP_STRING([--enable-jbd-debug],[enable journal debugging]),
 if test "$enableval" = "no"
 then
 	AC_MSG_RESULT([Disabling journal debugging])
@@ -404,7 +404,7 @@ dnl
 dnl handle --enable-blkid-debug
 dnl
 AC_ARG_ENABLE([blkid-debug],
-[  --enable-blkid-debug    enable blkid debugging],
+AS_HELP_STRING([--enable-blkid-debug],[enable blkid debugging]),
 if test "$enableval" = "no"
 then
 	AC_MSG_RESULT([Disabling blkid debugging])
@@ -420,7 +420,7 @@ dnl
 dnl handle --enable-testio-debug
 dnl
 AC_ARG_ENABLE([testio-debug],
-[  --disable-testio-debug  disable the use of the test I/O manager for debugging],
+AS_HELP_STRING([--disable-testio-debug],[disable the use of the test I/O manager for debugging]),
 AH_TEMPLATE([CONFIG_TESTIO_DEBUG],
 	[Define to 1 if the testio I/O manager should be enabled])
 if test "$enableval" = "no"
@@ -442,7 +442,7 @@ dnl
 dnl handle --enable-developer-features
 dnl
 AC_ARG_ENABLE([developer-features],
-[  --enable-developer-features  enable features for use by ext4 developers],
+AS_HELP_STRING([--enable-developer-features],[enable features for use by ext4 developers]),
 AH_TEMPLATE([CONFIG_DEVELOPER_FEATURES],
 	[Define to 1 for features for use by ext4 developers])
 if test "$enableval" = "yes"
@@ -471,7 +471,7 @@ PROFILED_LIBUUID=
 DEPPROFILED_LIBUUID=
 UUID_CMT=
 AC_ARG_ENABLE([libuuid],
-[  --enable-libuuid	  build and use private uuid library],
+AS_HELP_STRING([--enable-libuuid],[build and use private uuid library]),
 if test "$enableval" = "no"
 then
 	if test -z "$PKG_CONFIG"; then
@@ -534,7 +534,7 @@ DEPPROFILED_LIBBLKID=
 BLKID_CMT=
 AH_TEMPLATE([CONFIG_BUILD_FINDFS], [Define to 1 to compile findfs])
 AC_ARG_ENABLE([libblkid],
-[  --enable-libblkid	  build and use private blkid library],
+AS_HELP_STRING([--enable-libblkid],[build and use private blkid library]),
 if test "$enableval" = "no"
 then
 	if test -z "$PKG_CONFIG"; then
@@ -592,7 +592,7 @@ dnl
 ALL_CMT=
 SUBSET_CMT=
 AC_ARG_ENABLE([subset],
-[  --enable-subset  	  enable subset-only build],
+AS_HELP_STRING([--enable-subset],[enable subset-only build]),
 if test "$enableval" = "no"
 then
 	SUBSET_CMT=#
@@ -609,7 +609,7 @@ dnl handle --disable-backtrace
 dnl
 AH_TEMPLATE([DISABLE_BACKTRACE], [Define to 1 to disable use of backtrace])
 AC_ARG_ENABLE([backtrace],
-[  --disable-backtrace	  disable use backtrace],
+AS_HELP_STRING([--disable-backtrace],[disable use backtrace]),
 if test "$enableval" = "no"
 then
 	AC_MSG_RESULT([Disabling use of backtrace])
@@ -624,7 +624,7 @@ dnl
 dnl handle --enable-debugfs
 dnl
 AC_ARG_ENABLE([debugfs],
-[  --disable-debugfs   	  disable support of debugfs program],
+AS_HELP_STRING([--disable-debugfs],[disable support of debugfs program]),
 if test "$enableval" = "no"
 then
 	AC_MSG_RESULT([Disabling debugfs support])
@@ -642,7 +642,7 @@ dnl
 dnl handle --enable-imager
 dnl
 AC_ARG_ENABLE([imager],
-[  --disable-imager   	  disable support of e2image program],
+AS_HELP_STRING([--disable-imager],[disable support of e2image program]),
 if test "$enableval" = "no"
 then
 	AC_MSG_RESULT([Disabling e2image support])
@@ -660,7 +660,7 @@ dnl
 dnl handle --enable-resizer
 dnl
 AC_ARG_ENABLE([resizer],
-[  --disable-resizer   	  disable support of e2resize program],
+AS_HELP_STRING([--disable-resizer],[disable support of e2resize program]),
 if test "$enableval" = "no"
 then
 	AC_MSG_RESULT([Disabling e2resize support])
@@ -678,7 +678,7 @@ dnl
 dnl handle --enable-defrag
 dnl
 AC_ARG_ENABLE([defrag],
-[  --disable-defrag   	  disable support of e4defrag program],
+AS_HELP_STRING([--disable-defrag],[disable support of e4defrag program]),
 if test "$enableval" = "no"
 then
 	AC_MSG_RESULT([Disabling e4defrag support])
@@ -702,7 +702,7 @@ dnl
 dnl See whether to install the `fsck' wrapper program (that calls e2fsck)
 dnl
 AC_ARG_ENABLE([fsck],
-[  --enable-fsck           build fsck wrapper program],
+AS_HELP_STRING([--enable-fsck],[build fsck wrapper program]),
 [if test "$enableval" = "no"
 then
 	FSCK_PROG='' FSCK_MAN=''
@@ -728,7 +728,7 @@ dnl
 dnl See whether to install the `e2initrd-helper' program
 dnl
 AC_ARG_ENABLE([e2initrd-helper],
-[  --enable-e2initrd-helper build e2initrd-helper program],
+AS_HELP_STRING([--enable-e2initrd-helper],[build e2initrd-helper program]),
 [if test "$enableval" = "no"
 then
 	E2INITRD_PROG='' E2INITRD_MAN=''
@@ -747,7 +747,7 @@ dnl
 dnl
 dnl
 AC_ARG_ENABLE([tls],
-[  --disable-tls           disable use of thread local support],
+AS_HELP_STRING([--disable-tls],[disable use of thread local support]),
 [if test "$enableval" = "no"
 then
 	try_tls=""
@@ -774,7 +774,7 @@ dnl
 dnl
 dnl
 AC_ARG_WITH([pthread],
-[  --without-pthread       disable use of pthread support],
+AS_HELP_STRING([--without-pthread],[disable use of pthread support]),
 [if test "$withval" = "no"
 then
 	try_pthread=""
@@ -799,7 +799,7 @@ dnl
 dnl
 AH_TEMPLATE([USE_UUIDD], [Define to 1 to build uuidd])
 AC_ARG_ENABLE([uuidd],
-[  --disable-uuidd         disable building the uuid daemon],
+AS_HELP_STRING([--disable-uuidd],[disable building the uuid daemon]),
 [if test "$enableval" = "no"
 then
 	AC_MSG_RESULT([Not building uuidd])
@@ -826,7 +826,7 @@ dnl handle --disable-mmp
 dnl
 AH_TEMPLATE([CONFIG_MMP], [Define to 1 to enable mmp support])
 AC_ARG_ENABLE([mmp],
-[  --disable-mmp           disable support mmp, Multi Mount Protection],
+AS_HELP_STRING([--disable-mmp],[disable support mmp, Multi Mount Protection]),
 if test "$enableval" = "no"
 then
 	AC_MSG_RESULT([Disabling mmp support])
@@ -843,7 +843,7 @@ dnl handle --disable-tdb
 dnl
 AH_TEMPLATE([CONFIG_TDB], [Define to 1 to enable tdb support])
 AC_ARG_ENABLE([tdb],
-[  --disable-tdb           disable tdb support],
+AS_HELP_STRING([--disable-tdb],[disable tdb support]),
 if test "$enableval" = "no"
 then
 	AC_MSG_RESULT([Disabling tdb support])
@@ -868,7 +868,7 @@ dnl handle --disable-bmap-stats
 dnl
 AH_TEMPLATE([ENABLE_BMAP_STATS], [Define to 1 to enable bitmap stats.])
 AC_ARG_ENABLE([bmap-stats],
-[  --disable-bmap-stats    disable collection of bitmap stats.],
+AS_HELP_STRING([--disable-bmap-stats],[disable collection of bitmap stats]),
 if test "$enableval" = "no"
 then
 	AC_MSG_RESULT([Disabling bitmap statistics support])
@@ -885,7 +885,7 @@ dnl handle --enable-bmap-stats-ops
 dnl
 AH_TEMPLATE([ENABLE_BMAP_STATS_OPS], [Define to 1 to enable bitmap stats.])
 AC_ARG_ENABLE([bmap-stats-ops],
-[  --enable-bmap-stats-ops enable collection of additional bitmap stats],
+AS_HELP_STRING([--enable-bmap-stats-ops],[enable collection of additional bitmap stats]),
 if test "$enableval" = "no"
 then
 	AC_MSG_RESULT([Disabling additional bitmap statistics])
@@ -1274,7 +1274,7 @@ FUSE_CMT=
 FUSE_LIB=
 dnl osxfuse.dylib supersedes fuselib.dylib
 AC_ARG_ENABLE([fuse2fs],
-[  --disable-fuse2fs	  do not build fuse2fs],
+AS_HELP_STRING([--disable-fuse2fs],[do not build fuse2fs]),
 if test "$enableval" = "no"
 then
 	FUSE_CMT="#"
@@ -1378,7 +1378,7 @@ AX_CHECK_MOUNT_OPT(nodev)
 dnl Enable LTO for all packages
 dnl
 AC_ARG_ENABLE([lto],
-[  --enable-lto		  enable link time optimization],,
+AS_HELP_STRING([--enable-lto],[enable link time optimization]),,
 enable_lto=no)
 if test "$enable_lto" = "yes" || test "$enable_lto" = "probe"; then
 	AC_MSG_CHECKING([if C compiler supports LTO])
@@ -1412,7 +1412,7 @@ dnl
 dnl Enable UBSAN for all packages
 dnl
 AC_ARG_ENABLE([ubsan],
-[  --enable-ubsan	  enable undefined behavior sanitizer],,
+AS_HELP_STRING([--enable-ubsan],[enable undefined behavior sanitizer]),,
 enable_ubsan=no)
 if test "$enable_ubsan" = "yes" || test "$enable_ubsan" = "probe"; then
 	AC_MSG_CHECKING([if C compiler supports UBSAN])
@@ -1440,7 +1440,7 @@ dnl
 dnl Enable ADDRSAN for all packages
 dnl
 AC_ARG_ENABLE([addrsan],
-[  --enable-addrsan	  enable address sanitizer],,
+AS_HELP_STRING([--enable-addrsan],[enable address sanitizer]),,
 enable_addrsan=no)
 if test "$enable_addrsan" = "yes" || test "$enable_addrsan" = "probe"; then
 	AC_MSG_CHECKING([if C compiler supports ADDRSAN])
@@ -1468,7 +1468,7 @@ dnl
 dnl Enable THREADSAN for all packages
 dnl
 AC_ARG_ENABLE([threadsan],
-[  --enable-threadsan	  enable thread sanitizer],,
+AS_HELP_STRING([--enable-threadsan],[enable thread sanitizer]),,
 enable_threadsan=no)
 if test "$enable_threadsan" = "yes" || test "$enable_threadsan" = "probe"; then
 	AC_MSG_CHECKING([if C compiler supports THREADSAN])
@@ -1585,7 +1585,7 @@ dnl
 dnl Allow specification of the multiarch arch
 dnl
 AC_ARG_WITH([multiarch],
-[  --with-multiarch=ARCH specify the multiarch triplet],
+AS_HELP_STRING([--with-multiarch=ARCH],[specify the multiarch triplet]),
 if test "$withval" = "lib64"; then
     libdir=/usr/lib64
     root_libdir=/lib64
diff --git a/lib/config.h.in b/lib/config.h.in
index 0ba03e895..4bc7e8e22 100644
--- a/lib/config.h.in
+++ b/lib/config.h.in
@@ -418,9 +418,6 @@
 /* Define to 1 if you have the <sys/syscall.h> header file. */
 #undef HAVE_SYS_SYSCALL_H
 
-/* Define to 1 if you have the <sys/sysctl.h> header file. */
-#undef HAVE_SYS_SYSCTL_H
-
 /* Define to 1 if you have the <sys/sysmacros.h> header file. */
 #undef HAVE_SYS_SYSMACROS_H