=== modified file 'autogen.sh'
--- autogen.sh	2010-09-27 07:26:55 +0000
+++ autogen.sh	2012-12-29 23:02:19 +0000
@@ -86,7 +86,13 @@
 
 echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
 # Prefer earlier versions just so that the earliest supported version gets test coverage by developers.
-if (automake-1.11 --version) < /dev/null > /dev/null 2>&1; then
+if (automake-1.13 --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake-1.13
+   ACLOCAL=aclocal-1.13
+elif (automake-1.12 --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake-1.12
+   ACLOCAL=aclocal-1.12
+elif (automake-1.11 --version) < /dev/null > /dev/null 2>&1; then
    AUTOMAKE=automake-1.11
    ACLOCAL=aclocal-1.11
 elif (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then

=== modified file 'configure.ac'
--- configure.ac	2012-12-16 18:11:41 +0000
+++ configure.ac	2012-12-29 23:16:08 +0000
@@ -21,12 +21,12 @@
   export CC CXX
 ])
 
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
 
 AC_LANG(C++)
 AC_ISC_POSIX
 AC_PROG_CXX
-AM_PROG_CC_STDC
+AC_PROG_CC
 AM_PROG_AS
 AC_PROG_RANLIB
 AC_PROG_INTLTOOL(0.22)
@@ -70,7 +70,7 @@
   AC_MSG_CHECKING([compiler support for -Werror=format-security])
   ink_svd_CPPFLAGS="$CPPFLAGS"
   CPPFLAGS="-Werror=format-security $CPPFLAGS"
-  AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]), [ink_opt_ok=yes], [ink_opt_ok=no])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [ink_opt_ok=yes], [ink_opt_ok=no])
   AC_MSG_RESULT([$ink_opt_ok])
   if test "x$ink_opt_ok" != "xyes"; then
     CPPFLAGS="$ink_svd_CPPFLAGS"
@@ -84,7 +84,7 @@
   AC_MSG_CHECKING([compiler support for -Wno-pointer-sign])
   ink_svd_CFLAGS="$CFLAGS"
   CFLAGS="-Wno-pointer-sign $CFLAGS"
-  AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]), [ink_opt_ok=yes], [ink_opt_ok=no])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [ink_opt_ok=yes], [ink_opt_ok=no])
   AC_MSG_RESULT([$ink_opt_ok])
   if test "x$ink_opt_ok" != "xyes"; then
     CFLAGS="$ink_svd_CFLAGS"
@@ -97,7 +97,7 @@
   AC_MSG_CHECKING([linker tolerates -z relro])
   ink_svd_LDFLAGS="$LDFLAGS"
   LDFLAGS="-Wl,-z,relro $LDFLAGS"
-  AC_LINK_IFELSE(AC_LANG_PROGRAM([]), [ink_opt_ok=yes], [ink_opt_ok=no])
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([])], [ink_opt_ok=yes], [ink_opt_ok=no])
   AC_MSG_RESULT([$ink_opt_ok])
   if test "x$ink_opt_ok" != "xyes"; then
     LDFLAGS="$ink_svd_LDFLAGS"
@@ -138,14 +138,14 @@
 
 # Detect a working version of unordered containers.
 AC_MSG_CHECKING([TR1 unordered_set usability])
-AC_COMPILE_IFELSE([
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
 #include <tr1/unordered_set>
 int main() {
   std::tr1::unordered_set<int> i, j;
   i = j;
   return 0;
 }
-], [unordered_set_works=yes], [unordered_set_works=no])
+])], [unordered_set_works=yes], [unordered_set_works=no])
 if test "x$unordered_set_works" = "xyes"; then
 	AC_MSG_RESULT([ok])
 	AC_DEFINE(HAVE_TR1_UNORDERED_SET, 1, [Has working standard TR1 unordered_set])
@@ -162,13 +162,13 @@
 ignore_strict_aliasing=no
 CXXFLAGS_SAVE=$CXXFLAGS
 CXXFLAGS="$CXXFLAGS -Werror=strict-aliasing"
-AC_COMPILE_IFELSE([
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
 #include <boost/optional.hpp>
 boost::optional<int> x;
 int func() {
   return *x;
 }
-], [ignore_strict_aliasing=no], [ignore_strict_aliasing=yes])
+])], [ignore_strict_aliasing=no], [ignore_strict_aliasing=yes])
 AC_MSG_RESULT($ignore_strict_aliasing)
 CXXFLAGS=$CXXFLAGS_SAVE
 if test "x$ignore_strict_aliasing" = "xyes"; then
@@ -610,7 +610,7 @@
 
 AC_MSG_CHECKING(for new color space API in Poppler)
 popplercolor="no"
-AC_COMPILE_IFELSE([
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
 #include <GfxState.h>
 
 int main() {
@@ -619,7 +619,7 @@
   p = &GfxColorSpace::parse;
   return 0;
 }
-], [popplercolor=yes])
+])], [popplercolor=yes])
 if test "x$popplercolor" = "xyes"; then
 	AC_DEFINE(POPPLER_NEW_COLOR_SPACE_API, 1, [Use color space API from Poppler >= 0.12.2])
 	AC_MSG_RESULT(yes)
@@ -630,7 +630,7 @@
 # Poppler's b604a008 commit changes this
 AC_MSG_CHECKING([whether Poppler's GfxPatch no longer uses GfxColor])
 popplergfxcolor="no"
-AC_COMPILE_IFELSE([
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
 #include <GfxState.h>
 
 int main() {
@@ -639,7 +639,7 @@
   patch.color[[0]][[0]] = color;
   return 0;
 }
-], [popplergfxcolor=yes])
+])], [popplergfxcolor=yes])
 if test "x$popplergfxcolor" = "xyes"; then
 	AC_DEFINE(POPPLER_NEW_GFXPATCH, 1, [GfxPatch no longer uses GfxColor in >= 0.15.1])
 	AC_MSG_RESULT(yes)
@@ -865,10 +865,10 @@
 # Check for Apple Mac OS X Carbon framework
 carbon_ok=no
 AC_MSG_CHECKING([for Mac OS X Carbon support])
-AC_COMPILE_IFELSE([
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
 #include <Carbon/Carbon.h>
 #include <CoreServices/CoreServices.h>
-], [carbon_ok=yes])
+])], [carbon_ok=yes])
 AC_MSG_RESULT($carbon_ok)
 if test "x$carbon_ok" = "xyes"; then
   AC_DEFINE(HAVE_CARBON, 1, [define to 1 if Carbon is available])
@@ -1035,8 +1035,8 @@
   ink_svd_CXXFLAGS="$CXXFLAGS"
   CXXFLAGS="-Wno-unused-parameter $CXXFLAGS"
   # -Wno-unused-parameter isn't accepted by gcc 2.95.
-  AC_COMPILE_IFELSE([int dummy;
-], , CXXFLAGS="-Wno-unused $ink_svd_CXXFLAGS",)
+  AC_COMPILE_IFELSE([AC_LANG_SOURCE([int dummy;
+])], , CXXFLAGS="-Wno-unused $ink_svd_CXXFLAGS",)
   # Note: At least one bug has been caught from unused parameter warnings,
   # so it might be worth trying not to disable it.
   # One way of selectively disabling the warnings (i.e. only where the