diff options
Diffstat (limited to 'Build/source/texk/web2c/configure.ac')
-rw-r--r-- | Build/source/texk/web2c/configure.ac | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index 68033caaf36..4b5866436a6 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with Autoconf to produce a configure script for Web2c. dnl -dnl Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org> dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -37,6 +37,8 @@ dnl Common code for all programs using libkpathsea. KPSE_COMMON([web2c programs]) KPSE_CANONICAL_HOST +AM_CONDITIONAL([cross], [test "x$cross_compiling" = xyes]) + AC_PROG_CXX AC_PROG_OBJCXX KPSE_CXX_HACK @@ -274,21 +276,6 @@ AS_IF([test "x$kpse_cv_have_getPDFMajorVersion" = xyes], AC_LANG_POP([C++]) KPSE_RESTORE_FLAGS -# Checks for xpdf (libpoppler) features. -KPSE_ADD_FLAGS([poppler]) -AC_LANG_PUSH([C++]) -AC_CACHE_CHECK([for PDFDoc::getPDFMajorVersion], - [kpse_cv_have_getPDFMajorVersion], - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <PDFDoc.h>]], - [[PDFDoc *pdfDoc; pdfDoc->getPDFMajorVersion();]])], - [kpse_cv_have_getPDFMajorVersion=yes], - [kpse_cv_have_getPDFMajorVersion=no])]) -AS_IF([test "x$kpse_cv_have_getPDFMajorVersion" = xyes], - [AC_DEFINE([HAVE_GETPDFMAJORVERSION], 1, - [Define to 1 if class `PDFDoc' has the `getPDFMajorVersion' member.])]) -AC_LANG_POP([C++]) -KPSE_RESTORE_FLAGS - dnl Write output here, instead of putting a zillion -D's on the command line. AC_CONFIG_HEADERS([w2c/c-auto.h:c-auto.in], [sed -e 's/^#define PACKAGE/#define WEB2C_PACKAGE/' \ @@ -323,8 +310,6 @@ AH_BOTTOM([#endif /* !WEB2C_C_AUTO_H */]) dnl Additional config header for luaTeX AC_CONFIG_HEADERS([ff-config.h:luatexdir/luafontloader/ff-config.in]) -dnl This is also for luatex -KPSE_CROSS_PATH_PROG([TXTTOZLIB], [txt2zlib], [./txt2zlib]) # For cross-compilation. Put at the end so there is a fair chance # these are still visible when the configure script has finished. |