diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-10-25 08:53:49 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-10-25 08:53:49 +0000 |
commit | edc3291a11eb0048e750f5861e9dd447a7e959a4 (patch) | |
tree | f00a5ea83a3c0b66c0cd4b7ef86f227c2562ecb0 /Build/source/texk/dvipdfm-x | |
parent | 68440ee4d894f56b49a82533ecb3f215964bc5b1 (diff) |
Update libs/paper and use it for dvipdfm-x
git-svn-id: svn://tug.org/texlive/trunk@31994 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfm-x')
-rw-r--r-- | Build/source/texk/dvipdfm-x/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/Makefile.am | 4 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/Makefile.in | 6 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/ac/withenable.ac | 2 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/aclocal.m4 | 2 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/config.h.in | 2 | ||||
-rwxr-xr-x | Build/source/texk/dvipdfm-x/configure | 169 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/configure.ac | 8 |
8 files changed, 58 insertions, 139 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index 671a60c7ecc..ded1af799bd 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,7 @@ +2013-10-24 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am, /ac/withenable.ac, configure.ac: Use libs/paper. + 2013-10-12 Khaled Hosny <khaledhosny@eglug.org> * dvi.c, dvicodes.h: Rename XDVI_ID to XDV_ID. diff --git a/Build/source/texk/dvipdfm-x/Makefile.am b/Build/source/texk/dvipdfm-x/Makefile.am index 007a076b288..87540d6e2a0 100644 --- a/Build/source/texk/dvipdfm-x/Makefile.am +++ b/Build/source/texk/dvipdfm-x/Makefile.am @@ -250,7 +250,7 @@ endif DVIPDFMX all-local: config.force -config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(FREETYPE2_DEPEND) +config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(FREETYPE2_DEPEND) $(PAPER_DEPEND) echo timestamp >config.force $(SHELL) ./config.status --recheck @@ -264,6 +264,8 @@ DISTCLEANFILES = config.force @LIBPNG_RULE@ ## Rebuild libz @ZLIB_RULE@ +## Rebuild libpaper +@PAPER_RULE@ ## Tests ## diff --git a/Build/source/texk/dvipdfm-x/Makefile.in b/Build/source/texk/dvipdfm-x/Makefile.in index 48beb03f7b0..f9b325a4cb4 100644 --- a/Build/source/texk/dvipdfm-x/Makefile.in +++ b/Build/source/texk/dvipdfm-x/Makefile.in @@ -119,8 +119,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ - $(top_srcdir)/../../m4/kpse-libpaper.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ + $(top_srcdir)/../../m4/kpse-paper-flags.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ @@ -566,6 +566,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PAPER_DEPEND = @PAPER_DEPEND@ PAPER_INCLUDES = @PAPER_INCLUDES@ PAPER_LIBS = @PAPER_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ @@ -2261,7 +2262,7 @@ uninstall-hook: uninstall-bin-links uninstall-man1-links all-local: config.force -config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(FREETYPE2_DEPEND) +config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(FREETYPE2_DEPEND) $(PAPER_DEPEND) echo timestamp >config.force $(SHELL) ./config.status --recheck @@ -2269,6 +2270,7 @@ config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(FREETYPE2_DEP @FREETYPE2_RULE@ @LIBPNG_RULE@ @ZLIB_RULE@ +@PAPER_RULE@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Build/source/texk/dvipdfm-x/ac/withenable.ac b/Build/source/texk/dvipdfm-x/ac/withenable.ac index 2db424cf72a..135f736d359 100644 --- a/Build/source/texk/dvipdfm-x/ac/withenable.ac +++ b/Build/source/texk/dvipdfm-x/ac/withenable.ac @@ -4,5 +4,5 @@ dnl Copyright (C) 2009-2013 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 dvipdfm-x -KPSE_ENABLE_PROG([dvipdfm-x], [kpathsea libpng]) +KPSE_ENABLE_PROG([dvipdfm-x], [kpathsea libpng paper]) m4_include(kpse_TL[texk/dvipdfm-x/ac/dvipdfm-x.ac]) diff --git a/Build/source/texk/dvipdfm-x/aclocal.m4 b/Build/source/texk/dvipdfm-x/aclocal.m4 index c1337a226aa..41b28c9772f 100644 --- a/Build/source/texk/dvipdfm-x/aclocal.m4 +++ b/Build/source/texk/dvipdfm-x/aclocal.m4 @@ -1223,8 +1223,8 @@ AC_SUBST([am__untar]) m4_include([../../m4/kpse-common.m4]) m4_include([../../m4/kpse-freetype2-flags.m4]) m4_include([../../m4/kpse-kpathsea-flags.m4]) -m4_include([../../m4/kpse-libpaper.m4]) m4_include([../../m4/kpse-libpng-flags.m4]) +m4_include([../../m4/kpse-paper-flags.m4]) m4_include([../../m4/kpse-warnings.m4]) m4_include([../../m4/kpse-win32.m4]) m4_include([../../m4/kpse-zlib-flags.m4]) diff --git a/Build/source/texk/dvipdfm-x/config.h.in b/Build/source/texk/dvipdfm-x/config.h.in index 684bb4c43a0..f7d6d1ef177 100644 --- a/Build/source/texk/dvipdfm-x/config.h.in +++ b/Build/source/texk/dvipdfm-x/config.h.in @@ -44,7 +44,7 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H -/* Define if you have libpaper */ +/* Define if you have libpaper. */ #undef HAVE_LIBPAPER /* Define if you have libpng and its headers. */ 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 <paper.h> -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 : diff --git a/Build/source/texk/dvipdfm-x/configure.ac b/Build/source/texk/dvipdfm-x/configure.ac index af92b839442..c77902ca57a 100644 --- a/Build/source/texk/dvipdfm-x/configure.ac +++ b/Build/source/texk/dvipdfm-x/configure.ac @@ -54,6 +54,8 @@ KPSE_KPATHSEA_FLAGS KPSE_ZLIB_FLAGS KPSE_LIBPNG_FLAGS KPSE_FREETYPE2_FLAGS +KPSE_PAPER_FLAGS +AC_DEFINE([HAVE_LIBPAPER], [1], [Define if you have libpaper.]) KPSE_SAVE_FLAGS @@ -87,12 +89,6 @@ AC_DEFINE([HAVE_ZLIB], 1, [Define if you have zlib and its headers.]) AC_DEFINE([HAVE_ZLIB_COMPRESS2], 1, [Define if your zlib has the compress2 function.]) AC_DEFINE([HAVE_LIBPNG], 1, [Define if you have libpng and its headers.]) -dnl Check for additional libraries. - -if test "x$enable_texlive_build" != xyes || test ! -d $srcdir/../kpathsea; then - KPSE_LIBPAPER -fi - KPSE_WIN32_CALL AM_CONDITIONAL([DVIPDFMX], [test "x$enable_dvipdfmx" != xno]) |