Index: autoconf/configure.ac
===================================================================
--- autoconf/configure.ac	(revision 65850)
+++ autoconf/configure.ac	(working copy)
@@ -40,7 +40,7 @@
 
 dnl Indicate that we require autoconf 2.59 or later. Ths is needed because we
 dnl use some autoconf macros only available in 2.59.
-AC_PREREQ(2.59)
+AC_PREREQ(2.63)
 
 dnl Verify that the source directory is valid. This makes sure that we are
 dnl configuring LLVM and not some other package (it validates --srcdir argument)
@@ -49,6 +49,7 @@
 dnl Place all of the extra autoconf files into the config subdirectory. Tell
 dnl various tools where the m4 autoconf macros are.
 AC_CONFIG_AUX_DIR([autoconf])
+AC_CONFIG_MACRO_DIR([m4])
 
 dnl Quit if the source directory has already been configured.
 dnl NOTE: This relies upon undocumented autoconf behavior.
@@ -538,12 +539,16 @@
 dnl===
 dnl===-----------------------------------------------------------------------===
 
+dnl Check for libtool and the library that has dlopen function.
+LT_INIT([dlopen])
+LTDL_INIT([])
+
 dnl Check for compilation tools
 AC_PROG_CPP
 AC_PROG_CC(gcc)
 AC_PROG_CXX(g++)
 
-AC_PROG_NM
+LT_PATH_NM
 AC_SUBST(NM)
 
 dnl Check for the tools that the makefiles require
@@ -556,7 +561,6 @@
 AC_PATH_PROG(GREP, [grep], [grep])
 AC_PATH_PROG(MKDIR,[mkdir],[mkdir])
 AC_PATH_PROG(MV,   [mv],   [mv])
-AC_PROG_RANLIB
 AC_PATH_PROG(RM,   [rm],   [rm])
 AC_PATH_PROG(SED,  [sed],  [sed])
 AC_PATH_PROG(TAR,  [tar],  [gtar])
@@ -639,13 +643,6 @@
 dnl Determine if the linker supports the -R option.
 AC_LINK_USE_R
 
-dnl Check for libtool and the library that has dlopen function (which must come
-dnl before the AC_PROG_LIBTOOL check in order to enable dlopening libraries with
-dnl libtool).
-AC_LIBTOOL_DLOPEN
-AC_LIB_LTDL
-AC_PROG_LIBTOOL
-
 if test "$lt_cv_dlopen_self" = "yes" ; then
   AC_DEFINE([CAN_DLOPEN_SELF],[1],
               [Define if dlopen(0) will open the symbols of the program])
@@ -813,7 +810,8 @@
 AC_HUGE_VAL_CHECK
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
-AC_TYPE_SIGNAL
+AC_DEFINE_UNQUOTED([RETSIGTYPE],[void],[Define as the return type of signal handlers (`int' or `void').])
+
 AC_STRUCT_TM
 AC_CHECK_TYPES([int64_t],,AC_MSG_ERROR([Type int64_t required but not found]))
 AC_CHECK_TYPES([uint64_t],,
@@ -909,6 +907,7 @@
 
 dnl Propagate the shared library extension that the libltdl checks did to
 dnl the Makefiles so we can use it there too
+AC_DEFINE_UNQUOTED(LTDL_SHLIB_EXT,"$libltdl_cv_shlibext", [Define to the extension used for shared libraries, say, ".so".])
 AC_SUBST(SHLIBEXT,$libltdl_cv_shlibext)
 
 # Translate the various configuration directories and other basic
Index: autoconf/AutoRegen.sh
===================================================================
--- autoconf/AutoRegen.sh	(revision 65850)
+++ autoconf/AutoRegen.sh	(working copy)
@@ -7,7 +7,7 @@
 ### NOTE: ############################################################"
 ### The below two variables specify the auto* versions
 ### periods should be escaped with backslash, for use by grep
-want_autoconf_version='2\.60'
+want_autoconf_version='2\.63'
 want_autoheader_version=$want_autoconf_version
 ### END NOTE #########################################################"
 
@@ -22,12 +22,12 @@
 test -f $configfile || die "Can't find 'autoconf' dir; please cd into it first"
 autoconf --version | grep $want_autoconf_version > /dev/null
 test $? -eq 0 || die "Your autoconf was not detected as being $want_autoconf_version_clean"
-aclocal --version | grep '^aclocal.*1\.9\.6' > /dev/null
-test $? -eq 0 || die "Your aclocal was not detected as being 1.9.6"
+aclocal --version | grep '^aclocal.*1\.10\.1' > /dev/null
+test $? -eq 0 || die "Your aclocal was not detected as being 1.10.1"
 autoheader --version | grep '^autoheader.*'$want_autoheader_version > /dev/null
 test $? -eq 0 || die "Your autoheader was not detected as being $want_autoheader_version_clean"
-libtool --version | grep '1\.5\.22' > /dev/null
-test $? -eq 0 || die "Your libtool was not detected as being 1.5.22"
+#libtool --version | grep '2\.2\.6' > /dev/null
+#test $? -eq 0 || die "Your libtool was not detected as being 2.2.6a"
 echo ""
 echo "### NOTE: ############################################################"
 echo "### If you get *any* warnings from autoconf below you MUST fix the"
@@ -37,7 +37,7 @@
 echo "### present. You should get just three 'Regenerating..' lines."
 echo "######################################################################"
 echo ""
-echo "Regenerating aclocal.m4 with aclocal 1.9.6"
+echo "Regenerating aclocal.m4 with aclocal 1.10.1"
 cwd=`pwd`
 aclocal --force -I $cwd/m4 || die "aclocal failed"
 echo "Regenerating configure with autoconf $want_autoconf_version_clean"
Index: autoconf/m4/path_tclsh.m4
===================================================================
--- autoconf/m4/path_tclsh.m4	(revision 65850)
+++ autoconf/m4/path_tclsh.m4	(working copy)
@@ -19,7 +19,7 @@
   else
     AC_MSG_ERROR([${with_tclinclude} directory doesn't contain tclsh])
   fi
-fi
+fi])
 
 dnl see if one is installed
 if test x"${ac_cv_path_tclsh}" = x ; then
@@ -35,5 +35,5 @@
   TCLSH="${ac_cv_path_tclsh}"
   AC_SUBST(TCLSH)
 fi
-])])
+])
 
