From edc3291a11eb0048e750f5861e9dd447a7e959a4 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 25 Oct 2013 08:53:49 +0000 Subject: Update libs/paper and use it for dvipdfm-x git-svn-id: svn://tug.org/texlive/trunk@31994 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm-x/configure | 169 +++++++++------------------------- 1 file changed, 42 insertions(+), 127 deletions(-) (limited to 'Build/source/texk/dvipdfm-x/configure') diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure index 4224a903c4b..578cf1f6874 100755 --- a/Build/source/texk/dvipdfm-x/configure +++ b/Build/source/texk/dvipdfm-x/configure @@ -643,6 +643,8 @@ WIN32_CALL_FALSE WIN32_CALL_TRUE WIN32_FALSE WIN32_TRUE +PAPER_RULE +PAPER_DEPEND PAPER_LIBS PAPER_INCLUDES FREETYPE2_RULE @@ -806,6 +808,7 @@ with_zlib_includes with_zlib_libdir with_system_libpng with_system_freetype2 +with_system_paper with_paper_includes with_paper_libdir ' @@ -1479,6 +1482,7 @@ Optional Packages: pkg-config) --with-system-freetype2 use installed freetype2 headers and library (requires freetype-config) + --with-system-paper use installed paper headers and library --with-paper-includes=DIR paper headers installed in DIR --with-paper-libdir=DIR paper library installed in DIR @@ -15621,6 +15625,44 @@ ${top_builddir}/../../libs/freetype2/ft2build.h: cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +## _KPSE_LIB_FLAGS: Setup paper (-lpaper) flags + +# Check whether --with-system-paper was given. +if test "${with_system_paper+set}" = set; then : + withval=$with_system_paper; +fi + +# Check whether --with-paper-includes was given. +if test "${with_paper_includes+set}" = set; then : + withval=$with_paper_includes; +fi + +# Check whether --with-paper-libdir was given. +if test "${with_paper_libdir+set}" = set; then : + withval=$with_paper_libdir; +fi +if test "x$with_system_paper" = xyes; then + if test "x$with_paper_includes" != x && test "x$with_paper_includes" != xyes; then + PAPER_INCLUDES="-I$with_paper_includes" +fi +PAPER_LIBS="-lpaper" +if test "x$with_paper_libdir" != x && test "x$with_paper_libdir" != xyes; then + PAPER_LIBS="-L$with_paper_libdir $PAPER_LIBS" +fi +else + PAPER_INCLUDES="-I$kpse_BLD/libs/paper/include" + PAPER_LIBS="$kpse_BLD/libs/paper/libpaper.a" + PAPER_DEPEND='${top_builddir}/../../libs/paper/libpaper.a' + PAPER_RULE='# Rebuild libpaper +$(PAPER_DEPEND): ${top_builddir}/../../libs/paper/include/paper.h + cd ${top_builddir}/../../libs/paper && $(MAKE) $(AM_MAKEFLAGS) rebuild +${top_builddir}/../../libs/paper/include/paper.h: + cd ${top_builddir}/../../libs/paper && $(MAKE) $(AM_MAKEFLAGS) rebuild' +fi + + +$as_echo "#define HAVE_LIBPAPER 1" >>confdefs.h + kpse_save_CPPFLAGS=$CPPFLAGS kpse_save_LIBS=$LIBS @@ -15703,133 +15745,6 @@ $as_echo "#define HAVE_ZLIB_COMPRESS2 1" >>confdefs.h $as_echo "#define HAVE_LIBPNG 1" >>confdefs.h - -if test "x$enable_texlive_build" != xyes || test ! -d $srcdir/../kpathsea; then - - -# Check whether --with-paper-includes was given. -if test "${with_paper_includes+set}" = set; then : - withval=$with_paper_includes; -fi - -# Check whether --with-paper-libdir was given. -if test "${with_paper_libdir+set}" = set; then : - withval=$with_paper_libdir; -fi -case $with_paper_includes in #( - "" | yes) : - PAPER_INCLUDES= ;; #( - *) : - PAPER_INCLUDES="-I$with_paper_includes" ;; -esac -case $with_paper_libdir in #( - "" | yes) : - PAPER_LIBS= ;; #( - *) : - PAPER_LIBS="-L$with_paper_libdir" ;; -esac -CPPFLAGS="$CPPFLAGS $PAPER_INCLUDES" -LIBS="$LIBS $PAPER_LIBS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for paper header files" >&5 -$as_echo_n "checking for paper header files... " >&6; } -result=no -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -struct paper *p; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing paperpswidth" >&5 -$as_echo_n "checking for library containing paperpswidth... " >&6; } -if ${ac_cv_search_paperpswidth+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* 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 paperpswidth (); -int -main () -{ -return paperpswidth (); - ; - return 0; -} -_ACEOF -for ac_lib in '' paper; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_paperpswidth=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_paperpswidth+:} false; then : - break -fi -done -if ${ac_cv_search_paperpswidth+:} false; then : - -else - ac_cv_search_paperpswidth=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_paperpswidth" >&5 -$as_echo "$ac_cv_search_paperpswidth" >&6; } -ac_res=$ac_cv_search_paperpswidth -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -fi - - case $ac_cv_search_paperpswidth in #( - no) : - : ;; #( - "none required") : - result=yes ;; #( - *) : - result=yes - PAPER_LIBS="$PAPER_LIBS $ac_cv_search_paperpswidth" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -case $result in #( - no) : - PAPER_INCLUDES= PAPER_LIBS= ;; #( - *) : - -$as_echo "#define HAVE_LIBPAPER 1" >>confdefs.h - ;; -esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 -$as_echo "$result" >&6; } - - -CPPFLAGS=$kpse_save_CPPFLAGS -LIBS=$kpse_save_LIBS - - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5 $as_echo_n "checking for native WIN32 or MINGW32... " >&6; } if ${kpse_cv_have_win32+:} false; then : -- cgit v1.2.3