--- autoconf/ast_ext_lib.m4	(Asterisk 13.9.1)
+++ autoconf/ast_ext_lib.m4	(working copy)
@@ -14 +14 @@
-    AC_ARG_WITH([$3], AC_HELP_STRING([--with-$3=PATH],[use $2 files in PATH$4]),
+    AC_ARG_WITH([$3], AS_HELP_STRING([--with-$3=PATH],[use $2 files in PATH$4]),
@@ -42 +42 @@
-AC_ARG_WITH([$1], AC_HELP_STRING([--with-$1=PATH], [use $3 in PATH]),
+AC_ARG_WITH([$1], AS_HELP_STRING([--with-$1=PATH], [use $3 in PATH]),
--- autoconf/ast_prog_ld.m4	(Asterisk 13.9.1)
+++ autoconf/ast_prog_ld.m4	(working copy)
@@ -6 +6 @@
-    [AC_HELP_STRING([--with-gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
--- configure.ac	(Asterisk 13.9.1)
+++ configure.ac	(working copy)
@@ -355 +355 @@
-ACX_PTHREAD
+AX_PTHREAD
@@ -685,2 +684,0 @@
-AC_FUNC_SETVBUF_REVERSED
-AC_TYPE_SIGNAL
@@ -1233 +1231 @@
-	[AC_HELP_STRING([--disable-rpath],
+	[AS_HELP_STRING([--disable-rpath],
--- main/editline/configure.in	(Asterisk 13.9.1)
+++ main/editline/configure.in	(working copy)
@@ -4 +4,2 @@
-AC_INIT(Makefile.in)
+AC_INIT
+AC_CONFIG_SRCDIR([Makefile.in])
@@ -277 +278,2 @@
-AC_OUTPUT([Makefile makelist])
+AC_CONFIG_FILES([Makefile makelist])
+AC_OUTPUT