configure.ac: Cleanup.

Also replace old AC_HELP_STRING() with AS_HELP_STRING().

diff --git a/configure.ac b/configure.ac
index ab5135d479ccb1a52fa805f1d220c36fa19d4119..6ddf591b91f7f4b52cc729bd571a42561372d538 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -14,10 +14,12 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-AC_INIT([tlsproxy], [0.2], [simon@ruderich.org])
+AC_PREREQ([2.69])
+AC_INIT([tlsproxy],[0.2],[simon@ruderich.org])
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/tlsproxy.c])
 
 AM_INIT_AUTOMAKE([foreign -Wall -Werror])
@@ -40,18 +42,17 @@ AC_CHECK_LIB([gnutls], [gnutls_certificate_verify_peers2],
              [], [AC_MSG_ERROR([GnuTLS is required])])
 
 AC_ARG_ENABLE([debug],
-              [AC_HELP_STRING([--enable-debug], [enable debug output])],
+              [AS_HELP_STRING([--enable-debug],[enable debug output])],
               [if test "x$enableval" = xyes; then
                    AC_DEFINE([DEBUG], 1, [Define to enable debug output.])
                fi])
 
 AC_ARG_ENABLE([ipv6],
-              [AC_HELP_STRING([--disable-ipv6],
+              [AS_HELP_STRING([--disable-ipv6],
                               [disable IPv6, for IPv4 only network stacks])],
               [if test "x$enableval" = xno; then
                    AC_DEFINE([USE_IPV4_ONLY], 1, [Define to not use IPv6.])
                fi])
 
-AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile])
 AC_OUTPUT