diff options
Diffstat (limited to 'Build/source/texk/dvipdfmx')
-rw-r--r-- | Build/source/texk/dvipdfmx/ac/withenable.ac | 2 | ||||
-rwxr-xr-x | Build/source/texk/dvipdfmx/configure | 37 |
2 files changed, 38 insertions, 1 deletions
diff --git a/Build/source/texk/dvipdfmx/ac/withenable.ac b/Build/source/texk/dvipdfmx/ac/withenable.ac index a41e7d396ee..6233831bc89 100644 --- a/Build/source/texk/dvipdfmx/ac/withenable.ac +++ b/Build/source/texk/dvipdfmx/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for dvipdfmx -KPSE_WITH_PROG([dvipdfmx], [kpathsea libpng]) +KPSE_ENABLE_PROG([dvipdfmx], [kpathsea libpng]) diff --git a/Build/source/texk/dvipdfmx/configure b/Build/source/texk/dvipdfmx/configure index d299bc8fe8c..5c26f7c6f0a 100755 --- a/Build/source/texk/dvipdfmx/configure +++ b/Build/source/texk/dvipdfmx/configure @@ -17245,6 +17245,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` KPATHSEA_RULE='# Rebuild libkpathsea @@ -17284,6 +17285,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` ZLIB_RULE='# Rebuild libz @@ -17323,6 +17325,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` LIBPNG_LIBS=`echo 'BLD/libs/libpng/libpng.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + LIBPNG_DEPEND=`echo 'BLD/libs/libpng/libpng.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` LIBPNG_RULE='# Rebuild libpng @@ -17397,6 +17400,28 @@ $as_echo "$kpse_cv_have_truetype_format" >&6; } if test "x$kpse_cv_have_truetype_format" = xyes; then : else + if test "x$enable_build" = xno; then + { $as_echo "$as_me:$LINENO: WARNING: building dvipdfmx has been disabled and would fail because +Required file formats not found in Kpathsea header files. + +This version of dvipdfmx requires that kpathsea and its headers be available. +If you are sure they are installed and in a standard place, maybe you need a +newer version of kpathsea? You also might try setting the environment +variable CPPFLAGS (or CFLAGS) with -I pointing to the directory containing +the file \"kpathsea/kpathsea.h\" + +" >&5 +$as_echo "$as_me: WARNING: building dvipdfmx has been disabled and would fail because +Required file formats not found in Kpathsea header files. + +This version of dvipdfmx requires that kpathsea and its headers be available. +If you are sure they are installed and in a standard place, maybe you need a +newer version of kpathsea? You also might try setting the environment +variable CPPFLAGS (or CFLAGS) with -I pointing to the directory containing +the file \"kpathsea/kpathsea.h\" + +" >&2;} +else { { $as_echo "$as_me:$LINENO: error: Required file formats not found in Kpathsea header files. This version of dvipdfmx requires that kpathsea and its headers be available. @@ -17418,6 +17443,9 @@ the file \"kpathsea/kpathsea.h\" { (exit 1); exit 1; }; } fi + +fi + { $as_echo "$as_me:$LINENO: checking whether xbasename is declared" >&5 $as_echo_n "checking whether xbasename is declared... " >&6; } if test "${ac_cv_have_decl_xbasename+set}" = set; then @@ -17475,12 +17503,21 @@ $as_echo "$ac_cv_have_decl_xbasename" >&6; } if test "x$ac_cv_have_decl_xbasename" = x""yes; then : else + if test "x$enable_build" = xno; then + { $as_echo "$as_me:$LINENO: WARNING: building dvipdfmx has been disabled and would fail because +This version of dvipdfmx requires xbasename in libkpathsea." >&5 +$as_echo "$as_me: WARNING: building dvipdfmx has been disabled and would fail because +This version of dvipdfmx requires xbasename in libkpathsea." >&2;} +else { { $as_echo "$as_me:$LINENO: error: This version of dvipdfmx requires xbasename in libkpathsea." >&5 $as_echo "$as_me: error: This version of dvipdfmx requires xbasename in libkpathsea." >&2;} { (exit 1); exit 1; }; } fi +fi + + { $as_echo "$as_me:$LINENO: checking whether kpathsea declares the kpse_opentype_format" >&5 $as_echo_n "checking whether kpathsea declares the kpse_opentype_format... " >&6; } |