From cc0d3d5232260595e09ae4ec517d537e961c0c81 Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Sat, 22 Jun 2013 17:28:01 +0100 Subject: [PATCH] build-sys: use m4 quoting consistantly Change-Id: Ie8c5e15fd9ddf521ac74b07ee0e1252b35e7a816 Reviewed-on: http://gerrit.openafs.org/10008 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- configure-libafs.ac | 28 ++-- configure.ac | 319 ++++++++++++++++++++++---------------------- 2 files changed, 173 insertions(+), 174 deletions(-) diff --git a/configure-libafs.ac b/configure-libafs.ac index 0b8c72eab6..f873ed187f 100644 --- a/configure-libafs.ac +++ b/configure-libafs.ac @@ -1,16 +1,16 @@ AC_PRERQ([2.60]) AC_INIT([OpenAFS], m4_esyscmd([build-tools/git-version .]), - [openafs-bugs@openafs.org],, + [openafs-bugs@openafs.org], [], [http://www.openafs.org/]) AC_CONFIG_AUX_DIR([build-tools]) -AC_CONFIG_SRCDIR(src/libafs/Makefile.common.in) +AC_CONFIG_SRCDIR([src/libafs/Makefile.common.in]) AM_INIT_AUTOMAKE([foreign]) -AC_CONFIG_HEADER(src/config/afsconfig.h) +AC_CONFIG_HEADER([src/config/afsconfig.h]) MACOS_VERSION=1.5.76 -AC_SUBST(MACOS_VERSION) +AC_SUBST([MACOS_VERSION]) dnl If the user hasn't specified CFLAGS don't let configure pick -g -O2 AS_IF([test -z "$CFLAGS"], [CFLAGS=" "], []) @@ -18,13 +18,13 @@ AC_PROG_CC OPENAFS_CONFIGURE_COMMON -AC_OUTPUT( \ -Makefile \ -src/config/Makefile \ -src/config/Makefile.config \ -src/config/Makefile.lwp \ -src/config/Makefile.version-CML \ -src/config/Makefile.version-NOCML \ -src/libafs/Makefile.common \ -src/libafs/MakefileProto \ -) +AC_OUTPUT([ + Makefile + src/config/Makefile + src/config/Makefile.config + src/config/Makefile.lwp + src/config/Makefile.version-CML + src/config/Makefile.version-NOCML + src/libafs/Makefile.common + src/libafs/MakefileProto +]) diff --git a/configure.ac b/configure.ac index 534d12cb32..c040b74126 100644 --- a/configure.ac +++ b/configure.ac @@ -1,14 +1,14 @@ AC_PREREQ([2.60]) AC_INIT([OpenAFS], - m4_esyscmd([build-tools/git-version .]), - [openafs-bugs@openafs.org],, - [http://www.openafs.org/]) + m4_esyscmd([build-tools/git-version .]), + [openafs-bugs@openafs.org], [], + [http://www.openafs.org/]) AC_CONFIG_AUX_DIR([build-tools]) AC_CONFIG_MACRO_DIR([src/cf]) AC_CONFIG_SRCDIR([src/config/stds.h]) AM_INIT_AUTOMAKE([foreign]) -AC_CONFIG_HEADER(src/config/afsconfig.h) +AC_CONFIG_HEADER([src/config/afsconfig.h]) MACOS_VERSION=1.5.76 #LINUX_PKGREL=0.pre3 LINUX_PKGREL=1.1 @@ -20,8 +20,8 @@ if echo "$LINUX_PKGREL" | grep pre >/dev/null 2>/dev/null ; then DEB_PKGVER="$DEB_PKGVER"`echo "$LINUX_PKGREL" | sed 's/0.pre/~rc/'` fi -AC_SUBST(MACOS_VERSION) -AC_SUBST(DEB_PKGVER) +AC_SUBST([MACOS_VERSION]) +AC_SUBST([DEB_PKGVER]) dnl If the user hasn't specified CFLAGS don't let configure pick -g -O2 AS_IF([test -z "$CFLAGS"], [CFLAGS=" "], []) @@ -72,8 +72,8 @@ AS_IF([test x"$KRB5_LIBS" != x], krb5_get_prompt_types \ krb5_princ_size \ krb5_principal_get_comp_string]) - AC_CHECK_FUNCS([krb5_524_convert_creds], , - [AC_CHECK_FUNCS([krb524_convert_creds_kdc], , + AC_CHECK_FUNCS([krb5_524_convert_creds], [], + [AC_CHECK_FUNCS([krb524_convert_creds_kdc], [], [AC_CHECK_LIB([krb524], [krb524_convert_creds_kdc], [LIBS="-lkrb524 $LIBS" KRB5_LIBS="-lkrb524 $KRB5_LIBS" @@ -85,7 +85,7 @@ AS_IF([test x"$KRB5_LIBS" != x], AC_CHECK_HEADERS([kerberosIV/krb.h]) AC_CHECK_HEADERS([kerberosV/heim_err.h]) AC_CHECK_MEMBERS([krb5_creds.keyblock, krb5_creds.keyblock.enctype, krb5_creds.session, - krb5_prompt.type], , , [#include ]) + krb5_prompt.type], [], [], [#include ]) dnl If we have krb5_creds.session, we are using heimdal dnl If we're using heimdal, aklog needs libasn1 for encode_EncTicketPart and a dnl few other functions. But just aklog; not any of the other stuff that uses @@ -132,157 +132,156 @@ else MOBI_FIXUP_XSL= fi -AC_OUTPUT( \ -Makefile \ -${MAN_MAKEFILE} \ -${ADMINGUIDE_MAKEFILE} \ -${QSUNIX_MAKEFILE} \ -${USERGUIDE_MAKEFILE} \ -${ADMINREF_MAKEFILE} \ -${MOBI_FIXUP_XSL} \ -src/afs/Makefile \ -src/afsd/Makefile \ -src/afsmonitor/Makefile \ -src/afsweb/Makefile \ -src/aklog/Makefile \ -src/audit/Makefile \ -src/auth/Makefile \ -src/auth/test/Makefile \ -src/bozo/Makefile \ -src/bozo/test/Makefile \ -src/bu_utils/Makefile \ -src/bubasics/Makefile \ -src/bucoord/Makefile \ -src/budb/Makefile \ -src/tbudb/Makefile \ -src/butc/Makefile \ -src/butm/Makefile \ -src/cmd/Makefile \ -src/cmd/test/Makefile \ -src/comerr/Makefile \ -src/comerr/test/Makefile \ -src/config/Makefile \ -src/config/Makefile.config \ -src/config/Makefile.libtool \ -src/config/Makefile.lwp \ -src/config/Makefile.lwptool \ -src/config/Makefile.pthread \ -src/config/Makefile.shared \ -src/config/Makefile.version-CML \ -src/config/Makefile.version-NOCML \ -src/config/shlib-build \ -src/config/shlib-install \ -src/crypto/hcrypto/Makefile \ -src/crypto/rfc3961/Makefile \ -src/dir/Makefile \ -src/dir/test/Makefile \ -src/dviced/Makefile \ -src/dvolser/Makefile \ -src/export/Makefile \ -src/finale/Makefile \ -src/fsint/Makefile \ -src/fsprobe/Makefile \ -src/gtx/Makefile \ -src/JAVA/libjafs/Makefile \ -src/kauth/Makefile \ -src/kauth/test/Makefile \ -src/kopenafs/Makefile \ -src/libacl/Makefile \ -src/libacl/test/Makefile \ -src/libadmin/Makefile \ -src/libadmin/adminutil/Makefile \ -src/libadmin/bos/Makefile \ -src/libadmin/cfg/Makefile \ -src/libadmin/cfg/test/Makefile \ -src/libadmin/client/Makefile \ -src/libadmin/kas/Makefile \ -src/libadmin/pts/Makefile \ -src/libadmin/samples/Makefile \ -src/libadmin/test/Makefile \ -src/libadmin/vos/Makefile \ -src/libafs/Makefile.common \ -src/libafs/MakefileProto.${MKAFS_OSTYPE} \ -${DARWIN_PLIST} \ -src/libafsauthent/Makefile \ -src/libafsrpc/Makefile \ -src/libuafs/Makefile.common \ -src/libuafs/MakefileProto.${MKAFS_OSTYPE} \ -src/log/Makefile \ -src/log/test/Makefile \ -src/lwp/Makefile \ -src/lwp/test/Makefile \ -src/opr/Makefile \ -src/packaging/Debian/changelog \ -src/packaging/MacOS/OpenAFS-debug.Description.plist \ -src/packaging/MacOS/OpenAFS-debug.Info.plist \ -src/packaging/MacOS/OpenAFS.Description.plist \ -src/packaging/MacOS/OpenAFS.Info.plist \ -src/packaging/MacOS/OpenAFS.info \ -src/packaging/MacOS/buildpkg.sh \ -src/pam/Makefile \ -src/platform/Makefile \ -src/platform/${MKAFS_OSTYPE}/Makefile \ -src/platform/DARWIN/growlagent/Makefile \ -src/procmgmt/Makefile \ -src/procmgmt/test/Makefile \ -src/ptserver/Makefile \ -src/tptserver/Makefile \ -src/roken/Makefile \ -src/rx/Makefile \ -src/rx/bulk.example/Makefile \ -src/rx/bulktest/Makefile \ -src/rx/multi.example/Makefile \ -src/rx/simple.example/Makefile \ -src/rx/test/Makefile \ -src/rxdebug/Makefile \ -src/rxgen/Makefile \ -src/rxkad/Makefile \ -src/rxkad/test/Makefile \ -src/rxosd/Makefile \ -src/rxstat/Makefile \ -src/scout/Makefile \ -src/sgistuff/Makefile \ -src/sys/Makefile \ -src/tbutc/Makefile \ -src/tests/Makefile \ -src/tests/run-tests \ -src/tools/Makefile \ -src/tools/dumpscan/Makefile \ -src/tools/rxperf/Makefile \ -src/tsalvaged/Makefile \ -src/tsm41/Makefile \ -src/tvolser/Makefile \ -src/ubik/Makefile \ -src/tubik/Makefile \ -src/update/Makefile \ -src/usd/Makefile \ -src/usd/test/Makefile \ -src/uss/Makefile \ -src/util/Makefile \ -src/util/test/Makefile \ -src/libafscp/Makefile \ -src/venus/Makefile \ -src/venus/test/Makefile \ -src/vfsck/Makefile \ -src/viced/Makefile \ -src/vlserver/Makefile \ -src/tvlserver/Makefile \ -src/vol/Makefile \ -src/vol/test/Makefile \ -src/volser/Makefile \ -src/xstat/Makefile \ -src/helper-splint.sh \ -tests/Makefile \ -tests/auth/Makefile \ -tests/cmd/Makefile \ -tests/common/Makefile \ -tests/opr/Makefile \ -tests/rpctestlib/Makefile \ -tests/rx/Makefile \ -tests/tap/Makefile \ -tests/util/Makefile \ -tests/volser/Makefile, - +AC_OUTPUT([ + Makefile + ${MAN_MAKEFILE} + ${ADMINGUIDE_MAKEFILE} + ${QSUNIX_MAKEFILE} + ${USERGUIDE_MAKEFILE} + ${ADMINREF_MAKEFILE} + ${MOBI_FIXUP_XSL} + src/afs/Makefile + src/afsd/Makefile + src/afsmonitor/Makefile + src/afsweb/Makefile + src/aklog/Makefile + src/audit/Makefile + src/auth/Makefile + src/auth/test/Makefile + src/bozo/Makefile + src/bozo/test/Makefile + src/bu_utils/Makefile + src/bubasics/Makefile + src/bucoord/Makefile + src/budb/Makefile + src/tbudb/Makefile + src/butc/Makefile + src/butm/Makefile + src/cmd/Makefile + src/cmd/test/Makefile + src/comerr/Makefile + src/comerr/test/Makefile + src/config/Makefile + src/config/Makefile.config + src/config/Makefile.libtool + src/config/Makefile.lwp + src/config/Makefile.lwptool + src/config/Makefile.pthread + src/config/Makefile.shared + src/config/Makefile.version-CML + src/config/Makefile.version-NOCML + src/config/shlib-build + src/config/shlib-install + src/crypto/hcrypto/Makefile + src/crypto/rfc3961/Makefile + src/dir/Makefile + src/dir/test/Makefile + src/dviced/Makefile + src/dvolser/Makefile + src/export/Makefile + src/finale/Makefile + src/fsint/Makefile + src/fsprobe/Makefile + src/gtx/Makefile + src/JAVA/libjafs/Makefile + src/kauth/Makefile + src/kauth/test/Makefile + src/kopenafs/Makefile + src/libacl/Makefile + src/libacl/test/Makefile + src/libadmin/Makefile + src/libadmin/adminutil/Makefile + src/libadmin/bos/Makefile + src/libadmin/cfg/Makefile + src/libadmin/cfg/test/Makefile + src/libadmin/client/Makefile + src/libadmin/kas/Makefile + src/libadmin/pts/Makefile + src/libadmin/samples/Makefile + src/libadmin/test/Makefile + src/libadmin/vos/Makefile + src/libafs/Makefile.common + src/libafs/MakefileProto.${MKAFS_OSTYPE} + ${DARWIN_PLIST} + src/libafsauthent/Makefile + src/libafsrpc/Makefile + src/libuafs/Makefile.common + src/libuafs/MakefileProto.${MKAFS_OSTYPE} + src/log/Makefile + src/log/test/Makefile + src/lwp/Makefile + src/lwp/test/Makefile + src/opr/Makefile + src/packaging/Debian/changelog + src/packaging/MacOS/OpenAFS-debug.Description.plist + src/packaging/MacOS/OpenAFS-debug.Info.plist + src/packaging/MacOS/OpenAFS.Description.plist + src/packaging/MacOS/OpenAFS.Info.plist + src/packaging/MacOS/OpenAFS.info + src/packaging/MacOS/buildpkg.sh + src/pam/Makefile + src/platform/Makefile + src/platform/${MKAFS_OSTYPE}/Makefile + src/platform/DARWIN/growlagent/Makefile + src/procmgmt/Makefile + src/procmgmt/test/Makefile + src/ptserver/Makefile + src/tptserver/Makefile + src/roken/Makefile + src/rx/Makefile + src/rx/bulk.example/Makefile + src/rx/bulktest/Makefile + src/rx/multi.example/Makefile + src/rx/simple.example/Makefile + src/rx/test/Makefile + src/rxdebug/Makefile + src/rxgen/Makefile + src/rxkad/Makefile + src/rxkad/test/Makefile + src/rxosd/Makefile + src/rxstat/Makefile + src/scout/Makefile + src/sgistuff/Makefile + src/sys/Makefile + src/tbutc/Makefile + src/tests/Makefile + src/tests/run-tests + src/tools/Makefile + src/tools/dumpscan/Makefile + src/tools/rxperf/Makefile + src/tsalvaged/Makefile + src/tsm41/Makefile + src/tvolser/Makefile + src/ubik/Makefile + src/tubik/Makefile + src/update/Makefile + src/usd/Makefile + src/usd/test/Makefile + src/uss/Makefile + src/util/Makefile + src/util/test/Makefile + src/libafscp/Makefile + src/venus/Makefile + src/venus/test/Makefile + src/vfsck/Makefile + src/viced/Makefile + src/vlserver/Makefile + src/tvlserver/Makefile + src/vol/Makefile + src/vol/test/Makefile + src/volser/Makefile + src/xstat/Makefile + src/helper-splint.sh + tests/Makefile + tests/auth/Makefile + tests/cmd/Makefile + tests/common/Makefile + tests/opr/Makefile + tests/rpctestlib/Makefile + tests/rx/Makefile + tests/tap/Makefile + tests/util/Makefile + tests/volser/Makefile], [chmod a+x src/config/shlib-build chmod a+x src/config/shlib-install])