diff options
28 files changed, 667 insertions, 60 deletions
diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in index e699cb75502..a8b27cd8a21 100644 --- a/Build/source/Makefile.in +++ b/Build/source/Makefile.in @@ -51,6 +51,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-common.m4 \ $(top_srcdir)/m4/kpse-t1lib-flags.m4 \ $(top_srcdir)/m4/kpse-teckit-flags.m4 \ $(top_srcdir)/m4/kpse-web2c.m4 \ + $(top_srcdir)/m4/kpse-xpdf-flags.m4 \ $(top_srcdir)/m4/kpse-zlib-flags.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ @@ -118,6 +119,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-common.m4 \ $(top_srcdir)/libs/freetype/ac/freetype.ac \ $(top_srcdir)/libs/freetype2/ac/freetype2.ac \ $(top_srcdir)/libs/gd/ac/gd.ac \ + $(top_srcdir)/libs/xpdf/ac/xpdf.ac \ $(top_srcdir)/libs/graphite/ac/graphite.ac \ $(top_srcdir)/libs/teckit/ac/teckit.ac \ $(top_srcdir)/texk/kpathsea/ac/kpathsea.ac \ @@ -211,6 +213,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/Build/source/aclocal.m4 b/Build/source/aclocal.m4 index 3f8f765dd6f..b5928752061 100644 --- a/Build/source/aclocal.m4 +++ b/Build/source/aclocal.m4 @@ -918,6 +918,7 @@ m4_include([m4/kpse-setup.m4]) m4_include([m4/kpse-t1lib-flags.m4]) m4_include([m4/kpse-teckit-flags.m4]) m4_include([m4/kpse-web2c.m4]) +m4_include([m4/kpse-xpdf-flags.m4]) m4_include([m4/kpse-zlib-flags.m4]) m4_include([m4/libtool.m4]) m4_include([m4/ltoptions.m4]) diff --git a/Build/source/configure b/Build/source/configure index 7c02cedec89..35faadcf388 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -792,6 +792,7 @@ LIBOBJS subdirs build_kpathsea_FALSE build_kpathsea_TRUE +PKG_CONFIG FT2_CONFIG CXXCPP am__fastdepCXX_FALSE @@ -1013,6 +1014,7 @@ with_graphite with_system_graphite with_graphite_includes with_graphite_libdir +with_system_xpdf with_system_gd with_gd_includes with_gd_libdir @@ -1815,6 +1817,8 @@ Optional Packages: graphite headers installed in DIR --with-graphite-libdir=DIR graphite library installed in DIR + --with-system-xpdf use installed poppler headers and library instead of + xpdf (requires pkg-config) --with-system-gd use installed gd headers and library --with-gd-includes=DIR gd headers installed in DIR --with-gd-libdir=DIR gd library installed in DIR @@ -3614,6 +3618,33 @@ fi ## libs/xpdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/xpdf/ ## configure options and TL libraries required for xpdf +# Check whether --with-system-xpdf was given. +if test "${with_system_xpdf+set}" = set; then + withval=$with_system_xpdf; +fi +if test "x$with_system_xpdf" = x; then + if test -f $srcdir/libs/xpdf/configure; then + { $as_echo "$as_me:$LINENO: Assuming \`xpdf' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`xpdf' headers and library from TL tree" >&6;} + with_system_xpdf=no + else + { $as_echo "$as_me:$LINENO: Assuming installed \`xpdf' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`xpdf' headers and library" >&6;} + with_system_xpdf=yes + fi + ac_configure_args="$ac_configure_args '--with-system-xpdf=$with_system_xpdf'" +elif test "x$with_system_xpdf" = xyes; then + { $as_echo "$as_me:$LINENO: Using installed \`xpdf' headers and library" >&5 +$as_echo "$as_me: Using installed \`xpdf' headers and library" >&6;} +else + { $as_echo "$as_me:$LINENO: Using \`xpdf' headers and library from TL tree" >&5 +$as_echo "$as_me: Using \`xpdf' headers and library from TL tree" >&6;} + if test "x$with_system_xpdf" != xno; then + with_system_xpdf=no + ac_configure_args="$ac_configure_args '--without-system-xpdf'" + fi +fi + ## libs/gd/kpse/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/ ## configure options and TL libraries required for gd @@ -5931,13 +5962,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5934: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5965: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5937: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5968: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5940: output\"" >&5) + (eval echo "\"\$as_me:5971: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7143,7 +7174,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7146 "configure"' > conftest.$ac_ext + echo '#line 7177 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9190,11 +9221,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9193: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9224: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9197: \$? = $ac_status" >&5 + echo "$as_me:9228: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9529,11 +9560,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9532: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9563: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9536: \$? = $ac_status" >&5 + echo "$as_me:9567: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9634,11 +9665,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9637: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9668: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9641: \$? = $ac_status" >&5 + echo "$as_me:9672: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9689,11 +9720,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9692: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9723: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9696: \$? = $ac_status" >&5 + echo "$as_me:9727: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12489,7 +12520,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12492 "configure" +#line 12523 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12585,7 +12616,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12588 "configure" +#line 12619 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18981,11 +19012,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18984: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19015: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18988: \$? = $ac_status" >&5 + echo "$as_me:19019: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -19080,11 +19111,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19083: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19114: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19087: \$? = $ac_status" >&5 + echo "$as_me:19118: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19132,11 +19163,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19135: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19166: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19139: \$? = $ac_status" >&5 + echo "$as_me:19170: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -20260,10 +20291,6 @@ fi if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` FREETYPE2_LIBS=`$FT2_CONFIG --libs` -else - { { $as_echo "$as_me:$LINENO: error: Can not use installed freetype2 headers and library" >&5 -$as_echo "$as_me: error: Can not use installed freetype2 headers and library" >&2;} - { (exit 1); exit 1; }; } fi if test "x$with_gd_includes" != x && test "x$with_gd_includes" != xyes; then @@ -20274,6 +20301,106 @@ if test "x$with_gd_libdir" != x && test "x$with_gd_libdir" != xyes; then GD_LIBS="-L$with_gd_libdir $GD_LIBS" fi +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_PKG_CONFIG+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$PKG_CONFIG"; then + ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +PKG_CONFIG=$ac_cv_prog_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_PKG_CONFIG"; then + ac_ct_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_PKG_CONFIG+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_PKG_CONFIG"; then + ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG +if test -n "$ac_ct_PKG_CONFIG"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_PKG_CONFIG" >&5 +$as_echo "$ac_ct_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_PKG_CONFIG" = x; then + PKG_CONFIG="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_ct_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" +fi + +if $PKG_CONFIG poppler --atleast-version=0.10; then + POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"' + XPDF_INCLUDES=`$PKG_CONFIG poppler --cflags` + XPDF_INCLUDES=`echo $XPDF_INCLUDES` + XPDF_INCLUDES="$POPPLER_VERSION $XPDF_INCLUDES $XPDF_INCLUDES/goo" + XPDF_LIBS=`$PKG_CONFIG poppler --libs` +fi + if test "x$with_graphite_includes" != x && test "x$with_graphite_includes" != xyes; then GRAPHITE_INCLUDES="-I$with_graphite_includes" fi @@ -21897,6 +22024,272 @@ done fi +## libs/xpdf/ac/xpdf.ac: configure.ac fragment for the TeX Live subdirectory libs/xpdf/ +## define required functions and headers from system xpdf +if test "x$need_xpdf:$with_system_xpdf" = 'xyes:yes'; then + { $as_echo "$as_me:$LINENO: checking requested system \`xpdf' library..." >&5 +$as_echo "$as_me: checking requested system \`xpdf' library..." >&6;} + CPPFLAGS="$XPDF_INCLUDES $CPPFLAGS" + LIBS="$XPDF_LIBS $LIBS" + +for ac_func in free +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +else + syslib_status=no +fi +done + + +for ac_header in gtypes.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## ---------------------------- ## +## Report this to tex-k@tug.org ## +## ---------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + +fi +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +else + syslib_status=no +fi + +done + +fi + + ## libs/graphite/ac/graphite.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite/ ## define required functions and headers from system graphite ac_ext=cpp diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in index 762a58dafb5..a07d875ecb6 100644 --- a/Build/source/libs/Makefile.in +++ b/Build/source/libs/Makefile.in @@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \ $(top_srcdir)/../m4/kpse-t1lib-flags.m4 \ $(top_srcdir)/../m4/kpse-teckit-flags.m4 \ $(top_srcdir)/../m4/kpse-web2c.m4 \ + $(top_srcdir)/../m4/kpse-xpdf-flags.m4 \ $(top_srcdir)/../m4/kpse-zlib-flags.m4 \ $(top_srcdir)/../ac/withenable.ac \ $(top_srcdir)/../utils/ac/withenable.ac \ diff --git a/Build/source/libs/aclocal.m4 b/Build/source/libs/aclocal.m4 index 9fae18de399..238046dc260 100644 --- a/Build/source/libs/aclocal.m4 +++ b/Build/source/libs/aclocal.m4 @@ -630,4 +630,5 @@ m4_include([../m4/kpse-setup.m4]) m4_include([../m4/kpse-t1lib-flags.m4]) m4_include([../m4/kpse-teckit-flags.m4]) m4_include([../m4/kpse-web2c.m4]) +m4_include([../m4/kpse-xpdf-flags.m4]) m4_include([../m4/kpse-zlib-flags.m4]) diff --git a/Build/source/libs/configure b/Build/source/libs/configure index bf70dce517b..c40c14bc9c2 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -779,6 +779,7 @@ with_graphite with_system_graphite with_graphite_includes with_graphite_libdir +with_system_xpdf with_system_gd with_gd_includes with_gd_libdir @@ -1560,6 +1561,8 @@ Optional Packages: graphite headers installed in DIR --with-graphite-libdir=DIR graphite library installed in DIR + --with-system-xpdf use installed poppler headers and library instead of + xpdf (requires pkg-config) --with-system-gd use installed gd headers and library --with-gd-includes=DIR gd headers installed in DIR --with-gd-libdir=DIR gd library installed in DIR @@ -3308,6 +3311,23 @@ fi ## libs/xpdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/xpdf/ ## configure options and TL libraries required for xpdf +# Check whether --with-system-xpdf was given. +if test "${with_system_xpdf+set}" = set; then + withval=$with_system_xpdf; +fi +if test "x$with_system_xpdf" = x; then + if test -f $srcdir/../libs/xpdf/configure; then + { $as_echo "$as_me:$LINENO: Assuming \`xpdf' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`xpdf' headers and library from TL tree" >&6;} + with_system_xpdf=no + else + { $as_echo "$as_me:$LINENO: Assuming installed \`xpdf' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`xpdf' headers and library" >&6;} + with_system_xpdf=yes + fi + ac_configure_args="$ac_configure_args '--with-system-xpdf=$with_system_xpdf'" +fi + ## libs/gd/kpse/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/ ## configure options and TL libraries required for gd diff --git a/Build/source/libs/xpdf/ac/withenable.ac b/Build/source/libs/xpdf/ac/withenable.ac index 1bb24c7b6d5..a1ac5c09b4e 100644 --- a/Build/source/libs/xpdf/ac/withenable.ac +++ b/Build/source/libs/xpdf/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 xpdf -KPSE_WITH_LIB([xpdf], , [tree]) +KPSE_WITH_LIB([xpdf]) diff --git a/Build/source/libs/xpdf/ac/xpdf.ac b/Build/source/libs/xpdf/ac/xpdf.ac new file mode 100644 index 00000000000..e588ec794c5 --- /dev/null +++ b/Build/source/libs/xpdf/ac/xpdf.ac @@ -0,0 +1,7 @@ +## libs/xpdf/ac/xpdf.ac: configure.ac fragment for the TeX Live subdirectory libs/xpdf/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl +## define required functions and headers from system xpdf +KPSE_CHECK_LIB([xpdf], [free], [gtypes.h]) diff --git a/Build/source/m4/kpse-freetype2-flags.m4 b/Build/source/m4/kpse-freetype2-flags.m4 index 13477851c0f..1fd8a0fac53 100644 --- a/Build/source/m4/kpse-freetype2-flags.m4 +++ b/Build/source/m4/kpse-freetype2-flags.m4 @@ -40,8 +40,6 @@ AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS], if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` FREETYPE2_LIBS=`$FT2_CONFIG --libs` -else - AC_MSG_ERROR([Can not use installed freetype2 headers and library]) fi ]) # KPSE_FREETYPE2_SYSTEM_FLAGS diff --git a/Build/source/m4/kpse-pkgs.m4 b/Build/source/m4/kpse-pkgs.m4 index 32708f69d7b..6cd18d600ce 100644 --- a/Build/source/m4/kpse-pkgs.m4 +++ b/Build/source/m4/kpse-pkgs.m4 @@ -45,6 +45,7 @@ AC_REQUIRE([KPSE_T1LIB_SYSTEM_FLAGS])[]dnl AC_REQUIRE([KPSE_FREETYPE_SYSTEM_FLAGS])[]dnl AC_REQUIRE([KPSE_FREETYPE2_SYSTEM_FLAGS])[]dnl AC_REQUIRE([KPSE_GD_SYSTEM_FLAGS])[]dnl +AC_REQUIRE([KPSE_XPDF_SYSTEM_FLAGS])[]dnl AC_REQUIRE([KPSE_GRAPHITE_SYSTEM_FLAGS])[]dnl AC_REQUIRE([KPSE_TECKIT_SYSTEM_FLAGS])[]dnl AC_REQUIRE([KPSE_KPATHSEA_SYSTEM_FLAGS])[]dnl diff --git a/Build/source/m4/kpse-xpdf-flags.m4 b/Build/source/m4/kpse-xpdf-flags.m4 index 4595ef6ccff..fa3166739c4 100644 --- a/Build/source/m4/kpse-xpdf-flags.m4 +++ b/Build/source/m4/kpse-xpdf-flags.m4 @@ -12,8 +12,39 @@ # Set the make variables XPDF_INCLUDES and XPDF_LIBS to the CPPFLAGS and # LIBS required for the `-lxpdf' library in libs/xpdf/ of the TL tree. AC_DEFUN([KPSE_XPDF_FLAGS], -[_KPSE_LIB_FLAGS([xpdf], [xpdf], [tree], +[_KPSE_LIB_FLAGS([xpdf], [xpdf], [], [-DPDF_PARSER_ONLY -IBLD/libs/xpdf -IBLD/libs/xpdf/goo -IBLD/libs/xpdf/fofi -IBLD/libs/xpdf/xpdf], [BLD/libs/xpdf/libxpdf.a], [], [], [${top_builddir}/../../libs/xpdf/xpdf/Stream.h])[]dnl ]) # KPSE_XPDF_FLAGS + +# KPSE_XPDF_OPTIONS([WITH-SYSTEM]) +# -------------------------------- +AC_DEFUN([KPSE_XPDF_OPTIONS], +[m4_ifval([$1], + [AC_ARG_WITH([system-xpdf], + AS_HELP_STRING([--with-system-xpdf], + [use installed poppler headers and library instead of xpdf + (requires pkg-config)]))])[]dnl +]) # KPSE_XPDF_OPTIONS + +# KPSE_XPDF_SYSTEM_FLAGS +# ---------------------- +AC_DEFUN([KPSE_XPDF_SYSTEM_FLAGS], +[AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl +if $PKG_CONFIG poppler --atleast-version=0.10; then + POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"' + XPDF_INCLUDES=`$PKG_CONFIG poppler --cflags` + XPDF_INCLUDES=`echo $XPDF_INCLUDES` + XPDF_INCLUDES="$POPPLER_VERSION $XPDF_INCLUDES $XPDF_INCLUDES/goo" + XPDF_LIBS=`$PKG_CONFIG poppler --libs` +fi +]) # KPSE_XPDF_SYSTEM_FLAGS + +# _KPSE_CHECK_PKG_CONFIG +# ---------------------- +# Check for pkg-config +AC_DEFUN([_KPSE_CHECK_PKG_CONFIG], +[AC_REQUIRE([AC_CANONICAL_HOST])[]dnl +AC_CHECK_TOOL([PKG_CONFIG], [pkg-config], [false])[]dnl +]) # _KPSE_CHECK_PKG_CONFIG diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in index c218294970a..c4dea25ae0d 100644 --- a/Build/source/texk/Makefile.in +++ b/Build/source/texk/Makefile.in @@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \ $(top_srcdir)/../m4/kpse-t1lib-flags.m4 \ $(top_srcdir)/../m4/kpse-teckit-flags.m4 \ $(top_srcdir)/../m4/kpse-web2c.m4 \ + $(top_srcdir)/../m4/kpse-xpdf-flags.m4 \ $(top_srcdir)/../m4/kpse-zlib-flags.m4 \ $(top_srcdir)/../ac/withenable.ac \ $(top_srcdir)/../utils/ac/withenable.ac \ diff --git a/Build/source/texk/aclocal.m4 b/Build/source/texk/aclocal.m4 index 9fae18de399..238046dc260 100644 --- a/Build/source/texk/aclocal.m4 +++ b/Build/source/texk/aclocal.m4 @@ -630,4 +630,5 @@ m4_include([../m4/kpse-setup.m4]) m4_include([../m4/kpse-t1lib-flags.m4]) m4_include([../m4/kpse-teckit-flags.m4]) m4_include([../m4/kpse-web2c.m4]) +m4_include([../m4/kpse-xpdf-flags.m4]) m4_include([../m4/kpse-zlib-flags.m4]) diff --git a/Build/source/texk/configure b/Build/source/texk/configure index 0e95e1f2fd8..08c07cb8f5a 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -779,6 +779,7 @@ with_graphite with_system_graphite with_graphite_includes with_graphite_libdir +with_system_xpdf with_system_gd with_gd_includes with_gd_libdir @@ -1579,6 +1580,8 @@ Optional Packages: graphite headers installed in DIR --with-graphite-libdir=DIR graphite library installed in DIR + --with-system-xpdf use installed poppler headers and library instead of + xpdf (requires pkg-config) --with-system-gd use installed gd headers and library --with-gd-includes=DIR gd headers installed in DIR --with-gd-libdir=DIR gd library installed in DIR @@ -3327,6 +3330,23 @@ fi ## libs/xpdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/xpdf/ ## configure options and TL libraries required for xpdf +# Check whether --with-system-xpdf was given. +if test "${with_system_xpdf+set}" = set; then + withval=$with_system_xpdf; +fi +if test "x$with_system_xpdf" = x; then + if test -f $srcdir/../libs/xpdf/configure; then + { $as_echo "$as_me:$LINENO: Assuming \`xpdf' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`xpdf' headers and library from TL tree" >&6;} + with_system_xpdf=no + else + { $as_echo "$as_me:$LINENO: Assuming installed \`xpdf' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`xpdf' headers and library" >&6;} + with_system_xpdf=yes + fi + ac_configure_args="$ac_configure_args '--with-system-xpdf=$with_system_xpdf'" +fi + ## libs/gd/kpse/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/ ## configure options and TL libraries required for gd diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure index f2d716a822e..e7cbc877b46 100755 --- a/Build/source/texk/dvipng/configure +++ b/Build/source/texk/dvipng/configure @@ -18218,10 +18218,6 @@ if test "x$with_system_freetype2" = xyes; then if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` FREETYPE2_LIBS=`$FT2_CONFIG --libs` -else - { { $as_echo "$as_me:$LINENO: error: Can not use installed freetype2 headers and library" >&5 -$as_echo "$as_me: error: Can not use installed freetype2 headers and library" >&2;} - { (exit 1); exit 1; }; } fi else FREETYPE2_INCLUDES=`echo 'BLD/libs/freetype2' | sed \ diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index aa121eccef0..5d23eb1df2b 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -875,6 +875,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index e2e53610b01..de54d5bee10 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -822,6 +822,7 @@ XPDF_RULE XPDF_DEPEND XPDF_LIBS XPDF_INCLUDES +PKG_CONFIG LIBPNG_RULE LIBPNG_DEPEND LIBPNG_LIBS @@ -1066,6 +1067,7 @@ with_zlib_libdir with_system_libpng with_libpng_includes with_libpng_libdir +with_system_xpdf with_system_graphite with_graphite_includes with_graphite_libdir @@ -1782,6 +1784,8 @@ Optional Packages: libpng headers installed in DIR --with-libpng-libdir=DIR libpng library installed in DIR + --with-system-xpdf use installed poppler headers and library instead of + xpdf (requires pkg-config) --with-system-graphite use installed graphite headers and library --with-graphite-includes=DIR graphite headers installed in DIR @@ -4402,13 +4406,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4405: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4409: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4408: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4412: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4411: output\"" >&5) + (eval echo "\"\$as_me:4415: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5614,7 +5618,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5617 "configure"' > conftest.$ac_ext + echo '#line 5621 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7661,11 +7665,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7664: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7668: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7668: \$? = $ac_status" >&5 + echo "$as_me:7672: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8000,11 +8004,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8003: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8007: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8007: \$? = $ac_status" >&5 + echo "$as_me:8011: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8105,11 +8109,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8108: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8112: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8112: \$? = $ac_status" >&5 + echo "$as_me:8116: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8160,11 +8164,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8163: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8167: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8167: \$? = $ac_status" >&5 + echo "$as_me:8171: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10960,7 +10964,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10963 "configure" +#line 10967 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11056,7 +11060,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11059 "configure" +#line 11063 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16072,11 +16076,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16075: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16079: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16079: \$? = $ac_status" >&5 + echo "$as_me:16083: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16171,11 +16175,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16174: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16178: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16178: \$? = $ac_status" >&5 + echo "$as_me:16182: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16223,11 +16227,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16226: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16230: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16230: \$? = $ac_status" >&5 + echo "$as_me:16234: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -23656,7 +23660,113 @@ ${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngcon cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS)' fi +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_PKG_CONFIG+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$PKG_CONFIG"; then + ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +PKG_CONFIG=$ac_cv_prog_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_PKG_CONFIG"; then + ac_ct_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_PKG_CONFIG+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_PKG_CONFIG"; then + ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG +if test -n "$ac_ct_PKG_CONFIG"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_PKG_CONFIG" >&5 +$as_echo "$ac_ct_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_PKG_CONFIG" = x; then + PKG_CONFIG="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_ct_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" +fi + ## _KPSE_LIB_FLAGS: Setup xpdf (-lxpdf) flags + +# Check whether --with-system-xpdf was given. +if test "${with_system_xpdf+set}" = set; then + withval=$with_system_xpdf; +fi +if test "x$with_system_xpdf" = xyes; then + if $PKG_CONFIG poppler --atleast-version=0.10; then + POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"' + XPDF_INCLUDES=`$PKG_CONFIG poppler --cflags` + XPDF_INCLUDES=`echo $XPDF_INCLUDES` + XPDF_INCLUDES="$POPPLER_VERSION $XPDF_INCLUDES $XPDF_INCLUDES/goo" + XPDF_LIBS=`$PKG_CONFIG poppler --libs` +fi +else XPDF_INCLUDES=`echo '-DPDF_PARSER_ONLY -IBLD/libs/xpdf -IBLD/libs/xpdf/goo -IBLD/libs/xpdf/fofi -IBLD/libs/xpdf/xpdf' | sed \ -e "s,SRC/,$kpse_SRC/,g" \ -e "s,BLD/,$kpse_BLD/,g"` @@ -23670,6 +23780,7 @@ $(XPDF_DEPEND): ${top_builddir}/../../libs/xpdf/xpdf/Stream.h cd ${top_builddir}/../../libs/xpdf && $(MAKE) $(AM_MAKEFLAGS) ${top_builddir}/../../libs/xpdf/xpdf/Stream.h: cd ${top_builddir}/../../libs/xpdf && $(MAKE) $(AM_MAKEFLAGS)' +fi ## _KPSE_LIB_FLAGS: Setup graphite (-lgraphite) flags @@ -23811,10 +23922,6 @@ if test "x$with_system_freetype2" = xyes; then if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` FREETYPE2_LIBS=`$FT2_CONFIG --libs` -else - { { $as_echo "$as_me:$LINENO: error: Can not use installed freetype2 headers and library" >&5 -$as_echo "$as_me: error: Can not use installed freetype2 headers and library" >&2;} - { (exit 1); exit 1; }; } fi else FREETYPE2_INCLUDES=`echo 'BLD/libs/freetype2' | sed \ diff --git a/Build/source/texk/web2c/doc/Makefile.in b/Build/source/texk/web2c/doc/Makefile.in index 76ea945b884..58f8ad7d375 100644 --- a/Build/source/texk/web2c/doc/Makefile.in +++ b/Build/source/texk/web2c/doc/Makefile.in @@ -177,6 +177,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in index cd7144dcdd9..a6b6badfd56 100644 --- a/Build/source/texk/web2c/lib/Makefile.in +++ b/Build/source/texk/web2c/lib/Makefile.in @@ -182,6 +182,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in index ce6a5c98df5..4a2535a5d9c 100644 --- a/Build/source/texk/web2c/man/Makefile.in +++ b/Build/source/texk/web2c/man/Makefile.in @@ -172,6 +172,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/Build/source/texk/web2c/mpware/Makefile.in b/Build/source/texk/web2c/mpware/Makefile.in index 772a196a659..30a7926c894 100644 --- a/Build/source/texk/web2c/mpware/Makefile.in +++ b/Build/source/texk/web2c/mpware/Makefile.in @@ -192,6 +192,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in index 34b9b617ee6..654e8ce472d 100644 --- a/Build/source/texk/web2c/omegafonts/Makefile.in +++ b/Build/source/texk/web2c/omegafonts/Makefile.in @@ -198,6 +198,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in index 82dc41ed35d..13efcbd2c6d 100644 --- a/Build/source/texk/web2c/otps/Makefile.in +++ b/Build/source/texk/web2c/otps/Makefile.in @@ -200,6 +200,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/Build/source/texk/web2c/window/Makefile.in b/Build/source/texk/web2c/window/Makefile.in index d95efbe477b..33450bdd1cf 100644 --- a/Build/source/texk/web2c/window/Makefile.in +++ b/Build/source/texk/web2c/window/Makefile.in @@ -187,6 +187,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure index 47cf6788a06..0e3d1a6c10f 100755 --- a/Build/source/texk/xdvipdfmx/configure +++ b/Build/source/texk/xdvipdfmx/configure @@ -17449,10 +17449,6 @@ if test "x$with_system_freetype2" = xyes; then if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` FREETYPE2_LIBS=`$FT2_CONFIG --libs` -else - { { $as_echo "$as_me:$LINENO: error: Can not use installed freetype2 headers and library" >&5 -$as_echo "$as_me: error: Can not use installed freetype2 headers and library" >&2;} - { (exit 1); exit 1; }; } fi else FREETYPE2_INCLUDES=`echo 'BLD/libs/freetype2' | sed \ diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in index 9f9ee5fdc57..38e3eafad8c 100644 --- a/Build/source/utils/Makefile.in +++ b/Build/source/utils/Makefile.in @@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \ $(top_srcdir)/../m4/kpse-t1lib-flags.m4 \ $(top_srcdir)/../m4/kpse-teckit-flags.m4 \ $(top_srcdir)/../m4/kpse-web2c.m4 \ + $(top_srcdir)/../m4/kpse-xpdf-flags.m4 \ $(top_srcdir)/../m4/kpse-zlib-flags.m4 \ $(top_srcdir)/../ac/withenable.ac \ $(top_srcdir)/../utils/ac/withenable.ac \ diff --git a/Build/source/utils/aclocal.m4 b/Build/source/utils/aclocal.m4 index 9fae18de399..238046dc260 100644 --- a/Build/source/utils/aclocal.m4 +++ b/Build/source/utils/aclocal.m4 @@ -630,4 +630,5 @@ m4_include([../m4/kpse-setup.m4]) m4_include([../m4/kpse-t1lib-flags.m4]) m4_include([../m4/kpse-teckit-flags.m4]) m4_include([../m4/kpse-web2c.m4]) +m4_include([../m4/kpse-xpdf-flags.m4]) m4_include([../m4/kpse-zlib-flags.m4]) diff --git a/Build/source/utils/configure b/Build/source/utils/configure index d1f18da8f67..efcfc2a5edd 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -779,6 +779,7 @@ with_graphite with_system_graphite with_graphite_includes with_graphite_libdir +with_system_xpdf with_system_gd with_gd_includes with_gd_libdir @@ -1556,6 +1557,8 @@ Optional Packages: graphite headers installed in DIR --with-graphite-libdir=DIR graphite library installed in DIR + --with-system-xpdf use installed poppler headers and library instead of + xpdf (requires pkg-config) --with-system-gd use installed gd headers and library --with-gd-includes=DIR gd headers installed in DIR --with-gd-libdir=DIR gd library installed in DIR @@ -3304,6 +3307,23 @@ fi ## libs/xpdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/xpdf/ ## configure options and TL libraries required for xpdf +# Check whether --with-system-xpdf was given. +if test "${with_system_xpdf+set}" = set; then + withval=$with_system_xpdf; +fi +if test "x$with_system_xpdf" = x; then + if test -f $srcdir/../libs/xpdf/configure; then + { $as_echo "$as_me:$LINENO: Assuming \`xpdf' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`xpdf' headers and library from TL tree" >&6;} + with_system_xpdf=no + else + { $as_echo "$as_me:$LINENO: Assuming installed \`xpdf' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`xpdf' headers and library" >&6;} + with_system_xpdf=yes + fi + ac_configure_args="$ac_configure_args '--with-system-xpdf=$with_system_xpdf'" +fi + ## libs/gd/kpse/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/ ## configure options and TL libraries required for gd |