]> granicus.if.org Git - pdns/commitdiff
Cleanup configure.ac
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Mon, 6 Jan 2014 14:03:20 +0000 (15:03 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Mon, 6 Jan 2014 14:03:20 +0000 (15:03 +0100)
.gitignore
configure.ac
m4/pdns_enable_botan.m4
m4/pdns_with_cryptopp.m4
m4/pdns_with_lua.m4
m4/pdns_with_mysql.m4
m4/pdns_with_system_polarssl.m4

index 55e5800e97d5be9bf04cbd869ed3e633eb1c9781..8701713343383605f6de1b3f6f02b09c9edbc17a 100644 (file)
@@ -2,6 +2,7 @@
 /Makefile.in
 /aclocal.m4
 /autom4te.cache
+/build-aux/
 /config.cache
 /config.guess
 /config.h
index 02766b6ab7f4ebb43581da0190d4486db561db13..3317dbf79282e05a8ab732a1f89718ae88d88c4f 100644 (file)
@@ -1,17 +1,22 @@
-dnl intro
+AC_PREREQ([2.61])
+
 dnl The following lines may be patched by set-version-auth.
 AC_INIT([pdns], [git])
 dnl AC_SUBST([DIST_HOST], [TO_BE_PATCHED])
 dnl End patch area.
+
 AC_CONFIG_SRCDIR([pdns/receiver.cc])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_AUX_DIR([build-aux])
+
 AM_INIT_AUTOMAKE([foreign tar-ustar -Wno-portability subdir-objects])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
 AC_CANONICAL_HOST
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_HEADERS([config.h])
 AC_C_BIGENDIAN
-AC_PREREQ([2.61])
 : ${CXXFLAGS="-Wall -O2"}
+
 AC_PROG_CC
 AC_PROG_CXX
 AM_PROG_CC_C_O
@@ -19,6 +24,7 @@ AC_PROG_YACC
 AM_PROG_LEX
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
+
 AC_LANG([C++])
 
 m4_ifndef([LT_INIT],[
@@ -27,6 +33,9 @@ AC_PROG_LIBTOOL
 LT_INIT
 ])
 
+AM_CONDITIONAL([RELEASE_BUILD], [test "$PACKAGE_VERSION" != "git"])
+
+
 # detect pkg-config explicitly
 PKG_PROG_PKG_CONFIG
 
@@ -35,8 +44,6 @@ AC_CHECK_PROG([ASCIIDOC], [asciidoc], [asciidoc])
 
 PDNS_WITH_LUA
 
-AM_CONDITIONAL([RELEASE_BUILD], [test "$PACKAGE_VERSION" != "git"])
-
 BOOST_REQUIRE([1.35])
 BOOST_FOREACH
 BOOST_PROGRAM_OPTIONS([mt])
@@ -45,9 +52,13 @@ BOOST_SERIALIZATION([mt])
 PDNS_ENABLE_UNIT_TESTS
 
 dnl Allow user to require SQLite3
-AC_MSG_CHECKING(whether user requires sqlite3)
-AC_ARG_WITH(sqlite3, AS_HELP_STRING([--with-sqlite3],[include sqlite3 driver]), [WITH_SQLITE3=$withval],[WITH_SQLITE3=no])
-AC_MSG_RESULT($WITH_SQLITE3)
+AC_MSG_CHECKING([whether user requires sqlite3])
+AC_ARG_WITH([sqlite3],
+  [AS_HELP_STRING([--with-sqlite3],[include sqlite3 driver @<:@default=no@:>@])],
+  [WITH_SQLITE3=$withval],
+  [WITH_SQLITE3=no]
+)
+AC_MSG_RESULT([$WITH_SQLITE3])
 SQLITE3PC=sqlite3
 if test "$WITH_SQLITE3" != "no"; then
   needsqlite3=yes
@@ -60,10 +71,9 @@ dnl Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_SIZE_T
 
 dnl Checks for library functions.
-AC_CHECK_FUNCS(strcasestr)
+AC_CHECK_FUNCS([strcasestr])
 
 # Check for libdl
-
 LIBS="$LIBS -lz"
 
 my_save_LIBS="$LIBS"
@@ -82,9 +92,8 @@ AC_LINK_IFELSE(
   [has_RTLD_NOW=yes],
   [has_RTLD_NOW=no])
 AC_MSG_RESULT([$has_RTLD_NOW])
-if test "$has_RTLD_NOW" = "no"
-then
-       AC_DEFINE(NEED_RTLD_NOW,,[If host OS misses RTLD_NOW])
+if test "$has_RTLD_NOW" = "no"; then
+  AC_DEFINE(NEED_RTLD_NOW,,[If host OS misses RTLD_NOW])
 fi
 LIBS=$ac_save_LIBS
 
@@ -103,48 +112,47 @@ THREADFLAGS=""
 AM_CONDITIONAL([OS_MACOSX], false)
 case "$host_os" in
 solaris2.10)
-       AC_DEFINE(HAVE_IPV6,1,[If the host operating system understands IPv6])
-       LIBS="-lposix4 -lresolv -lnsl -lsocket -lpthread -lrt $LIBS"
-       CXXFLAGS="-D_REENTRANT $CXXFLAGS"
-       ;;
+  AC_DEFINE(HAVE_IPV6,1,[If the host operating system understands IPv6])
+  LIBS="-lposix4 -lresolv -lnsl -lsocket -lpthread -lrt $LIBS"
+  CXXFLAGS="-D_REENTRANT $CXXFLAGS"
+  ;;
 
 solaris2.8 | solaris2.9 )
-       AC_DEFINE(NEED_POSIX_TYPEDEF,,[If POSIX typedefs need to be defined])
-       AC_DEFINE(NEED_INET_NTOP_PROTO,,[If your OS is so broken that it needs an additional prototype])
-       AC_DEFINE(HAVE_IPV6,1,[If the host operating system understands IPv6])
-       LIBS="-lposix4 -lresolv -lnsl -lsocket -lpthread $LIBS"
-       CXXFLAGS="-D_REENTRANT $CXXFLAGS"
-       ;;
+  AC_DEFINE(NEED_POSIX_TYPEDEF,,[If POSIX typedefs need to be defined])
+  AC_DEFINE(NEED_INET_NTOP_PROTO,,[If your OS is so broken that it needs an additional prototype])
+  AC_DEFINE(HAVE_IPV6,1,[If the host operating system understands IPv6])
+  LIBS="-lposix4 -lresolv -lnsl -lsocket -lpthread $LIBS"
+  CXXFLAGS="-D_REENTRANT $CXXFLAGS"
+  ;;
 solaris2.6 | solaris2.7)
-       AC_DEFINE(NEED_POSIX_TYPEDEF,,[If POSIX typedefs need to be defined])
-       AC_DEFINE(NEED_INET_NTOP_PROTO,,[If your OS is so broken that it needs an additional prototype])
-       LIBS="-lposix4 -lresolv -lnsl -lsocket -lpthread $LIBS"
-       CXXFLAGS="-D_REENTRANT $CXXFLAGS"
-       ;;
+  AC_DEFINE(NEED_POSIX_TYPEDEF,,[If POSIX typedefs need to be defined])
+  AC_DEFINE(NEED_INET_NTOP_PROTO,,[If your OS is so broken that it needs an additional prototype])
+  LIBS="-lposix4 -lresolv -lnsl -lsocket -lpthread $LIBS"
+  CXXFLAGS="-D_REENTRANT $CXXFLAGS"
+  ;;
 linux*)
-       AC_DEFINE(HAVE_IPV6,1,[If the host operating system understands IPv6])
-       DYNLINKFLAGS="-rdynamic"
-       LDFLAGS="$LDFLAGS -lrt"
-       THREADFLAGS="-pthread"
-       CXXFLAGS="-D_GNU_SOURCE $CXXFLAGS"
-       ;;
+  AC_DEFINE(HAVE_IPV6,1,[If the host operating system understands IPv6])
+  DYNLINKFLAGS="-rdynamic"
+  LDFLAGS="$LDFLAGS -lrt"
+  THREADFLAGS="-pthread"
+  CXXFLAGS="-D_GNU_SOURCE $CXXFLAGS"
+  ;;
 darwin11* | darwin12* | darwin13*)
-       AC_DEFINE(HAVE_IPV6,1,[If the host operating system understands IPv6])
-       DYNLINKFLAGS="-rdynamic"
-       LDFLAGS="-pthread $LDFLAGS"
-       CXXFLAGS="-pthread $CXXFLAGS -D__APPLE_USE_RFC_3542"
-       AM_CONDITIONAL([OS_MACOSX], true)
-       ;;
+  AC_DEFINE(HAVE_IPV6,1,[If the host operating system understands IPv6])
+  DYNLINKFLAGS="-rdynamic"
+  LDFLAGS="-pthread $LDFLAGS"
+  CXXFLAGS="-pthread $CXXFLAGS -D__APPLE_USE_RFC_3542"
+  AM_CONDITIONAL([OS_MACOSX], true)
+  ;;
 *)
-       AC_DEFINE(HAVE_IPV6,1,[If the host operating system understands IPv6])
-       DYNLINKFLAGS="-rdynamic"
-       LDFLAGS="-pthread $LDFLAGS"
-       CXXFLAGS="-pthread $CXXFLAGS"
-       ;;
+  AC_DEFINE(HAVE_IPV6,1,[If the host operating system understands IPv6])
+  DYNLINKFLAGS="-rdynamic"
+  LDFLAGS="-pthread $LDFLAGS"
+  CXXFLAGS="-pthread $CXXFLAGS"
+  ;;
 esac
 
 AC_SUBST(THREADFLAGS)
-
 AC_SUBST(DYNLINKFLAGS)
 
 PDNS_ENABLE_VERBOSE_LOGGING
@@ -154,184 +162,172 @@ PDNS_WITH_CRYPTOPP
 PDNS_ENABLE_REMOTEBACKEND_HTTP
 PDNS_ENABLE_REMOTEBACKEND_ZEROMQ
 
-AC_MSG_CHECKING(whether we should build static binaries)
+AC_MSG_CHECKING([whether we should build static binaries])
 
-AC_ARG_ENABLE(static-binaries, AS_HELP_STRING([--enable-static-binaries],[Build static binaries]),
-     [case "${enableval}" in
-       yes) static=true ;;
-       no)  static=false ;;
-       *) AC_MSG_ERROR(bad value ${enableval} for --enable-static-binaries) ;;
-     esac],[debug=false])
-AC_MSG_RESULT($static)
+AC_ARG_ENABLE([static-binaries],
+  [AS_HELP_STRING([--enable-static-binaries],[build static binaries])],
+  [case "${enableval}" in
+    yes) static=true ;;
+    no)  static=false ;;
+    *) AC_MSG_ERROR(bad value ${enableval} for --enable-static-binaries) ;;
+   esac],
+   [debug=false]
+)
+AC_MSG_RESULT([$static])
 
-AM_CONDITIONAL(ALLSTATIC, test x$static = xtrue)
+AM_CONDITIONAL([ALLSTATIC], [test "x$static" = "xtrue"])
 
-if test x$static = xtrue;
-then
-       LDFLAGS="-all-static $LDFLAGS"
+if test "x$static" = "xtrue"; then
+  LDFLAGS="-all-static $LDFLAGS"
 fi
 
-
-
 modules="bind gmysql geo random"
-AC_ARG_WITH(modules, AS_HELP_STRING([--with-modules],[which backends to compile with]),
-[
-        modules="$withval"
-])
+AC_ARG_WITH([modules],
+  [AS_HELP_STRING([--with-modules],[which backends to compile with @<:@default=gmysql geo random@:>@])],
+  [modules="$withval"]
+)
 
 dynmodules="pipe"
-AC_ARG_WITH(dynmodules, AS_HELP_STRING([--with-dynmodules],[which backends to build for dynamic loading]),
-[
-        dynmodules="$withval"
-])
-
-
+AC_ARG_WITH([dynmodules],
+  [AS_HELP_STRING([--with-dynmodules],[which backends to build for dynamic loading @<:@default=pipe@:>@])],
+  [dynmodules="$withval"]
+)
 
 AC_SUBST(socketdir)
 socketdir="/var/run"
-AC_ARG_WITH(socketdir, AS_HELP_STRING([--with-socketdir],[where the controlsocket lives]),
-[
-        socketdir="$withval"
-])
+AC_ARG_WITH([socketdir],
+  [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_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]),
-       [enable_pdns_server=$enableval],
-       [enable_pdns_server=yes])
+AC_DEFINE_UNQUOTED([PDNS_MODULES],"$modules", [Built-in modules])
 
-AC_MSG_RESULT($enable_pdns_server)
+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@:>@])],
+  [enable_pdns_server=$enableval],
+  [enable_pdns_server=yes]
+)
+AC_MSG_RESULT([$enable_pdns_server])
 
-if test x"$enable_pdns_server" = "xyes"
-then
-       programdescend=pdns
-fi
+AS_IF([test "x$enable_pdns_server" = "xyes"],
+  [programdescend=pdns]
+)
 
 AC_SUBST(programdescend)
 
-AC_ARG_ENABLE(gcc-skip-locking,
- AS_HELP_STRING([--enable-gcc-skip-locking],[if we should forcefully skip gcc locking]),
-       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+install the tools]),
-       enable_tools=$enableval,
-       enable_tools=no )
-
-AC_MSG_RESULT($enable_tools)
-AM_CONDITIONAL(TOOLS,test x"$enable_tools" = "xyes")
-
-for a in $modules $dynmodules
-do
-       case "$a" in
-                oracle|goracle)
-                        needoracle=yes
-               ;;
-               gmysql )
-                       needmysql=yes
-               ;;
-               mydns )
-                       needmysql=yes
-               ;;
-               gpgsql )
-                       needpgsql=yes
-               ;;
-               gsqlite3 )
-                       needsqlite3=yes
-               ;;
-               pdns )
-                       needmysql=yes
-               ;;
-               ldap)
-                       PDNS_CHECK_LDAP
-               ;;
-               opendbx)
-                       PDNS_CHECK_OPENDBX
-               ;;
-               tinydns)
-                       needcdb=yes
-               ;;
-       esac
+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])],
+)
+
+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@:>@])],
+  [enable_tools=$enableval],
+  [enable_tools=no]
+)
+
+AC_MSG_RESULT([$enable_tools])
+AM_CONDITIONAL([TOOLS],[test "x$enable_tools" = "xyes"])
+
+for a in $modules $dynmodules; do
+  case "$a" in
+    oracle|goracle)
+      PDNS_WITH_ORACLE
+      needoracle=yes
+      ;;
+    mydns|gmysql|pdns)
+      PDNS_WITH_MYSQL
+      ;;
+    gpgsql)
+      PDNS_WITH_POSTGRESQL
+      ;;
+    gsqlite3)
+      needsqlite3=yes
+      ;;
+    ldap)
+      PDNS_CHECK_LDAP
+      ;;
+    opendbx)
+      PDNS_CHECK_OPENDBX
+      ;;
+    tinydns)
+      PDNS_CHECK_CDB
+      ;;
+  esac
 done
 
-AM_CONDITIONAL(ORACLE,test x"$needoracle" = "xyes")
-if test "$needoracle"; then
-       PDNS_WITH_ORACLE
-fi
-
-if test "$needmysql"
-then
-       PDNS_WITH_MYSQL
+AM_CONDITIONAL([ORACLE],[test "x$needoracle" = "xyes"])
+
+AM_CONDITIONAL([SQLITE3], [test "x$needsqlite3" = "xyes"])
+if test "$needsqlite3"; then
+  PKG_CHECK_MODULES([SQLITE3], $SQLITE3PC,
+    [HAVE_SQLITE3=yes],
+    [AC_MSG_ERROR([Could not find sqlite3])]
+  )
+  AC_SUBST(SQLITE3_LIBS)
+  AC_SUBST(SQLITE3_CFLAGS)
+  AC_DEFINE([HAVE_SQLITE3],[1],[If we have sqlite3])
 fi
 
-if test "$needpgsql"; then
-       PDNS_WITH_POSTGRESQL
-fi
-
-AM_CONDITIONAL(SQLITE3, test "$needsqlite3")
-if test "$needsqlite3"
-then
-       PKG_CHECK_MODULES(SQLITE3, $SQLITE3PC, HAVE_SQLITE3=yes, AC_MSG_ERROR([+Could not find sqlite3]))
-        AC_SUBST(SQLITE3_LIBS)
-        AC_SUBST(SQLITE3_CFLAGS)
-        AC_DEFINE(HAVE_SQLITE3,1,[If we have sqlite3])
-fi
-
-if test "$needcdb"; then
-       PDNS_CHECK_CDB
-fi
-
-for a in $modules
-do
-        moduledirs="$moduledirs ${a}backend"
-
-       for b in `cat $srcdir/modules/${a}backend/OBJECTFILES`
-       do
-               moduleobjects="$moduleobjects ../modules/${a}backend/$b"
-       done
-       modulelibs="$modulelibs `cat $srcdir/modules/${a}backend/OBJECTLIBS`"
-
-       if test ${a} = "gpgsql"; then
-               LIBS="$LIBS $LIBCRYPT"
-       
-               case "$host_os" in
-               freebsd*)
-                       ;;
-               darwin*)
-                       modulelibs="$modulelibs -lresolv"
-                       ;;
-               *)
-                       modulelibs="$modulelibs -lresolv -lnsl"
-                       ;;
-               esac
-       fi
+for a in $modules; do
+  moduledirs="$moduledirs ${a}backend"
+
+  for b in `cat $srcdir/modules/${a}backend/OBJECTFILES`; do
+    moduleobjects="$moduleobjects ../modules/${a}backend/$b"
+  done
+  modulelibs="$modulelibs `cat $srcdir/modules/${a}backend/OBJECTLIBS`"
+
+  if test ${a} = "gpgsql"; then
+    LIBS="$LIBS $LIBCRYPT"
+
+    case "$host_os" in
+      freebsd*)
+        ;;
+      darwin*)
+        modulelibs="$modulelibs -lresolv"
+        ;;
+      *)
+        modulelibs="$modulelibs -lresolv -lnsl"
+        ;;
+    esac
+  fi
 done
 
-for a in $dynmodules
-do
-        moduledirs="$moduledirs ${a}backend"
+for a in $dynmodules; do
+  moduledirs="$moduledirs ${a}backend"
 done
 
 AC_SUBST(LIBS)
 
 export moduledirs moduleobjects modulelibs
 
-AC_CONFIG_FILES([Makefile modules/Makefile pdns/Makefile codedocs/Makefile \
-pdns/pdns modules/bindbackend/Makefile
-modules/gmysqlbackend/Makefile modules/db2backend/Makefile \
-modules/geobackend/Makefile modules/opendbxbackend/Makefile \
-modules/pipebackend/Makefile modules/oraclebackend/Makefile \
-modules/gpgsqlbackend/Makefile modules/ldapbackend/Makefile \
-modules/gsqlite3backend/Makefile \
-modules/goraclebackend/Makefile modules/mydnsbackend/Makefile \
-modules/luabackend/Makefile modules/tinydnsbackend/Makefile \
-modules/remotebackend/Makefile \
-modules/randombackend/Makefile])
+AC_CONFIG_FILES([
+  Makefile
+  modules/Makefile
+  pdns/Makefile
+  codedocs/Makefile
+  pdns/pdns
+  modules/bindbackend/Makefile
+  modules/db2backend/Makefile
+  modules/geobackend/Makefile
+  modules/gmysqlbackend/Makefile
+  modules/goraclebackend/Makefile
+  modules/gpgsqlbackend/Makefile
+  modules/gsqlite3backend/Makefile
+  modules/ldapbackend/Makefile
+  modules/luabackend/Makefile
+  modules/mydnsbackend/Makefile
+  modules/opendbxbackend/Makefile
+  modules/oraclebackend/Makefile
+  modules/pipebackend/Makefile
+  modules/randombackend/Makefile
+  modules/remotebackend/Makefile
+  modules/tinydnsbackend/Makefile
+])
 AC_OUTPUT
+
index 956f1d3414894155a201457d3b1c2610c1f7c418..7a034d4f689bdea2c8d8e37ecada58bcc2c89a79 100644 (file)
@@ -1,9 +1,7 @@
 AC_DEFUN([PDNS_ENABLE_BOTAN],[
   AC_MSG_CHECKING([whether we will be linking in Botan 1.10])
-  AC_ARG_ENABLE([botan1.10], [
-    AS_HELP_STRING([--enable-botan1.10],
-      [use Botan 1.10]
-    )],
+  AC_ARG_ENABLE([botan1.10],
+    [AS_HELP_STRING([--enable-botan1.10],[use Botan 1.10 @<:@default=no@:>@])],
     [enable_botan110=yes],
     [enable_botan110=no]
   )
@@ -11,10 +9,8 @@ AC_DEFUN([PDNS_ENABLE_BOTAN],[
   AM_CONDITIONAL(BOTAN110, [test "x$enable_botan110" = "xyes"])
 
   AC_MSG_CHECKING([whether we will be linking in Botan 1.8])
-  AC_ARG_ENABLE([botan1.8], [
-    AS_HELP_STRING([--enable-botan1.8],
-      [use Botan 1.8]
-    )],
+  AC_ARG_ENABLE([botan1.8],
+    [AS_HELP_STRING([--enable-botan1.8],[use Botan 1.8 @<:@default=no@:>@])],
     [enable_botan18=yes],
     [enable_botan18=no]
   )
index 7608fa1f35b1b4ec03466fddf4ccf9f37349a45c..055ccb0f78ac667cce4390d4fdfe5ddf35adb8b8 100644 (file)
@@ -1,8 +1,7 @@
 AC_DEFUN([PDNS_WITH_CRYPTOPP],[
   AC_MSG_CHECKING([whether we will be linking in Crypto++])
   AC_ARG_ENABLE([cryptopp],
-    AS_HELP_STRING([--enable-cryptopp],
-      [use Crypto++]),
+    [AS_HELP_STRING([--enable-cryptopp],[use Crypto++ @<:@default=no@:>@])],
     [enable_cryptopp=yes],
     [enable_cryptopp=no]
   )
index 3d7e7d39b4571f9a408b4570644f02f4638c3b21..620c1f5d75fa516148550ff2d837f0b0127bae2c 100644 (file)
@@ -1,8 +1,7 @@
 AC_DEFUN([PDNS_WITH_LUA],[
   dnl Check for lua
   AC_ARG_WITH([lua],
-    [AS_HELP_STRING([--with-lua],
-      [Build Lua Bindings @<:@default=yes@:>@])],
+    [AS_HELP_STRING([--with-lua], [build Lua Bindings @<:@default=yes@:>@])],
     [with_lua=$withval],
     [with_lua=yes])
 
index c4bc62fa9bc49523fb0433a9953c636d983b0d78..b4d106399f744644b4438fd85f2f33bf021b623c 100644 (file)
@@ -1,8 +1,6 @@
 AC_DEFUN([PDNS_WITH_MYSQL],[
-  AC_ARG_WITH([mysql],[
-    AS_HELP_STRING([--with-mysql=<path>],
-      [root directory path of MySQL installation]
-    )],
+  AC_ARG_WITH([mysql],
+    [AS_HELP_STRING([--with-mysql=<path>], [root directory path of MySQL installation])],
     [
       MYSQL_lib_check="$withval/lib/mysql $with_mysql/lib"
       MYSQL_inc_check="$withval/include/mysql"
@@ -17,27 +15,21 @@ AC_DEFUN([PDNS_WITH_MYSQL],[
     ]
   )
 
-  AC_ARG_WITH([mysql-config],[
-    AS_HELP_STRING([--with-mysql-config=<path>],
-      [file path to mysql_config]
-    )],
+  AC_ARG_WITH([mysql-config],
+    [AS_HELP_STRING([--with-mysql-config=<path>], [file path to mysql_config])],
     [MYSQL_config_check=$withval]
   )
 
-  AC_ARG_WITH([mysql-lib],[
-    AS_HELP_STRING([--with-mysql-lib=<path>],
-      [directory path of MySQL library installation]
-    )],
+  AC_ARG_WITH([mysql-lib],
+    [AS_HELP_STRING([--with-mysql-lib=<path>], [directory path of MySQL library installation])],
     [
       MYSQL_lib_check="$withval/lib/mysql $withval/mysql $withval"
       MYSQL_config_check="skip"
     ]
   )
 
-  AC_ARG_WITH([mysql-includes],[
-    AS_HELP_STRING([--with-mysql-includes=<path>],
-      [directory path of MySQL header installation]
-    )],
+  AC_ARG_WITH([mysql-includes],
+    [AS_HELP_STRING([--with-mysql-includes=<path>], [directory path of MySQL header installation])],
     [
       MYSQL_inc_check="$withval/include/mysql $withval/mysql $withval"
       MYSQL_config_check="skip"
index b3da9400fb2dd3350d629d4b14acf1ac6087fdaa..4e1ae22d4b2055032b531463cc7ef2d3a76d119e 100644 (file)
@@ -1,7 +1,6 @@
 AC_DEFUN([PDNS_WITH_SYSTEM_POLARSSL],[
-  AC_ARG_WITH([system-polarssl],[
-    AS_HELP_STRING([--with-system-polarssl],
-      [use system PolarSSL @<:@default=no@:>@])],
+  AC_ARG_WITH([system-polarssl],
+    [AS_HELP_STRING([--with-system-polarssl], [use system PolarSSL @<:@default=no@:>@])],
     [],
     [with_system_polarssl=no],
   )