diff --git a/expat/configure.in b/expat/configure.in
index 2b984fc5..7e968c46 100644
--- a/expat/configure.in
+++ b/expat/configure.in
@@ -51,7 +51,6 @@ LIBAGE=6
 
 AC_CONFIG_HEADER(expat_config.h)
 
-sinclude(conftools/libtool.m4)
 sinclude(conftools/ac_c_bigendian_cross.m4)
 
 AC_LIBTOOL_WIN32_DLL
@@ -63,6 +62,7 @@ AC_SUBST(LIBAGE)
 
 dnl Checks for programs.
 AC_PROG_CC
+AC_PROG_CXX
 AC_PROG_INSTALL
 
 if test "$GCC" = yes ; then
diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c
index 3521c086..614d6b24 100644
--- a/expat/tests/runtests.c
+++ b/expat/tests/runtests.c
@@ -12,6 +12,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdint.h>
 
 #include "expat.h"
 #include "chardata.h"
@@ -1254,7 +1255,7 @@ external_entity_handler(XML_Parser parser,
                         const XML_Char *systemId,
                         const XML_Char *publicId) 
 {
-    long callno = 1 + (long)XML_GetUserData(parser);
+    intptr_t callno = 1 + (intptr_t)XML_GetUserData(parser);
     char *text;
     XML_Parser p2;