From: Ruben Kerkhof Date: Fri, 11 Mar 2016 10:07:32 +0000 (+0100) Subject: Add some missing quotes in configure.ac X-Git-Tag: dnsdist-1.0.0-beta1~100^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3547%2Fhead;p=thirdparty%2Fpdns.git Add some missing quotes in configure.ac --- diff --git a/configure.ac b/configure.ac index 72d565ee1b..2a1f955163 100644 --- a/configure.ac +++ b/configure.ac @@ -1,13 +1,13 @@ AC_PREREQ([2.61]) -AC_INIT([pdns], m4_esyscmd(build-aux/gen-version)) +AC_INIT([pdns], m4_esyscmd([build-aux/gen-version])) AC_CONFIG_SRCDIR([pdns/receiver.cc]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([build-aux]) -AC_SUBST([pdns_configure_args],["$ac_configure_args"]) +AC_SUBST([pdns_configure_args], ["$ac_configure_args"]) AC_DEFINE_UNQUOTED([PDNS_CONFIG_ARGS], ["$pdns_configure_args"], [pdns configure arguments] @@ -39,18 +39,18 @@ AC_DEFINE([_GNU_SOURCE], [1], ) # Warn when pkg.m4 is missing -m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config]) +m4_pattern_forbid([^_?PKG_[A-Z_]+$], [*** pkg.m4 missing, please install pkg-config]) PDNS_WITH_LUAJIT AS_IF([test "x$with_luajit" = "xno"], [ PDNS_WITH_LUA ]) -AX_CXX_COMPILE_STDCXX_11() +AX_CXX_COMPILE_STDCXX_11 AC_MSG_CHECKING([whether we will enable compiler security checks]) AC_ARG_ENABLE([hardening], - [AS_HELP_STRING([--disable-hardening],[disable compiler security checks @<:@default=no@:>@])], + [AS_HELP_STRING([--disable-hardening], [disable compiler security checks @<:@default=no@:>@])], [enable_hardening=$enableval], [enable_hardening=yes] ) @@ -149,51 +149,51 @@ AS_IF([test "x$static" != "xno"], [ modules="bind gmysql random" AC_ARG_WITH([modules], - [AS_HELP_STRING([--with-modules],[which backends to compile with @<:@default=bind gmysql random@:>@])], + [AS_HELP_STRING([--with-modules], [which backends to compile with @<:@default=bind gmysql random@:>@])], [modules="$withval"] ) dynmodules="pipe" AC_ARG_WITH([dynmodules], - [AS_HELP_STRING([--with-dynmodules],[which backends to build for dynamic loading @<:@default=pipe@:>@])], + [AS_HELP_STRING([--with-dynmodules], [which backends to build for dynamic loading @<:@default=pipe@:>@])], [dynmodules="$withval"] ) -AC_SUBST(socketdir) +AC_SUBST([socketdir]) socketdir="/var/run" AC_ARG_WITH([socketdir], - [AS_HELP_STRING([--with-socketdir],[where the controlsocket lives @<:@default=/var/run@:>@])], + [AS_HELP_STRING([--with-socketdir], [where the controlsocket lives @<:@default=/var/run@:>@])], [socketdir="$withval"] ) -AC_SUBST(moduledirs) -AC_SUBST(moduleobjects) -AC_SUBST(modulelibs) -AC_DEFINE_UNQUOTED([PDNS_MODULES],"$modules", [Built-in modules]) +AC_SUBST([moduledirs]) +AC_SUBST([moduleobjects]) +AC_SUBST([modulelibs]) +AC_DEFINE_UNQUOTED([PDNS_MODULES], "$modules", [Built-in modules]) AC_MSG_CHECKING([whether we will be building the server]) AC_ARG_ENABLE([pdns-server], - [AS_HELP_STRING([--enable-pdns_server],[if we should build the server @<:@default=yes@:>@])], + [AS_HELP_STRING([--enable-pdns_server], [if we should build the server @<:@default=yes@:>@])], [enable_pdns_server=$enableval], [enable_pdns_server=yes] ) AC_MSG_RESULT([$enable_pdns_server]) -AM_CONDITIONAL([WITH_PDNS_SERVER],[test "x$enable_pdns_server" != "xno"]) +AM_CONDITIONAL([WITH_PDNS_SERVER], [test "x$enable_pdns_server" != "xno"]) AC_ARG_ENABLE([gcc-skip-locking], - [AS_HELP_STRING([--enable-gcc-skip-locking],[if we should forcefully skip gcc locking @<:@default=no@:>@])], - [AC_DEFINE(GCC_SKIP_LOCKING,[],[Skip gcc locking])], + [AS_HELP_STRING([--enable-gcc-skip-locking], [if we should forcefully skip gcc locking @<:@default=no@:>@])], + [AC_DEFINE(GCC_SKIP_LOCKING,[], [Skip gcc locking])], ) AC_MSG_CHECKING([whether we will be building and installing the extra tools]) AC_ARG_ENABLE([tools], - [AS_HELP_STRING([--enable-tools],[if we should build and install the tools @<:@default=no@:>@])], + [AS_HELP_STRING([--enable-tools], [if we should build and install the tools @<:@default=no@:>@])], [enable_tools=$enableval], [enable_tools=no] ) AC_MSG_RESULT([$enable_tools]) -AM_CONDITIONAL([TOOLS],[test "x$enable_tools" != "xno"]) +AM_CONDITIONAL([TOOLS], [test "x$enable_tools" != "xno"]) for a in $modules $dynmodules; do @@ -225,7 +225,6 @@ for a in $modules $dynmodules; do AS_IF([test "x$enable_unit_tests" = "xyes"], [PDNS_CHECK_CURL_PROGRAM] ) - have_remotebackend=yes ;; tinydns) @@ -247,9 +246,9 @@ done PDNS_ENABLE_REMOTEBACKEND_ZEROMQ -AM_CONDITIONAL([ORACLE],[test "x$needoracle" = "xyes"]) +AM_CONDITIONAL([ORACLE], [test "x$needoracle" = "xyes"]) -AM_CONDITIONAL([LDAP],[test "x$needldap" = "xyes"]) +AM_CONDITIONAL([LDAP], [test "x$needldap" = "xyes"]) PDNS_CHECK_SQLITE3 AM_CONDITIONAL([SQLITE3], [test "x$needsqlite3" = "xyes"]) @@ -305,7 +304,7 @@ AC_SUBST([YAHTTP_LIBS], ['$(top_builddir)/ext/yahttp/yahttp/libyahttp.la']) CXXFLAGS="$SANITIZER_FLAGS $CXXFLAGS" -AC_ARG_VAR(PACKAGEVERSION,[The version used in secpoll queries]) +AC_ARG_VAR(PACKAGEVERSION, [The version used in secpoll queries]) AS_IF([test "x$PACKAGEVERSION" != "x"], [AC_DEFINE_UNQUOTED([PACKAGEVERSION], "$PACKAGEVERSION", [Set to the package version used for secpoll])] ) diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac index fc90dcc5d5..dfc24377d4 100644 --- a/pdns/dnsdistdist/configure.ac +++ b/pdns/dnsdistdist/configure.ac @@ -29,11 +29,11 @@ AS_IF([test "x$LUAPC" = "x" -a "x$LUAJITPC" = "x"], [ AC_MSG_ERROR([Neither Lua nor LuaJIT found, Lua support is not optional]) ]) -AX_CXX_COMPILE_STDCXX_11(ext,mandatory) +AX_CXX_COMPILE_STDCXX_11([ext], [mandatory]) AC_MSG_CHECKING([whether we will enable compiler security checks]) AC_ARG_ENABLE([hardening], - [AS_HELP_STRING([--disable-hardening],[disable compiler security checks @<:@default=no@:>@])], + [AS_HELP_STRING([--disable-hardening], [disable compiler security checks @<:@default=no@:>@])], [enable_hardening=$enableval], [enable_hardening=yes] ) diff --git a/pdns/recursordist/configure.ac b/pdns/recursordist/configure.ac index c30e589aec..7166d1c011 100644 --- a/pdns/recursordist/configure.ac +++ b/pdns/recursordist/configure.ac @@ -28,9 +28,9 @@ AC_DEFINE([_GNU_SOURCE], [1], ) # Warn when pkg.m4 is missing -m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config]) +m4_pattern_forbid([^_?PKG_[A-Z_]+$], [*** pkg.m4 missing, please install pkg-config]) -AX_CXX_COMPILE_STDCXX_11(ext,mandatory) +AX_CXX_COMPILE_STDCXX_11([ext], [mandatory]) AC_PROG_LIBTOOL PDNS_CHECK_OS @@ -90,16 +90,16 @@ PDNS_CHECK_CURL AC_CHECK_FUNCS([strcasestr]) -AC_SUBST(socketdir) +AC_SUBST([socketdir]) socketdir="/var/run" AC_ARG_WITH([socketdir], - [AS_HELP_STRING([--with-socketdir],[where the controlsocket lives @<:@default=/var/run@:>@])], + [AS_HELP_STRING([--with-socketdir], [where the controlsocket lives @<:@default=/var/run@:>@])], [socketdir="$withval"] ) AC_MSG_CHECKING([whether we will enable compiler security checks]) AC_ARG_ENABLE([hardening], - [AS_HELP_STRING([--disable-hardening],[disable compiler security checks @<:@default=no@:>@])], + [AS_HELP_STRING([--disable-hardening], [disable compiler security checks @<:@default=no@:>@])], [enable_hardening=$enableval], [enable_hardening=yes] )