[PATCH 08/13] Consistently quote all macro arguments

18 Mar 2017

---
 configure.ac | 140 ++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 82 insertions(+), 58 deletions(-)

diff --git a/configure.ac b/configure.ac
index 633805cb..658595a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl ** (c) 1999--2000 Martin Mares <mj@ucw.cz>
 
 AC_INIT
 AC_CONFIG_SRCDIR([conf/confbase.Y])
-AC_CONFIG_AUX_DIR(tools)
+AC_CONFIG_AUX_DIR([tools])
 
 AC_ARG_ENABLE([client],
   [AS_HELP_STRING([--enable-client], [enable building of BIRD client @<:@default=yes@:>@])],
@@ -89,10 +89,10 @@ case $srcdir_rel in
   /*) srcdir_rel_mf=$srcdir_rel ;;
   *)  srcdir_rel_mf="\$(root-rel)$srcdir_rel" ;;
 esac
-AC_SUBST(objdir)
-AC_SUBST(exedir)
-AC_SUBST(srcdir_rel_mf)
-AC_SUBST(runtimedir)
+AC_SUBST([objdir])
+AC_SUBST([exedir])
+AC_SUBST([srcdir_rel_mf])
+AC_SUBST([runtimedir])
 
 if test "$enable_ipv6" = yes ; then
   ip=ipv6
@@ -106,7 +106,7 @@ fi
 if test "$given_suffix" = yes ; then
   SUFFIX="$with_suffix"
 fi
-AC_SUBST(SUFFIX)
+AC_SUBST([SUFFIX])
 
 if test "$enable_debug" = yes ; then
   CONFIG_FILE="bird$SUFFIX.conf"
@@ -115,11 +115,13 @@ else
   CONFIG_FILE="\$(sysconfdir)/bird$SUFFIX.conf"
   CONTROL_SOCKET="$runtimedir/bird$SUFFIX.ctl"
 fi
-AC_SUBST(CONFIG_FILE)
-AC_SUBST(CONTROL_SOCKET)
+AC_SUBST([CONFIG_FILE])
+AC_SUBST([CONTROL_SOCKET])
 
-AC_SEARCH_LIBS(clock_gettime, [c rt posix4], ,
-  AC_MSG_ERROR([[Function clock_gettime not available.]]))
+AC_SEARCH_LIBS([clock_gettime], [c rt posix4],
+  [],
+  [AC_MSG_ERROR([Function clock_gettime not available.])]
+)
 
 AC_CANONICAL_HOST
 
@@ -159,32 +161,35 @@ if test "$enable_pthreads" != no ; then
 fi
 
 if test "$bird_cflags_default" = yes ; then
-  BIRD_CHECK_GCC_OPTION(bird_cv_c_option_wno_pointer_sign, -Wno-pointer-sign, -Wall)
-  BIRD_CHECK_GCC_OPTION(bird_cv_c_option_wno_missing_init, -Wno-missing-field-initializers, -Wall -Wextra)
-  BIRD_CHECK_GCC_OPTION(bird_cv_c_option_fno_strict_aliasing, -fno-strict-aliasing)
-  BIRD_CHECK_GCC_OPTION(bird_cv_c_option_fno_strict_overflow, -fno-strict-overflow)
+  BIRD_CHECK_GCC_OPTION([bird_cv_c_option_wno_pointer_sign], [-Wno-pointer-sign], [-Wall])
+  BIRD_CHECK_GCC_OPTION([bird_cv_c_option_wno_missing_init], [-Wno-missing-field-initializers], [-Wall -Wextra])
+  BIRD_CHECK_GCC_OPTION([bird_cv_c_option_fno_strict_aliasing], [-fno-strict-aliasing])
+  BIRD_CHECK_GCC_OPTION([bird_cv_c_option_fno_strict_overflow], [-fno-strict-overflow])
 
   CFLAGS="$CFLAGS -Wall -Wextra -Wstrict-prototypes -Wno-parentheses"
-  BIRD_ADD_GCC_OPTION(bird_cv_c_option_wno_pointer_sign, -Wno-pointer-sign)
-  BIRD_ADD_GCC_OPTION(bird_cv_c_option_wno_missing_init, -Wno-missing-field-initializers)
-  BIRD_ADD_GCC_OPTION(bird_cv_c_option_fno_strict_aliasing, -fno-strict-aliasing)
-  BIRD_ADD_GCC_OPTION(bird_cv_c_option_fno_strict_overflow, -fno-strict-overflow)
+  BIRD_ADD_GCC_OPTION([bird_cv_c_option_wno_pointer_sign], [-Wno-pointer-sign])
+  BIRD_ADD_GCC_OPTION([bird_cv_c_option_wno_missing_init], [-Wno-missing-field-initializers])
+  BIRD_ADD_GCC_OPTION([bird_cv_c_option_fno_strict_aliasing], [-fno-strict-aliasing])
+  BIRD_ADD_GCC_OPTION([bird_cv_c_option_fno_strict_overflow], [-fno-strict-overflow])
 fi
 AC_MSG_CHECKING([CFLAGS])
-AC_MSG_RESULT($CFLAGS)
+AC_MSG_RESULT([$CFLAGS])
 
 
 AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_RANLIB
-AC_CHECK_PROG(FLEX, flex, flex)
-AC_CHECK_PROG(BISON, bison, bison)
-AC_CHECK_PROGS(M4, gm4 m4)
+AC_CHECK_PROG([FLEX], [flex], [flex])
+AC_CHECK_PROG([BISON], [bison], [bison])
+AC_CHECK_PROGS([M4], [gm4 m4])
 
 test -z "$FLEX"  && AC_MSG_ERROR([Flex is missing.])
 test -z "$BISON" && AC_MSG_ERROR([Bison is missing.])
 test -z "$M4"  && AC_MSG_ERROR([M4 is missing.])
-BIRD_CHECK_PROG_FLAVOR_GNU([$M4], , [AC_MSG_ERROR([Provided M4 is not GNU M4.])])
+BIRD_CHECK_PROG_FLAVOR_GNU([$M4],
+  [],
+  [AC_MSG_ERROR([Provided M4 is not GNU M4.])]
+)
 
 if test -n "$with_sysconfig" -a "$with_sysconfig" != no ; then
   if test -f $with_sysconfig ; then
@@ -248,7 +253,7 @@ else
   sysdesc=$srcdir/sysdep/cf/$sysdesc.h
 fi
 AC_MSG_CHECKING([which OS configuration should we use])
-AC_MSG_RESULT($sysdesc)
+AC_MSG_RESULT([$sysdesc])
 if ! test -f $sysdesc ; then
   AC_MSG_ERROR([The system configuration file is missing.])
 fi
@@ -257,8 +262,8 @@ AC_DEFINE_UNQUOTED([SYSCONF_INCLUDE], ["$sysdesc"], [Which sysdep header to incl
 
 AC_MSG_CHECKING([system-dependent directories])
 sysdep_dirs="`sed <$sysdesc '/^Link: /!d;s/^Link: \(.*\)$/\1/' | tr '\012' ' '` lib"
-AC_MSG_RESULT($sysdep_dirs)
-AC_SUBST(sysdep_dirs)
+AC_MSG_RESULT([$sysdep_dirs])
+AC_SUBST([sysdep_dirs])
 
 if test "$with_iproutedir" = no ; then with_iproutedir= ; fi
 
@@ -268,7 +273,7 @@ else
   iproutedir=$default_iproutedir
 fi
 
-AC_SUBST(iproutedir)
+AC_SUBST([iproutedir])
 
 all_protocols="$proto_bfd bgp ospf pipe $proto_radv rip static"
 if test "$ip" = ipv6 ; then
@@ -294,26 +299,30 @@ protocols=`echo "$with_protocols" | sed 's/,/ /g'`
 if test "$protocols" = no ; then protocols= ; fi
 for a in $protocols ; do
   if ! test -f $srcdir/proto/$a/Makefile ; then
-    AC_MSG_RESULT(failed)
-    AC_MSG_ERROR([Requested protocol $a not found.])
+    AC_MSG_RESULT([failed])
+    AC_MSG_ERROR([Requested protocol $a not found])
   fi
-  AC_DEFINE_UNQUOTED(CONFIG_`echo $a | tr 'a-z' 'A-Z'`)
+  AC_DEFINE_UNQUOTED([CONFIG_`echo $a | tr 'a-z' 'A-Z'`])
 done
-AC_MSG_RESULT(ok)
-AC_SUBST(protocols)
+AC_MSG_RESULT([ok])
+AC_SUBST([protocols])
 
 case $sysdesc in
   */linux*|*/linux-v6*)
-    AC_CHECK_HEADER(linux/rtnetlink.h,,[AC_MSG_ERROR([Appropriate version of Linux kernel headers not found.])],[
-#include <asm/types.h>
-#include <sys/socket.h>
-])
+    AC_CHECK_HEADER([linux/rtnetlink.h],
+      [],
+      [AC_MSG_ERROR([Appropriate version of Linux kernel headers not found.])],
+      [
+        #include <asm/types.h>
+        #include <sys/socket.h>
+      ]
+    )
     ;;
 esac
 
-AC_CHECK_HEADER(syslog.h, [AC_DEFINE([HAVE_SYSLOG], [1], [Define to 1 if you have the <syslog.h> header file])])
-AC_CHECK_HEADER(alloca.h, [AC_DEFINE([HAVE_ALLOCA_H], [1], [Define to 1 if you have the <alloca.h> header file])])
-AC_MSG_CHECKING(whether 'struct sockaddr' has sa_len)
+AC_CHECK_HEADER([syslog.h], [AC_DEFINE([HAVE_SYSLOG], [1], [Define to 1 if you have the <syslog.h> header file])])
+AC_CHECK_HEADER([alloca.h], [AC_DEFINE([HAVE_ALLOCA_H], [1], [Define to 1 if you have the <alloca.h> header file])])
+AC_MSG_CHECKING([whether 'struct sockaddr' has sa_len])
 AC_COMPILE_IFELSE([
   AC_LANG_PROGRAM(
     [[
@@ -326,10 +335,10 @@ AC_COMPILE_IFELSE([
     ]]
   )],
   [
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(HAVE_SIN_LEN,,sin_len)
+    AC_MSG_RESULT([yes])
+    AC_DEFINE([HAVE_SIN_LEN], [1], [sin_len])
   ],
-  [AC_MSG_RESULT(no)]
+  [AC_MSG_RESULT([no])]
 )
 
 AC_C_BIGENDIAN(
@@ -344,9 +353,9 @@ BIRD_CHECK_TIME_T
 if test "$enable_debug" = yes ; then
   AC_DEFINE([DEBUGGING], [1], [Define to 1 if debugging is enabled])
   if test "$enable_memcheck" = yes ; then
-    AC_CHECK_LIB(dmalloc, dmalloc_debug)
+    AC_CHECK_LIB([dmalloc], [dmalloc_debug])
     if test $ac_cv_lib_dmalloc_dmalloc_debug != yes ; then
-      AC_CHECK_LIB(efence, malloc)
+      AC_CHECK_LIB([efence], [malloc])
     fi
   fi
 fi
@@ -355,20 +364,35 @@ CLIENT=
 CLIENT_LIBS=
 if test "$enable_client" = yes ; then
   CLIENT=birdc
-  AC_CHECK_LIB(history, add_history, CLIENT_LIBS="-lhistory")
-  AC_CHECK_LIB(ncurses, tgetent, USE_TERMCAP_LIB=-lncurses,
-    AC_CHECK_LIB(curses, tgetent, USE_TERMCAP_LIB=-lcurses,
-      AC_CHECK_LIB(tinfow, tgetent, USE_TERMCAP_LIB=-ltinfow,
-        AC_CHECK_LIB(tinfo, tgetent, USE_TERMCAP_LIB=-ltinfo,
-          AC_CHECK_LIB(termcap, tgetent, USE_TERMCAP_LIB=-ltermcap,
-            AC_MSG_ERROR([[The client requires ncurses library. Either install the library or use --disable-client to compile without the client.]]))))))
-  AC_CHECK_LIB(readline, rl_callback_read_char, CLIENT_LIBS="-lreadline $CLIENT_LIBS $USE_TERMCAP_LIB",
-    AC_MSG_ERROR([[The client requires GNU readline library 2.1 or newer. Either install the library or use --disable-client to compile without the client.]]), $USE_TERMCAP_LIB)
-  AC_CHECK_LIB(readline, rl_crlf, AC_DEFINE([HAVE_RL_CRLF], [1], [Define to 1 if you have rl_crlf()]),,$USE_TERMCAP_LIB)
-  AC_CHECK_LIB(readline, rl_ding, AC_DEFINE([HAVE_RL_DING], [1], [Define to 1 if you have rl_ding()]),,$USE_TERMCAP_LIB)
+  AC_CHECK_LIB([history], [add_history], [CLIENT_LIBS="-lhistory"])
+  AC_CHECK_LIB([ncurses], [tgetent], [USE_TERMCAP_LIB="-lncurses"],
+    AC_CHECK_LIB([curses], [tgetent], [USE_TERMCAP_LIB="-lcurses"],
+      AC_CHECK_LIB([tinfow], [tgetent], [USE_TERMCAP_LIB="-ltinfow"],
+        AC_CHECK_LIB([tinfo], [tgetent], [USE_TERMCAP_LIB="-ltinfo"],
+          AC_CHECK_LIB([termcap], [tgetent], [USE_TERMCAP_LIB="-ltermcap"],
+            [AC_MSG_ERROR([The client requires ncurses library. Either install the library or use --disable-client to compile without the client.])]
+          )
+        )
+      )
+    )
+  )
+  AC_CHECK_LIB([readline], [rl_callback_read_char], [CLIENT_LIBS="-lreadline $CLIENT_LIBS $USE_TERMCAP_LIB"],
+    [AC_MSG_ERROR([The client requires GNU readline library 2.1 or newer. Either install the library or use --disable-client to compile without the client.])],
+    [$USE_TERMCAP_LIB]
+  )
+  AC_CHECK_LIB([readline], [rl_crlf],
+    [AC_DEFINE([HAVE_RL_CRLF], [1], [Define to 1 if you have rl_crlf()])],
+    [],
+    [$USE_TERMCAP_LIB]
+  )
+  AC_CHECK_LIB([readline], [rl_ding],
+    [AC_DEFINE([HAVE_RL_DING], [1], [Define to 1 if you have rl_ding()])],
+    [],
+    [$USE_TERMCAP_LIB]
+  )
 fi
-AC_SUBST(CLIENT)
-AC_SUBST(CLIENT_LIBS)
+AC_SUBST([CLIENT])
+AC_SUBST([CLIENT_LIBS])
 
 mkdir -p $objdir/sysdep
 AC_CONFIG_HEADERS([$objdir/sysdep/autoconf.h:sysdep/autoconf.h.in])
@@ -378,7 +402,7 @@ $srcdir/tools/mergedirs $srcdir $srcdir_rel $objdir $sysdep_dirs]],
   [srcdir_rel=$srcdir_rel]
   [objdir=$objdir]
   [sysdep_dirs="$sysdep_dirs"]])
-AC_CONFIG_FILES($makefiles)
+AC_CONFIG_FILES([$makefiles])
 AC_OUTPUT
 
 rm -f $objdir/sysdep/paths.h
-- 
2.12.0

    

[PATCH 08/13] Consistently quote all macro arguments

Ruben Kerkhof