#
#
# patch "configure.ac"
#  from [16b34b09cda7360d56592b647bdec7b085eda8a6]
#    to [8afceefff458845cded16d7b9aacac2e9e2b37e8]
# 
# patch "m4/numeric_vocab.m4"
#  from [e480ef0a060dfa04bd88b5bf879ccf628f844e25]
#    to [7b35b0b51490c0de010db0f282d23d17f73a5f5d]
#
============================================================
--- configure.ac	16b34b09cda7360d56592b647bdec7b085eda8a6
+++ configure.ac	8afceefff458845cded16d7b9aacac2e9e2b37e8
@@ -47,8 +47,8 @@ AC_HEADER_STDC
 
 # Checks for header files.
 AC_HEADER_STDC
-# Explicitly specifying AC_INCLUDES_DEFAULT gets autoconf not to do all
-# the tests twice.
+dnl Explicitly specifying AC_INCLUDES_DEFAULT gets autoconf not to do all
+dnl the tests twice.
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h sys/file.h \
 		  sys/socket.h sys/time.h termios.h errno.h],,,
 		 [AC_INCLUDES_DEFAULT()])
============================================================
--- m4/numeric_vocab.m4	e480ef0a060dfa04bd88b5bf879ccf628f844e25
+++ m4/numeric_vocab.m4	7b35b0b51490c0de010db0f282d23d17f73a5f5d
@@ -57,6 +57,13 @@ m4_ifdef([AC_LANG_BOOL_COMPILE_TRY], [],
 [AC_DEFUN([AC_LANG_BOOL_COMPILE_TRY],
 [_AC_LANG_DISPATCH([$0], _AC_LANG, $@)])])
 
+dnl AC_COMPUTE_INT is new in autoconf 2.61.
+dnl Let's see if we can get away with just forwarding to the older
+dnl _AC_COMPUTE_INT.
+m4_ifdef([AC_COMPUTE_INT], [],
+[m4_ifdef([_AC_COMPUTE_INT],
+ [AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])])],
+ [m4_fatal([A version of Autoconf that provides AC_COMPUTE_INT or _AC_COMPUTE_INT is required], 63)])])
 
 AC_DEFUN([MTN_ASSERT_EIGHT_BIT_CHARS],
 [AC_LANG_ASSERT([C++])