From c53ee62b496134ca2f712ff5bb1f968c8e18cb9c Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Wed, 16 Oct 2013 17:52:43 +0200 Subject: [PATCH] Replace deprecated AC_HELP_STRING macro --- configure.ac | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/configure.ac b/configure.ac index 219018820..1d28b8968 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ AC_CHECK_PROG([ASCIIDOC], [asciidoc], [asciidoc]) dnl Check for lua AC_MSG_CHECKING(if with lua) -AC_ARG_WITH(lua, AC_HELP_STRING([--with-lua],[use Lua]), [WITH_LUA=$withval],[WITH_LUA=yes]) +AC_ARG_WITH(lua, AS_HELP_STRING([--with-lua],[use Lua]), [WITH_LUA=$withval],[WITH_LUA=yes]) AC_MSG_RESULT($WITH_LUA) if test "$WITH_LUA" != "no"; then @@ -64,7 +64,7 @@ BOOST_REQUIRE([1.35]) BOOST_FOREACH BOOST_PROGRAM_OPTIONS([mt]) BOOST_SERIALIZATION([mt]) -AC_ARG_ENABLE(unit-tests, AC_HELP_STRING([--enable-unit-tests],[enable unit test building]), [enable_unit_tests=yes],[enable_unit_tests=no]) +AC_ARG_ENABLE(unit-tests, AS_HELP_STRING([--enable-unit-tests],[enable unit test building]), [enable_unit_tests=yes],[enable_unit_tests=no]) if test x"$enable_unit_tests" = "xyes"; then BOOST_TEST([mt]) @@ -77,7 +77,7 @@ PKG_PROG_PKG_CONFIG dnl Allow user to require SQLite3 AC_MSG_CHECKING(whether user requires sqlite3) -AC_ARG_WITH(sqlite3, AC_HELP_STRING([--with-sqlite3],[include sqlite3 driver]), [WITH_SQLITE3=$withval],[WITH_SQLITE3=no]) +AC_ARG_WITH(sqlite3, AS_HELP_STRING([--with-sqlite3],[include sqlite3 driver]), [WITH_SQLITE3=$withval],[WITH_SQLITE3=no]) AC_MSG_RESULT($WITH_SQLITE3) SQLITE3PC=sqlite3 if test "$WITH_SQLITE3" != "no"; then @@ -179,7 +179,7 @@ AC_SUBST(DYNLINKFLAGS) AC_MSG_CHECKING(whether we will be doing verbose logging) AC_ARG_ENABLE(verbose-logging, - AC_HELP_STRING([--enable-verbose-logging],[do verbose logging]), [enable_verbose_logging=yes], [enable_verbose_logging=no]) + AS_HELP_STRING([--enable-verbose-logging],[do verbose logging]), [enable_verbose_logging=yes], [enable_verbose_logging=no]) if test $enable_verbose_logging = yes; then AC_DEFINE(VERBOSELOG, 1, [If verbose logging should be enabled]) fi @@ -231,19 +231,19 @@ AC_SUBST(POLARSSL_SUBDIR) AC_MSG_CHECKING(whether we will be linking in Botan 1.10) AC_ARG_ENABLE(botan1.10, - AC_HELP_STRING([--enable-botan1.10],[use Botan 1.10]), [enable_botan110=yes], [enable_botan110=no]) + AS_HELP_STRING([--enable-botan1.10],[use Botan 1.10]), [enable_botan110=yes], [enable_botan110=no]) AC_MSG_RESULT($enable_botan110) 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, - AC_HELP_STRING([--enable-botan1.8],[use Botan 1.8]), [enable_botan18=yes], [enable_botan18=no]) + AS_HELP_STRING([--enable-botan1.8],[use Botan 1.8]), [enable_botan18=yes], [enable_botan18=no]) AC_MSG_RESULT($enable_botan18) AM_CONDITIONAL(BOTAN18,test x"$enable_botan18" = "xyes") AC_MSG_CHECKING(whether we will be linking in Crypto++) AC_ARG_ENABLE(cryptopp, - AC_HELP_STRING([--enable-cryptopp],[use Crypto++]), [enable_cryptopp=yes], [enable_cryptopp=no]) + AS_HELP_STRING([--enable-cryptopp],[use Crypto++]), [enable_cryptopp=yes], [enable_cryptopp=no]) AC_MSG_RESULT($enable_cryptopp) AM_CONDITIONAL(CRYPTOPP,test x"$enable_cryptopp" = "xyes") if test "x$enable_botan110" = "xyes" @@ -267,7 +267,7 @@ then AC_DEFINE(HAVE_CRYPTOPP,1,[If we have cryptopp]) fi -AC_ARG_ENABLE(remotebackend_http, AC_HELP_STRING([--enable-remotebackend-http],[enable HTTP connector for remotebackend]),[enable_remotebackend_http=yes], [enable_remotebackend_http=no]) +AC_ARG_ENABLE(remotebackend_http, AS_HELP_STRING([--enable-remotebackend-http],[enable HTTP connector for remotebackend]),[enable_remotebackend_http=yes], [enable_remotebackend_http=no]) AC_MSG_CHECKING(whether to enable http connector in remotebackend) AC_MSG_RESULT($enable_remotebackend_http) AM_CONDITIONAL(REMOTEBACKEND_HTTP,test x"$enable_remotebackend_http" = "xyes") @@ -284,7 +284,7 @@ fi AC_MSG_CHECKING(whether we should build static binaries) -AC_ARG_ENABLE(static-binaries, AC_HELP_STRING([--enable-static-binaries],[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 ;; @@ -302,13 +302,13 @@ fi modules="gmysql geo random" -AC_ARG_WITH(modules, AC_HELP_STRING([--with-modules],[which backends to compile with]), +AC_ARG_WITH(modules, AS_HELP_STRING([--with-modules],[which backends to compile with]), [ modules="$withval" ]) dynmodules="pipe" -AC_ARG_WITH(dynmodules, AC_HELP_STRING([--with-dynmodules],[which backends to build for dynamic loading]), +AC_ARG_WITH(dynmodules, AS_HELP_STRING([--with-dynmodules],[which backends to build for dynamic loading]), [ dynmodules="$withval" ]) @@ -317,7 +317,7 @@ AC_ARG_WITH(dynmodules, AC_HELP_STRING([--with-dynmodules],[which backends to bu AC_SUBST(socketdir) socketdir="/var/run" -AC_ARG_WITH(socketdir, AC_HELP_STRING([--with-socketdir],[where the controlsocket lives]), +AC_ARG_WITH(socketdir, AS_HELP_STRING([--with-socketdir],[where the controlsocket lives]), [ socketdir="$withval" ]) @@ -329,7 +329,7 @@ AC_DEFINE_UNQUOTED(PDNS_MODULES,"$modules", [Built-in modules]) AC_MSG_CHECKING(whether we will be building the server) AC_ARG_ENABLE(pdns-server, - AC_HELP_STRING([--enable-pdns_server],[if we should build the server]), + AS_HELP_STRING([--enable-pdns_server],[if we should build the server]), [enable_pdns_server=$enableval], [enable_pdns_server=yes]) @@ -343,13 +343,13 @@ fi AC_SUBST(programdescend) AC_ARG_ENABLE(gcc-skip-locking, - AC_HELP_STRING([--enable-gcc-skip-locking],[if we should forcefully skip gcc 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, - AC_HELP_STRING([--enable-tools],[if we should build+install the tools]), + AS_HELP_STRING([--enable-tools],[if we should build+install the tools]), enable_tools=$enableval, enable_tools=no ) @@ -416,8 +416,8 @@ done AM_CONDITIONAL(ORACLE,test x"$needoracle" = "xyes") if test "$needoracle" then - AC_ARG_WITH(oracle_includes, AC_HELP_STRING([--with-oracle-includes=],[instantclient sdk include dir])) - AC_ARG_WITH(oracle_libs, AC_HELP_STRING([--with-oracle-libs=],[instantclient oracle library dir])) + AC_ARG_WITH(oracle_includes, AS_HELP_STRING([--with-oracle-includes=],[instantclient sdk include dir])) + AC_ARG_WITH(oracle_libs, AS_HELP_STRING([--with-oracle-libs=],[instantclient oracle library dir])) if test x"$with_oracle_includes" = "x" then @@ -485,7 +485,7 @@ fi if test "$needmysql" then AC_ARG_WITH(mysql, - AC_HELP_STRING([--with-mysql=],[root directory path of MySQL installation]), + AS_HELP_STRING([--with-mysql=],[root directory path of MySQL installation]), [MYSQL_lib_check="$withval/lib/mysql $with_mysql/lib" MYSQL_inc_check="$withval/include/mysql" MYSQL_config_check="$withval/bin/mysql_config"], @@ -495,14 +495,14 @@ then MYSQL_inc_check="/usr/local/mysql/include/mysql /usr/local/include/mysql \ /opt/mysql/include/mysql /opt/mysql/include /usr/include/mysql /usr/sfw/include/mysql"]) AC_ARG_WITH(mysql-config, - AC_HELP_STRING([--with-mysql-config=],[file path to mysql_config]), + AS_HELP_STRING([--with-mysql-config=],[file path to mysql_config]), [MYSQL_config_check=$withval]) AC_ARG_WITH(mysql-lib, - AC_HELP_STRING([--with-mysql-lib=],[directory path of MySQL library installation]), + AS_HELP_STRING([--with-mysql-lib=],[directory path of MySQL library installation]), [MYSQL_lib_check="$withval/lib/mysql $withval/mysql $withval" MYSQL_config_check="skip"]) AC_ARG_WITH(mysql-includes, - AC_HELP_STRING([--with-mysql-includes=],[directory path of MySQL header installation]), + AS_HELP_STRING([--with-mysql-includes=],[directory path of MySQL header installation]), [MYSQL_inc_check="$withval/include/mysql $withval/mysql $withval" MYSQL_config_check="skip"]) @@ -591,16 +591,16 @@ fi if test "$needpgsql" then AC_ARG_WITH(pgsql, - AC_HELP_STRING([--with-pgsql=],[root directory path of PgSQL installation]), + AS_HELP_STRING([--with-pgsql=],[root directory path of PgSQL installation]), [PGSQL_lib_check="$withval/lib/pgsql $with_pgsql/lib" PGSQL_inc_check="$withval/include/pgsql"], [PGSQL_lib_check="/usr/local/pgsql/lib/pgsql /usr/local/lib/pgsql /opt/pgsql/lib/pgsql /usr/lib/pgsql /usr/local/pgsql/lib /usr/local/lib /opt/pgsql/lib /usr/lib /usr/lib64" PGSQL_inc_check="/usr/local/pgsql/include/pgsql /usr/include /usr/local/include/postgresql/ /usr/local/include /opt/pgsql/include/pgsql /opt/pgsql/include /usr/include/pgsql/ /usr/include/postgresql"]) AC_ARG_WITH(pgsql-lib, - AC_HELP_STRING([--with-pgsql-lib=],[directory path of PgSQL library installation]), + AS_HELP_STRING([--with-pgsql-lib=],[directory path of PgSQL library installation]), [PGSQL_lib_check="$withval/lib/pgsql $withval/pgsql $withval"]) AC_ARG_WITH(pgsql-includes, - AC_HELP_STRING([--with-pgsql-includes=],[directory path of PgSQL header installation]), + AS_HELP_STRING([--with-pgsql-includes=],[directory path of PgSQL header installation]), [PGSQL_inc_check="$withval/include/pgsql $withval/pgsql $withval"]) AC_MSG_CHECKING([for PgSQL library directory]) PGSQL_libdir= -- 2.50.1