Permit 64-bit builds.

diff --git a/configure.ac b/configure.ac
index 1103a0ad40b6fea9fd07df5d1c2bc5193375237e..e109d517657ca23d771b0170f9f61d638fb7f6cc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ AC_PREREQ([2.59])
 AC_INIT([asdcplib], [1.3.19], [asdcplib@cinecert.com])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([src/KM_error.h])
-AC_CONFIG_HEADER([src/config.h])
+#AC_CONFIG_HEADER([src/config.h])
 AM_INIT_AUTOMAKE([1.9 foreign])
 
 # Checks for programs.
@@ -21,6 +21,9 @@ AC_PROG_INSTALL
 AC_PROG_RANLIB
 
 AC_SYS_LARGEFILE
+if test "$ac_cv_sys_largefile_CC" != no; then
+   CXX=$CXX$ac_cv_sys_largefile_CC
+fi
 
 CHECK_SSL
 AX_LIB_EXPAT

diff --git a/src/KM_xml.cpp b/src/KM_xml.cpp
index 2286d9b4d92c3a2e72552b595863ed0562528926..8705ccf5055eea471c54d32287dce742c98e8e89 100644 (file)
--- a/src/KM_xml.cpp
+++ b/src/KM_xml.cpp
@@ -34,7 +34,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <stack>
 #include <map>
 
-#ifdef ASDCP_USE_EXPAT
+#ifdef HAVE_EXPAT
 #include <expat.h>
 #endif
 
@@ -271,7 +271,7 @@ Kumu::XMLElement::GetChildrenWithName(const char* name, ElementList& outList) co
 
 //----------------------------------------------------------------------------------------------------
 
-#ifdef ASDCP_USE_EXPAT
+#ifdef HAVE_EXPAT
 
 
 class ExpatParseContext