Bring the script out of the dark ages and into modern autoconfness.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16415 91177308-0d34-0410-b5e6-96231b3b80d8

12 files changed, 115 insertions, 124 deletions

diff --git a/autoconf/m4/c_printf_a.m4 b/autoconf/m4/c_printf_a.m4
index 62ed2ac8d7..86f5269d4d 100644
--- a/autoconf/m4/c_printf_a.m4
+++ b/autoconf/m4/c_printf_a.m4
@@ -2,30 +2,31 @@
 # Determine if the printf() functions have the %a format character.
 # This is modified from:
 # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_slist.html
-AC_DEFUN([AC_C_PRINTF_A],
-[
-        AC_MSG_CHECKING([for printf %a format specifier])
-	AC_LANG_SAVE
-	AC_LANG_C
-	AC_RUN_IFELSE(
-		AC_LANG_PROGRAM([#include <stdio.h>
-		                 #include <stdlib.h>],
-		                 [[[
-		                 volatile double A, B;
-		                 char Buffer[100];
-		                 A = 1;
-		                 A /= 10.0;
-		                 sprintf(Buffer, "%a", A);
-		                 B = atof(Buffer);
-		                 if (A != B)
-							 return (1);
-		                 if (A != 0x1.999999999999ap-4)
-							 return (1);
-		                 return (0);]]]),
-		ac_c_printf_a=yes,ac_c_printf_a=no)
-	AC_LANG_RESTORE
-        AC_MSG_RESULT($ac_c_printf_a)
-	if test "$ac_c_printf_a" = "yes"; then
-		AC_DEFINE([HAVE_PRINTF_A],[1],[Define to have the %a format string])
-	fi
+AC_DEFUN([AC_C_PRINTF_A],[
+  AC_MSG_CHECKING([for printf %a format specifier])
+  AC_LANG_PUSH([C])
+  AC_RUN_IFELSE([
+    AC_LANG_PROGRAM([[
+#include <stdio.h>
+#include <stdlib.h>
+]],[[
+volatile double A, B;
+char Buffer[100];
+A = 1;
+A /= 10.0;
+sprintf(Buffer, "%a", A);
+B = atof(Buffer);
+if (A != B)
+  return (1);
+if (A != 0x1.999999999999ap-4)
+  return (1);
+return (0);]])],
+  ac_c_printf_a=yes,
+  ac_c_printf_a=no,
+  ac_c_printf_a=no)
+ AC_LANG_POP([C])
+ AC_MSG_RESULT($ac_c_printf_a)
+ if test "$ac_c_printf_a" = "yes"; then
+   AC_DEFINE([HAVE_PRINTF_A],[1],[Define to have the %a format string])
+ fi
 ])
diff --git a/autoconf/m4/cxx_bidi_iterator.m4 b/autoconf/m4/cxx_bidi_iterator.m4
index e16976d389..959d4fc224 100644
--- a/autoconf/m4/cxx_bidi_iterator.m4
+++ b/autoconf/m4/cxx_bidi_iterator.m4
@@ -6,14 +6,12 @@ AC_DEFUN([AC_CXX_HAVE_BI_ITERATOR],
 [AC_CACHE_CHECK(whether the compiler has the bidirectional iterator,
 ac_cv_cxx_have_bi_iterator,
 [AC_REQUIRE([AC_CXX_NAMESPACES])
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  AC_TRY_COMPILE([#include <iterator>
+  AC_LANG_PUSH([C++])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <iterator>
 #ifdef HAVE_NAMESPACES
 using namespace std;
-#endif],[bidirectional_iterator<int,int> t; return 0;],
-  ac_cv_cxx_have_bi_iterator=yes, ac_cv_cxx_have_bi_iterator=no)
-  AC_LANG_RESTORE
+#endif]], [[bidirectional_iterator<int,int> t; return 0;]])],[ac_cv_cxx_have_bi_iterator=yes],[ac_cv_cxx_have_bi_iterator=no])
+  AC_LANG_POP([C++])
 ])
 HAVE_BI_ITERATOR=0
 if test "$ac_cv_cxx_have_bi_iterator" = yes
diff --git a/autoconf/m4/cxx_fwd_iterator.m4 b/autoconf/m4/cxx_fwd_iterator.m4
index 8da2944b91..73711b5621 100644
--- a/autoconf/m4/cxx_fwd_iterator.m4
+++ b/autoconf/m4/cxx_fwd_iterator.m4
@@ -4,14 +4,12 @@ AC_DEFUN([AC_CXX_HAVE_FWD_ITERATOR],
 [AC_CACHE_CHECK(whether the compiler has forward iterators,
 ac_cv_cxx_have_fwd_iterator,
 [AC_REQUIRE([AC_CXX_NAMESPACES])
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  AC_TRY_COMPILE([#include <iterator>
+  AC_LANG_PUSH([C++])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <iterator>
 #ifdef HAVE_NAMESPACES
 using namespace std;
-#endif],[forward_iterator<int,int> t; return 0;],
-  ac_cv_cxx_have_fwd_iterator=yes, ac_cv_cxx_have_fwd_iterator=no)
-  AC_LANG_RESTORE
+#endif]], [[forward_iterator<int,int> t; return 0;]])],[ac_cv_cxx_have_fwd_iterator=yes],[ac_cv_cxx_have_fwd_iterator=no])
+  AC_LANG_POP([C++])
 ])
 HAVE_FWD_ITERATOR=0
 if test "$ac_cv_cxx_have_fwd_iterator" = yes
diff --git a/autoconf/m4/cxx_hash_map.m4 b/autoconf/m4/cxx_hash_map.m4
index 4cc45f9f0a..cc233a5094 100644
--- a/autoconf/m4/cxx_hash_map.m4
+++ b/autoconf/m4/cxx_hash_map.m4
@@ -4,14 +4,12 @@ AC_DEFUN([AC_CXX_HAVE_STD_EXT_HASH_MAP],
 [AC_CACHE_CHECK([whether the compiler has <ext/hash_map> defining template class std::hash_map],
  ac_cv_cxx_have_std_ext_hash_map,
  [AC_REQUIRE([AC_CXX_NAMESPACES])
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  AC_TRY_COMPILE([#include <ext/hash_map>
+  AC_LANG_PUSH([C++])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <ext/hash_map>
 #ifdef HAVE_NAMESPACES
 using namespace std;
-#endif],[hash_map<int, int> t;],
-  [ac_cv_cxx_have_std_ext_hash_map=yes], [ac_cv_cxx_have_std_ext_hash_map=no])
-  AC_LANG_RESTORE])
+#endif]], [[hash_map<int, int> t;]])],[ac_cv_cxx_have_std_ext_hash_map=yes],[ac_cv_cxx_have_std_ext_hash_map=no])
+  AC_LANG_POP([C++])])
  HAVE_STD_EXT_HASH_MAP=0
  if test "$ac_cv_cxx_have_std_ext_hash_map" = yes
  then
@@ -23,14 +21,12 @@ AC_DEFUN([AC_CXX_HAVE_GNU_EXT_HASH_MAP],
 [AC_CACHE_CHECK([whether the compiler has <ext/hash_map> defining template class __gnu_cxx::hash_map],
  ac_cv_cxx_have_gnu_ext_hash_map,
  [AC_REQUIRE([AC_CXX_NAMESPACES])
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  AC_TRY_COMPILE([#include <ext/hash_map>
+  AC_LANG_PUSH([C++])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <ext/hash_map>
 #ifdef HAVE_NAMESPACES
 using namespace __gnu_cxx;
-#endif],[hash_map<int,int> t; ],
-  [ac_cv_cxx_have_gnu_ext_hash_map=yes],[ac_cv_cxx_have_gnu_ext_hash_map=no])
-  AC_LANG_RESTORE])
+#endif]], [[hash_map<int,int> t; ]])],[ac_cv_cxx_have_gnu_ext_hash_map=yes],[ac_cv_cxx_have_gnu_ext_hash_map=no])
+  AC_LANG_POP([C++])])
  HAVE_GNU_EXT_HASH_MAP=0
  if test "$ac_cv_cxx_have_gnu_ext_hash_map" = yes
  then
@@ -42,11 +38,9 @@ AC_DEFUN([AC_CXX_HAVE_GLOBAL_HASH_MAP],
 [AC_CACHE_CHECK([whether the compiler has <hash_map> defining template class ::hash_map],
  ac_cv_cxx_have_global_hash_map,
  [AC_REQUIRE([AC_CXX_NAMESPACES])
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  AC_TRY_COMPILE([#include <hash_map>],[hash_map<int,int> t; ],
-  [ac_cv_cxx_have_global_hash_map=yes], [ac_cv_cxx_have_global_hash_map=no])
-  AC_LANG_RESTORE])
+  AC_LANG_PUSH([C++])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <hash_map>]], [[hash_map<int,int> t; ]])],[ac_cv_cxx_have_global_hash_map=yes],[ac_cv_cxx_have_global_hash_map=no])
+  AC_LANG_POP([C++])])
  HAVE_GLOBAL_HASH_MAP=0
  if test "$ac_cv_cxx_have_global_hash_map" = yes
  then
diff --git a/autoconf/m4/cxx_hash_set.m4 b/autoconf/m4/cxx_hash_set.m4
index 0e736d9a7d..f83fd25fc2 100644
--- a/autoconf/m4/cxx_hash_set.m4
+++ b/autoconf/m4/cxx_hash_set.m4
@@ -4,14 +4,12 @@ AC_DEFUN([AC_CXX_HAVE_STD_EXT_HASH_SET],
 [AC_CACHE_CHECK([whether the compiler has <ext/hash_set> defining template class std::hash_set],
  ac_cv_cxx_have_std_ext_hash_set,
  [AC_REQUIRE([AC_CXX_NAMESPACES])
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  AC_TRY_COMPILE([#include <ext/hash_set>
+  AC_LANG_PUSH([C++])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <ext/hash_set>
 #ifdef HAVE_NAMESPACES
 using namespace std;
-#endif],[hash_set<int> t; ],
-  [ac_cv_cxx_have_std_ext_hash_set=yes], [ac_cv_cxx_have_std_ext_hash_set=no])
-  AC_LANG_RESTORE])
+#endif]], [[hash_set<int> t; ]])],[ac_cv_cxx_have_std_ext_hash_set=yes],[ac_cv_cxx_have_std_ext_hash_set=no])
+  AC_LANG_POP([C++])])
  HAVE_STD_EXT_HASH_SET=0
  if test "$ac_cv_cxx_have_std_ext_hash_set" = yes
  then
@@ -24,14 +22,12 @@ AC_DEFUN([AC_CXX_HAVE_GNU_EXT_HASH_SET],
  [whether the compiler has <ext/hash_set> defining template class __gnu_cxx::hash_set],
  ac_cv_cxx_have_gnu_ext_hash_set,
  [AC_REQUIRE([AC_CXX_NAMESPACES])
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  AC_TRY_COMPILE([#include <ext/hash_set>
+  AC_LANG_PUSH([C++])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <ext/hash_set>
 #ifdef HAVE_NAMESPACES
 using namespace __gnu_cxx;
-#endif],[hash_set<int> t; ],
-  [ac_cv_cxx_have_gnu_ext_hash_set=yes], [ac_cv_cxx_have_gnu_ext_hash_set=no])
-  AC_LANG_RESTORE])
+#endif]], [[hash_set<int> t; ]])],[ac_cv_cxx_have_gnu_ext_hash_set=yes],[ac_cv_cxx_have_gnu_ext_hash_set=no])
+  AC_LANG_POP([C++])])
  HAVE_GNU_EXT_HASH_SET=0
  if test "$ac_cv_cxx_have_gnu_ext_hash_set" = yes
  then
@@ -43,11 +39,9 @@ AC_DEFUN([AC_CXX_HAVE_GLOBAL_HASH_SET],
 [AC_CACHE_CHECK([whether the compiler has <hash_set> defining template class ::hash_set],
  ac_cv_cxx_have_global_hash_set,
  [AC_REQUIRE([AC_CXX_NAMESPACES])
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  AC_TRY_COMPILE([#include <hash_set>],[hash_set<int> t; return 0;],
-  [ac_cv_cxx_have_global_hash_set=yes], [ac_cv_cxx_have_global_hash_set=no])
-  AC_LANG_RESTORE])
+  AC_LANG_PUSH([C++])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <hash_set>]], [[hash_set<int> t; return 0;]])],[ac_cv_cxx_have_global_hash_set=yes],[ac_cv_cxx_have_global_hash_set=no])
+  AC_LANG_POP([C++])])
  HAVE_GLOBAL_HASH_SET=0
  if test "$ac_cv_cxx_have_global_hash_set" = yes
  then
diff --git a/autoconf/m4/cxx_namespaces.m4 b/autoconf/m4/cxx_namespaces.m4
index 756e378f7f..d8d650e4d4 100644
--- a/autoconf/m4/cxx_namespaces.m4
+++ b/autoconf/m4/cxx_namespaces.m4
@@ -4,12 +4,13 @@
 AC_DEFUN([AC_CXX_NAMESPACES],
 [AC_CACHE_CHECK(whether the compiler implements namespaces,
 ac_cv_cxx_namespaces,
-[AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_TRY_COMPILE([namespace Outer { namespace Inner { int i = 0; }}],
-                [using namespace Outer::Inner; return i;],
- ac_cv_cxx_namespaces=yes, ac_cv_cxx_namespaces=no)
- AC_LANG_RESTORE
+[AC_LANG_PUSH([C++])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+   [[namespace Outer { namespace Inner { int i = 0; }}]],
+   [[using namespace Outer::Inner; return i;]])], 
+   ac_cv_cxx_namespaces=yes, 
+   ac_cv_cxx_namespaces=no)
+ AC_LANG_POP([C++])
 ])
 if test "$ac_cv_cxx_namespaces" = yes; then
   AC_DEFINE(HAVE_NAMESPACES,,[define if the compiler implements namespaces])
diff --git a/autoconf/m4/cxx_std_iterator.m4 b/autoconf/m4/cxx_std_iterator.m4
index 46665f2867..578dcc4a21 100644
--- a/autoconf/m4/cxx_std_iterator.m4
+++ b/autoconf/m4/cxx_std_iterator.m4
@@ -4,14 +4,16 @@ AC_DEFUN([AC_CXX_HAVE_STD_ITERATOR],
 [AC_CACHE_CHECK(whether the compiler has the standard iterator,
 ac_cv_cxx_have_std_iterator,
 [AC_REQUIRE([AC_CXX_NAMESPACES])
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  AC_TRY_COMPILE([#include <iterator>
+  AC_LANG_PUSH([C++])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+    [[#include <iterator>
 #ifdef HAVE_NAMESPACES
 using namespace std;
-#endif],[iterator<int,int,int> t; return 0;],
-  ac_cv_cxx_have_std_iterator=yes, ac_cv_cxx_have_std_iterator=no)
-  AC_LANG_RESTORE
+#endif]],
+  [[iterator<int,int,int> t; return 0;]])],
+  ac_cv_cxx_have_std_iterator=yes, 
+  ac_cv_cxx_have_std_iterator=no)
+  AC_LANG_POP([C++])
 ])
 HAVE_STD_ITERATOR=0
 if test "$ac_cv_cxx_have_std_iterator" = yes
diff --git a/autoconf/m4/func_mmap_file.m4 b/autoconf/m4/func_mmap_file.m4
index 707a1d1b5f..96b5173720 100644
--- a/autoconf/m4/func_mmap_file.m4
+++ b/autoconf/m4/func_mmap_file.m4
@@ -4,9 +4,8 @@
 AC_DEFUN([AC_FUNC_MMAP_FILE],
 [AC_CACHE_CHECK(for mmap of files,
 ac_cv_func_mmap_file,
-[AC_LANG_SAVE
-  AC_LANG_C
-  AC_TRY_RUN([
+[ AC_LANG_PUSH([C])
+  AC_RUN_IFELSE([
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -22,8 +21,8 @@ ac_cv_func_mmap_file,
   int fd;
   int main () {
   fd = creat ("foo",0777); fd = (int) mmap (0, 1, PROT_READ, MAP_SHARED, fd, 0); unlink ("foo"); return (fd != (int) MAP_FAILED);}],
-  ac_cv_func_mmap_file=yes, ac_cv_func_mmap_file=no)
-  AC_LANG_RESTORE
+  ac_cv_func_mmap_file=yes, ac_cv_func_mmap_file=no, ac_cv_func_mmap_file=no)
+  AC_LANG_POP([C])
 ])
 if test "$ac_cv_func_mmap_file" = yes; then
    AC_DEFINE([HAVE_MMAP_FILE],[],[Define if mmap() can map files into memory])
diff --git a/autoconf/m4/header_mmap_anonymous.m4 b/autoconf/m4/header_mmap_anonymous.m4
index 409189b0ee..541926b996 100644
--- a/autoconf/m4/header_mmap_anonymous.m4
+++ b/autoconf/m4/header_mmap_anonymous.m4
@@ -5,18 +5,17 @@
 AC_DEFUN([AC_HEADER_MMAP_ANONYMOUS],
 [AC_CACHE_CHECK(for MAP_ANONYMOUS vs. MAP_ANON,
 ac_cv_header_mmap_anon,
-[AC_LANG_SAVE
-  AC_LANG_C
-  AC_TRY_COMPILE([#include <sys/mman.h>
-  #include <unistd.h>
-  #include <fcntl.h>],
-  [mmap (0, 1, PROT_READ, MAP_ANONYMOUS, -1, 0); return (0);],
-  ac_cv_header_mmap_anon=yes, ac_cv_header_mmap_anon=no)
-  AC_LANG_RESTORE
+[ AC_LANG_PUSH([C])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+    [[#include <sys/mman.h>
+#include <unistd.h>
+#include <fcntl.h>]],
+  [[mmap (0, 1, PROT_READ, MAP_ANONYMOUS, -1, 0); return (0);]])],
+  ac_cv_header_mmap_anon=yes, 
+  ac_cv_header_mmap_anon=no)
+  AC_LANG_POP([C])
 ])
 if test "$ac_cv_header_mmap_anon" = yes; then
    AC_DEFINE([HAVE_MMAP_ANONYMOUS],[],[Define if mmap() uses MAP_ANONYMOUS to map anonymous pages, or undefine if it uses MAP_ANON])
 fi
 ])
-
-
diff --git a/autoconf/m4/libtool.m4 b/autoconf/m4/libtool.m4
index 140b345600..75a9bb52aa 100644
--- a/autoconf/m4/libtool.m4
+++ b/autoconf/m4/libtool.m4
@@ -1,11 +1,16 @@
 ###############################################################################
 ###############################################################################
-############ READ THIS:
-############ The only difference between this version of libtool.m4 and the one
-############ provided with libtool 1.5.10 is this warning header and changing
-############ the name of libtool to mklib. AutoRegen.sh checks for version 
-############ 1.5.10 of libtool so attempts to use another version with this
-############ AC_PROG_LIBTOOL definition should fail. You've been warned.
+####### READ THIS:
+####### THIS FILE IS BASED ON THE VERSION IN libtool 1.5.10.
+####### The following changes have been made:
+#######   * this big bold header has been added
+#######   * fix obsolete constructs (ala autoupdate)
+#######   * the name of the generated tool is "mklib" instead of "libtool"
+####### The last change is provided to avoid tab completion errors on the "lib"
+####### prefix.  AutoRegen.sh checks for version 1.5.10 of libtool so attempts 
+####### to use another version with this AC_PROG_LIBTOOL definition should 
+####### fail. 
+####### You've been warned.
 ###############################################################################
 ###############################################################################
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -226,12 +231,12 @@ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
 enable_win32_dll=yes, enable_win32_dll=no)
 
 AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
+    [AS_HELP_STRING([--disable-libtool-lock],
 	[avoid locking (might break parallel builds)])])
 test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
 AC_ARG_WITH([pic],
-    [AC_HELP_STRING([--with-pic],
+    [AS_HELP_STRING([--with-pic],
 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
     [pic_mode="$withval"],
     [pic_mode=default])
@@ -447,7 +452,7 @@ AC_SUBST(ECHO)
 # -----------
 AC_DEFUN([_LT_AC_LOCK],
 [AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
+    [AS_HELP_STRING([--disable-libtool-lock],
 	[avoid locking (might break parallel builds)])])
 test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
@@ -550,7 +555,8 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
   CFLAGS="$CFLAGS -belf"
   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
     [AC_LANG_PUSH(C)
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LINK_IFELSE([AC_LANG_SOURCE([[]],[[]])],
+       lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
      AC_LANG_POP])
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
@@ -1655,7 +1661,7 @@ test "$dynamic_linker" = no && can_build_shared=no
 # ----------------
 AC_DEFUN([_LT_AC_TAGCONFIG],
 [AC_ARG_WITH([tags],
-    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+    [AS_HELP_STRING([--with-tags@<:@=TAGS@:>@],
         [include additional configurations @<:@automatic@:>@])],
     [tagnames="$withval"])
 
@@ -1689,7 +1695,7 @@ if test -f "$ltmain" && test -n "$tagnames"; then
 
     if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
     then
-      AC_MSG_ERROR([tag name \"$tagname\" already exists])
+      AC_MSG_ERROR([tag name "$tagname" already exists])
     fi
 
     # Update the list of available tags.
@@ -1775,7 +1781,7 @@ AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
 AC_DEFUN([AC_ENABLE_SHARED],
 [define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE([shared],
-    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
 	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
     [p=${PACKAGE-default}
     case $enableval in
@@ -1814,7 +1820,7 @@ AC_ENABLE_SHARED(no)
 AC_DEFUN([AC_ENABLE_STATIC],
 [define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE([static],
-    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
 	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
     [p=${PACKAGE-default}
     case $enableval in
@@ -1853,7 +1859,7 @@ AC_ENABLE_STATIC(no)
 AC_DEFUN([AC_ENABLE_FAST_INSTALL],
 [define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE([fast-install],
-    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
     [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
     [p=${PACKAGE-default}
     case $enableval in
@@ -1993,7 +1999,7 @@ fi
 # find the pathname to the GNU or non-GNU linker
 AC_DEFUN([AC_PROG_LD],
 [AC_ARG_WITH([gnu-ld],
-    [AC_HELP_STRING([--with-gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
 	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
     [test "$withval" = no || with_gnu_ld=yes],
     [with_gnu_ld=no])
@@ -3781,7 +3787,7 @@ CC="$lt_save_CC"
 # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
 AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
 AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
-[AC_LANG_SAVE
+[AC_LANG_PUSH([C])
 
 # Source file extension for Java test sources.
 ac_ext=java
@@ -3824,7 +3830,7 @@ AC_LIBTOOL_DLOPEN_SELF($1)
 
 AC_LIBTOOL_CONFIG($1)
 
-AC_LANG_RESTORE
+AC_LANG_POP([C])
 CC="$lt_save_CC"
 ])# AC_LIBTOOL_LANG_GCJ_CONFIG
 
@@ -3836,7 +3842,7 @@ CC="$lt_save_CC"
 # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
 AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
 AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
-[AC_LANG_SAVE
+[AC_LANG_PUSH([C])
 
 # Source file extension for RC test sources.
 ac_ext=rc
@@ -3863,7 +3869,7 @@ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
 
 AC_LIBTOOL_CONFIG($1)
 
-AC_LANG_RESTORE
+AC_LANG_POP([C])
 CC="$lt_save_CC"
 ])# AC_LIBTOOL_LANG_RC_CONFIG
 
diff --git a/autoconf/m4/link_use_r.m4 b/autoconf/m4/link_use_r.m4
index e553e7e588..09493042f1 100644
--- a/autoconf/m4/link_use_r.m4
+++ b/autoconf/m4/link_use_r.m4
@@ -6,13 +6,12 @@
 AC_DEFUN([AC_LINK_USE_R],
 [
   AC_MSG_CHECKING([for compiler -Wl,-R<path> option])
-  AC_LANG_SAVE
-  AC_LANG_C
+  AC_LANG_PUSH([C])
   oldcflags="$CFLAGS"
   CFLAGS="$CFLAGS -Wl,-R."
   AC_LINK_IFELSE([int main() { return 0; }],[ac_cv_link_use_r=yes],[ac_cv_link_use_r=no])
   CFLAGS="$oldcflags"
-  AC_LANG_RESTORE
+  AC_LANG_POP([C])
   AC_MSG_RESULT($ac_cv_link_use_r)
   if test "$ac_cv_link_use_r" = yes
   then
diff --git a/autoconf/m4/single_cxx_check.m4 b/autoconf/m4/single_cxx_check.m4
index 77ebf38657..516bc9f605 100644
--- a/autoconf/m4/single_cxx_check.m4
+++ b/autoconf/m4/single_cxx_check.m4
@@ -3,9 +3,9 @@ dnl                     $1,        $2,       $3,       $4,     $5
 dnl 
 AC_DEFUN([AC_SINGLE_CXX_CHECK],
 [AC_CACHE_CHECK([for $3 in $4], [$2],
- [AC_LANG_PUSH(C++)
+ [AC_LANG_PUSH([C++])
   AC_COMPILE_IFELSE(AC_LANG_SOURCE([$5]),[$2=yes],[$2=no])
- AC_LANG_POP(C++)])
+ AC_LANG_POP([C++])])
  if test "$$2" = "yes"
  then
    AC_DEFINE($1, 1, [Define to 1 if your compiler defines $3 in the $4