From: Sami Kerola Date: Sat, 22 Jun 2013 19:06:34 +0000 (+0100) Subject: build-sys: reindent AC_ARG_WITH section in acinclude.m4 X-Git-Tag: openafs-stable-1_8_0pre1~441 X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=654f9e4ad46dd31e789b71a23f7e1465f8300132 build-sys: reindent AC_ARG_WITH section in acinclude.m4 Change-Id: I80b68eeecf9f72ac7f2ce133d9a5642a67dde22c Reviewed-on: http://gerrit.openafs.org/10013 Tested-by: BuildBot Reviewed-by: Benjamin Kaduk --- diff --git a/acinclude.m4 b/acinclude.m4 index 18f314b..cf28544 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -72,23 +72,25 @@ SRCDIR_PARENT=`pwd` dnl System identity. AC_ARG_WITH([afs-sysname], - [AS_HELP_STRING([--with-afs-sysname=sys], [use sys for the afs sysname])]) + [AS_HELP_STRING([--with-afs-sysname=sys], [use sys for the afs sysname]) +]) dnl General feature options. AC_ARG_ENABLE([gtx], - AS_HELP_STRING([--disable-gtx], [disable gtx curses-based terminal tools])) + [AS_HELP_STRING([--disable-gtx], [disable gtx curses-based terminal tools])]) + AC_ARG_ENABLE([uss], - AS_HELP_STRING([--disable-uss], [disable uss bulk creation tool])) + [AS_HELP_STRING([--disable-uss], [disable uss bulk creation tool])]) AC_ARG_ENABLE([namei-fileserver], [AS_HELP_STRING([--enable-namei-fileserver], - [force compilation of namei fileserver in preference to inode - fileserver])], - , + [force compilation of namei fileserver in preference to inode + fileserver])], + [], [enable_namei_fileserver="default"]) AC_ARG_ENABLE([supergroups], [AS_HELP_STRING([--enable-supergroups], - [enable support for nested pts groups])], - , + [enable support for nested pts groups])], + [], [enable_supergroups="no"]) AC_ARG_ENABLE([bitmap-later], [AS_HELP_STRING([--enable-bitmap-later], @@ -100,64 +102,69 @@ AC_ARG_ENABLE([bitmap-later], [enable_bitmap_later="no"]) AC_ARG_ENABLE([unix-sockets], [AS_HELP_STRING([--disable-unix-sockets], - [disable use of unix domain sockets for fssync (defaults to enabled)])], - , + [disable use of unix domain sockets for fssync (defaults to enabled)])], + [], [enable_unix_sockets="yes"]) AC_ARG_ENABLE([tivoli-tsm], [AS_HELP_STRING([--enable-tivoli-tsm], - [enable use of the Tivoli TSM API libraries for butc support])], - , + [enable use of the Tivoli TSM API libraries for butc support])], + [], [enable_tivoli_tsm="no"]) AC_ARG_ENABLE([pthreaded-ubik], [AS_HELP_STRING([--disable-pthreaded-ubik], [disable installation of pthreaded ubik applications (defaults to enabled)])], - , + [], [enable_pthreaded_ubik="yes"]) dnl Kernel module build options. AC_ARG_WITH([linux-kernel-headers], [AS_HELP_STRING([--with-linux-kernel-headers=path], - [use the kernel headers found at path (optional, defaults to - /lib/modules/`uname -r`/build, then /lib/modules/`uname -r`/source, - then /usr/src/linux-2.4, and lastly /usr/src/linux)])]) + [use the kernel headers found at path (optional, defaults to + /lib/modules/`uname -r`/build, then /lib/modules/`uname -r`/source, + then /usr/src/linux-2.4, and lastly /usr/src/linux)]) +]) AC_ARG_WITH([linux-kernel-build], [AS_HELP_STRING([--with-linux-kernel-build=path], - [use the kernel build found at path(optional, defaults to - kernel headers path)])]) + [use the kernel build found at path(optional, defaults to + kernel headers path)] +)]) AC_ARG_WITH([bsd-kernel-headers], [AS_HELP_STRING([--with-bsd-kernel-headers=path], - [use the kernel headers found at path (optional, defaults to - /usr/src/sys)])]) + [use the kernel headers found at path (optional, defaults to + /usr/src/sys)]) +]) AC_ARG_WITH([bsd-kernel-build], - [AS_HELP_STRING([--with-bsd-kernel-build=path], - [use the kernel build found at path (optional, defaults to - KSRC/i386/compile/GENERIC)])]) + [AS_HELP_STRING([--with-bsd-kernel-build=path], + [use the kernel build found at path (optional, defaults to + KSRC/i386/compile/GENERIC)]) +]) AC_ARG_WITH([linux-kernel-packaging], [AS_HELP_STRING([--with-linux-kernel-packaging], - [use standard naming conventions to aid Linux kernel build packaging - (disables MPS, sets the kernel module name to openafs.ko, and - installs kernel modules into the standard Linux location)])], - [AC_SUBST(LINUX_KERNEL_PACKAGING, "yes") - AC_SUBST(LINUX_LIBAFS_NAME, "openafs")], - [AC_SUBST(LINUX_LIBAFS_NAME, "libafs")]) + [use standard naming conventions to aid Linux kernel build packaging + (disables MPS, sets the kernel module name to openafs.ko, and + installs kernel modules into the standard Linux location)])], + [AC_SUBST([LINUX_KERNEL_PACKAGING], [yes]) + AC_SUBST([LINUX_LIBAFS_NAME], [openafs])], + [AC_SUBST([LINUX_LIBAFS_NAME], [libafs]) +]) AC_ARG_ENABLE([kernel-module], [AS_HELP_STRING([--disable-kernel-module], - [disable compilation of the kernel module (defaults to enabled)])], - , + [disable compilation of the kernel module (defaults to enabled)])], + [], [enable_kernel_module="yes"]) AC_ARG_ENABLE([redhat-buildsys], [AS_HELP_STRING([--enable-redhat-buildsys], - [enable compilation of the redhat build system kernel (defaults to - disabled)])], - , + [enable compilation of the redhat build system kernel (defaults to + disabled)])], + [], [enable_redhat_buildsys="no"]) dnl Installation locations. AC_ARG_ENABLE([transarc-paths], [AS_HELP_STRING([--enable-transarc-paths], - [use Transarc style paths like /usr/afs and /usr/vice])], - , + [use Transarc style paths like /usr/afs and /usr/vice])], + [], [enable_transarc_paths="no"]) dnl Deprecated crypto @@ -172,27 +179,27 @@ AC_ARG_ENABLE([kauth], dnl Optimization and debugging flags. AC_ARG_ENABLE([strip-binaries], [AS_HELP_STRING([--disable-strip-binaries], - [disable stripping of symbol information from binaries (defaults to - enabled)])], - , + [disable stripping of symbol information from binaries (defaults to + enabled)])], + [], [enable_strip_binaries="maybe"]) AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug], - [enable compilation of the user space code with debugging information - (defaults to disabled)])], - , + [enable compilation of the user space code with debugging information + (defaults to disabled)])], + [], [enable_debug="no"]) AC_ARG_ENABLE([optimize], [AS_HELP_STRING([--disable-optimize], - [disable optimization for compilation of the user space code (defaults - to enabled)])], - , + [disable optimization for compilation of the user space code (defaults + to enabled)])], + [], [enable_optimize="yes"]) AC_ARG_ENABLE([warnings], [AS_HELP_STRING([--enable-warnings], - [enable compilation warnings when building with gcc (defaults to - disabled)])], - , + [enable compilation warnings when building with gcc (defaults to + disabled)])], + [], [enable_warnings="no"]) AC_ARG_ENABLE([checking], [AS_HELP_STRING([--enable-checking], @@ -207,56 +214,58 @@ AC_ARG_ENABLE([debug-locks], [enable_debug_locks="no"]) AC_ARG_ENABLE([debug-kernel], [AS_HELP_STRING([--enable-debug-kernel], - [enable compilation of the kernel module with debugging information - (defaults to disabled)])], - , + [enable compilation of the kernel module with debugging information + (defaults to disabled)])], + [], [enable_debug_kernel="no"]) AC_ARG_ENABLE([optimize-kernel], [AS_HELP_STRING([--disable-optimize-kernel], - [disable compilation of the kernel module with optimization (defaults - based on platform)])], - , + [disable compilation of the kernel module with optimization (defaults + based on platform)])], + [], [enable_optimize_kernel=""]) AC_ARG_ENABLE([debug-lwp], [AS_HELP_STRING([--enable-debug-lwp], - [enable compilation of the LWP code with debugging information - (defaults to disabled)])], - , + [enable compilation of the LWP code with debugging information + (defaults to disabled)])], + [], [enable_debug_lwp="no"]) AC_ARG_ENABLE([optimize-lwp], [AS_HELP_STRING([--disable-optimize-lwp], - [disable optimization for compilation of the LWP code (defaults to - enabled)])], - , + [disable optimization for compilation of the LWP code (defaults to + enabled)])], + [], [enable_optimize_lwp="yes"]) AC_ARG_ENABLE([debug-pam], [AS_HELP_STRING([--enable-debug-pam], - [enable compilation of the PAM code with debugging information - (defaults to disabled)])], - , + [enable compilation of the PAM code with debugging information + (defaults to disabled)])], + [], [enable_debug_pam="no"]) AC_ARG_ENABLE([optimize-pam], [AS_HELP_STRING([--disable-optimize-pam], - [disable optimization for compilation of the PAM code (defaults to - enabled)])], - , + [disable optimization for compilation of the PAM code (defaults to + enabled)])], + [], [enable_optimize_pam="yes"]) AC_ARG_ENABLE([linux-syscall-probing], [AS_HELP_STRING([--enable-linux-syscall-probing], [enable Linux syscall probing (defaults to autodetect)])], - , + [], [enable_linux_syscall_probing="maybe"]) AC_ARG_WITH([crosstools-dir], - [AS_HELP_STRING([--with-crosstools-dir=path], [use path for native versions of rxgen, compile_et and config])]) - + [AS_HELP_STRING([--with-crosstools-dir=path], + [use path for native versions of rxgen, compile_et and config]) +]) + AC_ARG_WITH([xslt-processor], AS_HELP_STRING([--with-xslt-processor=ARG], [which XSLT processor to use (possible choices are: libxslt, saxon, xalan-j, xsltproc)]), - [XSLTPROC="$withval"], + [XSLTPROC="$withval"], [AC_CHECK_PROGS([XSLTPROC], [libxslt saxon xalan-j xsltproc], [echo])]) -AC_ARG_WITH([html-xsl], - AS_HELP_STRING([--with-html-xsl], +AC_ARG_WITH([html-xsl], + AS_HELP_STRING([--with-html-xsl], [build HTML documentation using this stylesheet (default is html/chunk.dsl; specify either html/chunk.xsl or html/docbook.xsl)]), [HTML_XSL="$withval"], [HTML_XSL="html/chunk.xsl"]) @@ -264,13 +273,13 @@ AC_ARG_WITH([html-xsl], AC_ARG_WITH([docbook2pdf], AS_HELP_STRING([--with-docbook2pdf=ARG], [which Docbook to PDF utility to use (possible choices are: fop, dblatex, docbook2pdf)]), - [DOCBOOK2PDF="$withval"], + [DOCBOOK2PDF="$withval"], [AC_CHECK_PROGS([DOCBOOK2PDF], [fop dblatex docbook2pdf], [echo])]) AC_ARG_WITH([docbook-stylesheets], AS_HELP_STRING([--with-docbook-stylesheets=ARG], [location of DocBook stylesheets (default is to search a set of likely paths)]), - [DOCBOOK_STYLESHEETS="$withval"], + [DOCBOOK_STYLESHEETS="$withval"], [OPENAFS_SEARCH_DIRLIST([DOCBOOK_STYLESHEETS], [/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/xml/docbook/stylesheet/nwalsh /usr/share/xml/docbook/xsl-stylesheets /usr/share/sgml/docbook/docbook-xsl-stylesheets /usr/share/sgml/docbook/xsl-stylesheets /usr/share/docbook-xsl /usr/share/sgml/docbkxsl /usr/local/share/xsl/docbook /sw/share/xml/xsl/docbook-xsl /opt/local/share/xsl/docbook-xsl], [$HTML_XSL]) if test "x$DOCBOOK_STYLESHEETS" = "x"; then AC_WARN([Docbook stylesheets not found; some documentation can't be built])