diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2008-04-07 12:06:18 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2008-04-07 12:06:18 +0000 |
commit | 41fdc70e57b74afa2a63e751e435055e5dfe7c58 (patch) | |
tree | 200d74ecd21d8b77bdcb5687576a6d7f012be322 /Build/source/texk/dvipdfmx | |
parent | 1999147223756159c17c4e47fbbaf7b7d0344f4f (diff) |
respect library dependencies
git-svn-id: svn://tug.org/texlive/trunk@7345 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfmx')
-rw-r--r-- | Build/source/texk/dvipdfmx/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/dvipdfmx/Makefile.in | 8 | ||||
-rw-r--r-- | Build/source/texk/dvipdfmx/aclocal.m4 | 4 | ||||
-rwxr-xr-x | Build/source/texk/dvipdfmx/configure | 306 | ||||
-rw-r--r-- | Build/source/texk/dvipdfmx/configure.in | 16 | ||||
-rw-r--r-- | Build/source/texk/dvipdfmx/data/Makefile.in | 8 | ||||
-rw-r--r-- | Build/source/texk/dvipdfmx/m4/cho-kpse.m4 (renamed from Build/source/texk/dvipdfmx/m4/maw-kpse.m4) | 17 | ||||
-rw-r--r-- | Build/source/texk/dvipdfmx/m4/cho-libs.m4 (renamed from Build/source/texk/dvipdfmx/m4/maw-libs.m4) | 35 | ||||
-rw-r--r-- | Build/source/texk/dvipdfmx/src/Makefile.in | 8 |
9 files changed, 204 insertions, 203 deletions
diff --git a/Build/source/texk/dvipdfmx/ChangeLog b/Build/source/texk/dvipdfmx/ChangeLog index dc03e8027a8..33728018c1f 100644 --- a/Build/source/texk/dvipdfmx/ChangeLog +++ b/Build/source/texk/dvipdfmx/ChangeLog @@ -3,7 +3,10 @@ $Header: /home/cvsroot/dvipdfmx/ChangeLog,v 1.141 2006/12/11 13:01:38 chofchof E ChangeLog: Changes for dvipdfmx (teTeX / TeX live) ================================================== -2008-03-05 Peter Breitenlohner <peb@mppmu.mpg.de> +2008-04-06 Peter Breitenlohner <peb@mppmu.mpg.de> + * configure.in: respect library dependencies. + +2008-03-04 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: added `ACLOCAL_AMFLAGS -I m4' * configure.in: moved macro definitions ... diff --git a/Build/source/texk/dvipdfmx/Makefile.in b/Build/source/texk/dvipdfmx/Makefile.in index b8df3c2be52..48c1d910529 100644 --- a/Build/source/texk/dvipdfmx/Makefile.in +++ b/Build/source/texk/dvipdfmx/Makefile.in @@ -35,12 +35,12 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ TODO compile depcomp install-sh missing mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/maw-kpse.m4 \ - $(top_srcdir)/m4/maw-libs.m4 $(top_srcdir)/m4/maw-time.m4 \ - $(top_srcdir)/../../libs/libpng/withenable.ac \ - $(top_srcdir)/../../libs/libpng/libpng.ac \ +am__aclocal_m4_deps = $(top_srcdir)/m4/cho-kpse.m4 \ + $(top_srcdir)/m4/cho-libs.m4 $(top_srcdir)/m4/maw-time.m4 \ $(top_srcdir)/../../libs/zlib/withenable.ac \ $(top_srcdir)/../../libs/zlib/zlib.ac \ + $(top_srcdir)/../../libs/libpng/withenable.ac \ + $(top_srcdir)/../../libs/libpng/libpng.ac \ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/texk/dvipdfmx/aclocal.m4 b/Build/source/texk/dvipdfmx/aclocal.m4 index fed15853db5..6fbe88e9727 100644 --- a/Build/source/texk/dvipdfmx/aclocal.m4 +++ b/Build/source/texk/dvipdfmx/aclocal.m4 @@ -941,6 +941,6 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -m4_include([m4/maw-kpse.m4]) -m4_include([m4/maw-libs.m4]) +m4_include([m4/cho-kpse.m4]) +m4_include([m4/cho-libs.m4]) m4_include([m4/maw-time.m4]) diff --git a/Build/source/texk/dvipdfmx/configure b/Build/source/texk/dvipdfmx/configure index cfa3f1f053d..d98afdb26c5 100755 --- a/Build/source/texk/dvipdfmx/configure +++ b/Build/source/texk/dvipdfmx/configure @@ -699,12 +699,12 @@ CPP GREP EGREP LIBOBJS -LIBPNGCPPFLAGS -LDLIBPNG -LIBPNGDEP ZLIBCPPFLAGS LDZLIB ZLIBDEP +LIBPNGCPPFLAGS +LDLIBPNG +LIBPNGDEP LTLIBOBJS' ac_subst_files='' ac_precious_vars='build_alias @@ -1300,14 +1300,14 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-kpathsea=DIR use kpathsea include/library files from DIR - --with-system-pnglib use installed pnglib library - --with-pnglib-libdir=DIR specify directory where the png library (libpng.a) resides. - --with-pnglib-include=DIR specify directory with the pnglib header files. --with-system-zlib use installed zlib library --with-zlib-libdir=DIR Specify directory where the zlib.a resides. --with-zlib-include=DIR Specify the zlib header files location. + --with-system-pnglib use installed pnglib library + --with-pnglib-libdir=DIR specify directory where the png library (libpng.a) resides. + --with-pnglib-include=DIR specify directory with the pnglib header files. --with-paper=DIR use paper include/library files from DIR --with-zlib=DIR use zlib include/library files from DIR --with-png=DIR use png include/library files from DIR @@ -8054,150 +8054,6 @@ if test "x$enable_tetex_build" = xyes; then # Get these common libraries from the sources, too. # Seems like it would be simpler to treat kpathsea this way too, but # we're just starting from what lcdf-typetools did. - # beginning of libpng/withenable.ac -# public domain. - -# Check whether --with-system-pnglib was given. -if test "${with_system_pnglib+set}" = set; then - withval=$with_system_pnglib; -fi - - - -# Check whether --with-pnglib_libdir was given. -if test "${with_pnglib_libdir+set}" = set; then - withval=$with_pnglib_libdir; -fi - - - -# Check whether --with-pnglib_include was given. -if test "${with_pnglib_include+set}" = set; then - withval=$with_pnglib_include; -fi - -# end of libpng/withenable.ac - - # beginning of libpng.ac -if test "$needs_pnglib" = no; then - LIBPNGCPPFLAGS= - LDLIBPNG= - LIBPNGDEP= -else - EXTRA_LIBPNG_INCLUDE= - EXTRA_LIBPNG_LIBDIR= - - if test "$with_system_pnglib" = yes; then - if test "x$with_pnglib_libdir" != x; then - EXTRA_LIBPNG_LIBDIR="-L$with_pnglib_libdir" - fi - if test "x$with_pnglib_include" != x; then - EXTRA_LIBPNG_INCLUDE="-I$with_pnglib_include" - fi - fi - - OLD_LDFLAGS=$LDFLAGS - OLD_CPP=$CPP - OLD_LIBS=$LIBS - - LDFLAGS="$LDFLAGS $EXTRA_LIBPNG_LIBDIR" - CPP="$CPP $EXTRA_LIBPNG_INCLUDE" - - if test "$with_system_pnglib" = yes; then - { echo "$as_me:$LINENO: checking for png_set_read_fn in -lpng" >&5 -echo $ECHO_N "checking for png_set_read_fn in -lpng... $ECHO_C" >&6; } -if test "${ac_cv_lib_png_png_set_read_fn+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpng -lz -lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 png_set_read_fn (); -int -main () -{ -return png_set_read_fn (); - ; - 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 "echo \"\$as_me:$LINENO: $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 - 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 && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_png_png_set_read_fn=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_png_png_set_read_fn=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_set_read_fn" >&5 -echo "${ECHO_T}$ac_cv_lib_png_png_set_read_fn" >&6; } -if test $ac_cv_lib_png_png_set_read_fn = yes; then - pnglib=-lpng -else - { echo "$as_me:$LINENO: WARNING: Standard PNG library not found. Compiling my own." >&5 -echo "$as_me: WARNING: Standard PNG library not found. Compiling my own." >&2;} - with_system_pnglib=no -fi - - fi - - LDFLAGS=$OLD_LDFLAGS - CPP=$OLD_CPP - LIBS=$OLD_LIBS - - if test "$with_system_pnglib" != yes; then - LIBPNGCPPFLAGS='-I$(LIBPNGDIR) -I$(LIBPNGSRCDIR)' - LDLIBPNG='$(LIBPNGDIR)/libpng.a' - LIBPNGDEP='$(LIBPNGDIR)/libpng.a' - using_system_pnglib=no - else - LIBPNGCPPFLAGS="$EXTRA_LIBPNG_INCLUDE" - LDLIBPNG="$EXTRA_LIBPNG_LIBDIR -lpng" - LIBPNGDEP= - using_system_pnglib=yes - fi -fi - - - - -# end of libpng.ac - - # Check whether --with-system_zlib was given. if test "${with_system_zlib+set}" = set; then @@ -8491,6 +8347,150 @@ fi + # beginning of libpng/withenable.ac +# public domain. + +# Check whether --with-system-pnglib was given. +if test "${with_system_pnglib+set}" = set; then + withval=$with_system_pnglib; +fi + + + +# Check whether --with-pnglib_libdir was given. +if test "${with_pnglib_libdir+set}" = set; then + withval=$with_pnglib_libdir; +fi + + + +# Check whether --with-pnglib_include was given. +if test "${with_pnglib_include+set}" = set; then + withval=$with_pnglib_include; +fi + +# end of libpng/withenable.ac + + # beginning of libpng.ac +if test "$needs_pnglib" = no; then + LIBPNGCPPFLAGS= + LDLIBPNG= + LIBPNGDEP= +else + EXTRA_LIBPNG_INCLUDE= + EXTRA_LIBPNG_LIBDIR= + + if test "$with_system_pnglib" = yes; then + if test "x$with_pnglib_libdir" != x; then + EXTRA_LIBPNG_LIBDIR="-L$with_pnglib_libdir" + fi + if test "x$with_pnglib_include" != x; then + EXTRA_LIBPNG_INCLUDE="-I$with_pnglib_include" + fi + fi + + OLD_LDFLAGS=$LDFLAGS + OLD_CPP=$CPP + OLD_LIBS=$LIBS + + LDFLAGS="$LDFLAGS $EXTRA_LIBPNG_LIBDIR" + CPP="$CPP $EXTRA_LIBPNG_INCLUDE" + + if test "$with_system_pnglib" = yes; then + { echo "$as_me:$LINENO: checking for png_set_read_fn in -lpng" >&5 +echo $ECHO_N "checking for png_set_read_fn in -lpng... $ECHO_C" >&6; } +if test "${ac_cv_lib_png_png_set_read_fn+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpng -lz -lm $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* 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 png_set_read_fn (); +int +main () +{ +return png_set_read_fn (); + ; + 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 "echo \"\$as_me:$LINENO: $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 + 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 && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_png_png_set_read_fn=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_png_png_set_read_fn=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_set_read_fn" >&5 +echo "${ECHO_T}$ac_cv_lib_png_png_set_read_fn" >&6; } +if test $ac_cv_lib_png_png_set_read_fn = yes; then + pnglib=-lpng +else + { echo "$as_me:$LINENO: WARNING: Standard PNG library not found. Compiling my own." >&5 +echo "$as_me: WARNING: Standard PNG library not found. Compiling my own." >&2;} + with_system_pnglib=no +fi + + fi + + LDFLAGS=$OLD_LDFLAGS + CPP=$OLD_CPP + LIBS=$OLD_LIBS + + if test "$with_system_pnglib" != yes; then + LIBPNGCPPFLAGS='-I$(LIBPNGDIR) -I$(LIBPNGSRCDIR)' + LDLIBPNG='$(LIBPNGDIR)/libpng.a' + LIBPNGDEP='$(LIBPNGDIR)/libpng.a' + using_system_pnglib=no + else + LIBPNGCPPFLAGS="$EXTRA_LIBPNG_INCLUDE" + LDLIBPNG="$EXTRA_LIBPNG_LIBDIR -lpng" + LIBPNGDEP= + using_system_pnglib=yes + fi +fi + + + + +# end of libpng.ac + + # yes, we have zlib and png. cat >>confdefs.h <<\_ACEOF #define HAVE_ZLIB 1 @@ -9874,12 +9874,12 @@ CPP!$CPP$ac_delim GREP!$GREP$ac_delim EGREP!$EGREP$ac_delim LIBOBJS!$LIBOBJS$ac_delim -LIBPNGCPPFLAGS!$LIBPNGCPPFLAGS$ac_delim -LDLIBPNG!$LDLIBPNG$ac_delim -LIBPNGDEP!$LIBPNGDEP$ac_delim ZLIBCPPFLAGS!$ZLIBCPPFLAGS$ac_delim LDZLIB!$LDZLIB$ac_delim ZLIBDEP!$ZLIBDEP$ac_delim +LIBPNGCPPFLAGS!$LIBPNGCPPFLAGS$ac_delim +LDLIBPNG!$LDLIBPNG$ac_delim +LIBPNGDEP!$LIBPNGDEP$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF diff --git a/Build/source/texk/dvipdfmx/configure.in b/Build/source/texk/dvipdfmx/configure.in index 66a5d53363a..9a2fb0c99a2 100644 --- a/Build/source/texk/dvipdfmx/configure.in +++ b/Build/source/texk/dvipdfmx/configure.in @@ -68,10 +68,10 @@ with -L pointing to the directory containing libkpathsea.a. ) dnl Check kpathsea support for required formats and funcs. - MAW_CHECK_KPSE_SUPPORT([dvipdfmx]) + CHO_CHECK_KPSE_SUPPORT([dvipdfmx]) dnl Check for TDS version kpathsea library supports. - MAW_CHECK_KPSE_TDS_VERSION + CHO_CHECK_KPSE_TDS_VERSION fi @@ -106,12 +106,12 @@ if test "x$enable_tetex_build" = xyes; then # Get these common libraries from the sources, too. # Seems like it would be simpler to treat kpathsea this way too, but # we're just starting from what lcdf-typetools did. - sinclude(../../libs/libpng/withenable.ac) - sinclude(../../libs/libpng/libpng.ac) - sinclude(../../libs/zlib/withenable.ac) sinclude(../../libs/zlib/zlib.ac) + sinclude(../../libs/libpng/withenable.ac) + sinclude(../../libs/libpng/libpng.ac) + # yes, we have zlib and png. AC_DEFINE(HAVE_ZLIB) AC_DEFINE(HAVE_LIBPNG) @@ -128,9 +128,9 @@ if test "x$enable_tetex_build" = xyes; then LIBS="-lkpathsea -lm $LIBS" AC_MSG_NOTICE([tetex build enabled, LIBS now: $LIBS]) else - MAW_HAS_LIBPAPER - MAW_HAS_ZLIB - MAW_HAS_LIBPNG + CHO_HAS_LIBPAPER + CHO_HAS_ZLIB + CHO_HAS_LIBPNG dnl these variables are defined in the tetex case and used in src/Makefile.am. dnl just let them be empty. diff --git a/Build/source/texk/dvipdfmx/data/Makefile.in b/Build/source/texk/dvipdfmx/data/Makefile.in index f4a0101c5f5..5628b3a3bab 100644 --- a/Build/source/texk/dvipdfmx/data/Makefile.in +++ b/Build/source/texk/dvipdfmx/data/Makefile.in @@ -33,12 +33,12 @@ subdir = data DIST_COMMON = $(dist_pkgdata_DATA) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/maw-kpse.m4 \ - $(top_srcdir)/m4/maw-libs.m4 $(top_srcdir)/m4/maw-time.m4 \ - $(top_srcdir)/../../libs/libpng/withenable.ac \ - $(top_srcdir)/../../libs/libpng/libpng.ac \ +am__aclocal_m4_deps = $(top_srcdir)/m4/cho-kpse.m4 \ + $(top_srcdir)/m4/cho-libs.m4 $(top_srcdir)/m4/maw-time.m4 \ $(top_srcdir)/../../libs/zlib/withenable.ac \ $(top_srcdir)/../../libs/zlib/zlib.ac \ + $(top_srcdir)/../../libs/libpng/withenable.ac \ + $(top_srcdir)/../../libs/libpng/libpng.ac \ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/texk/dvipdfmx/m4/maw-kpse.m4 b/Build/source/texk/dvipdfmx/m4/cho-kpse.m4 index b2d9aac4e63..9668fa21d85 100644 --- a/Build/source/texk/dvipdfmx/m4/maw-kpse.m4 +++ b/Build/source/texk/dvipdfmx/m4/cho-kpse.m4 @@ -1,6 +1,5 @@ -# maw-kpse.m4 - kpathsea features -# Copyright (C) 1998 - 2008 Mark A. Wicks <mwicks@kettering.edu> -# Kettering University +# cho-kpse.m4 - kpathsea features +# Copyright (C) 1998 - 2008 Jin-Hwan Cho <chofchof@ktug.or.kr> # # This file is free software; the copyright holders # give unlimited permission to copy and/or distribute it, @@ -8,10 +7,10 @@ # serial 1 -# MAW_CHECK_KPSE_SUPPORT(PACKAGE-NAME) +# CHO_CHECK_KPSE_SUPPORT(PACKAGE-NAME) # ------------------------------------ # Check for kpathsea features -AC_DEFUN([MAW_CHECK_KPSE_SUPPORT], +AC_DEFUN([CHO_CHECK_KPSE_SUPPORT], [AC_MSG_CHECKING([whether you have kpathsea headers and they know about the required file formats]) AC_TRY_COMPILE( [#include <stdio.h> @@ -32,12 +31,12 @@ 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 "tex-file.h"])]) -])# MAW_CHECK_KPSE_SUPPORT +])# CHO_CHECK_KPSE_SUPPORT -# MAW_CHECK_KPSE_TDS_VERSION +# CHO_CHECK_KPSE_TDS_VERSION # -------------------------- # Check for enc, cmap, sfd formats -AC_DEFUN([MAW_CHECK_KPSE_TDS_VERSION], +AC_DEFUN([CHO_CHECK_KPSE_TDS_VERSION], [AC_MSG_CHECKING([whether kpathsea library supports TDS version 1.1 installation]) AC_TRY_COMPILE( [#include <stdio.h> @@ -53,5 +52,5 @@ AC_DEFUN([MAW_CHECK_KPSE_TDS_VERSION], [AC_MSG_RESULT(no) AC_DEFINE([__TDS_VERSION__], [0x200302L], [Define if your libkpathsea supports enc formats]) AM_CONDITIONAL([TDS_VERSION_11], [false])]) -])# MAW_CHECK_KPSE_TDS_VERSION +])# CHO_CHECK_KPSE_TDS_VERSION diff --git a/Build/source/texk/dvipdfmx/m4/maw-libs.m4 b/Build/source/texk/dvipdfmx/m4/cho-libs.m4 index 85222d14904..3687a0bb9f5 100644 --- a/Build/source/texk/dvipdfmx/m4/maw-libs.m4 +++ b/Build/source/texk/dvipdfmx/m4/cho-libs.m4 @@ -1,6 +1,5 @@ -# maw-libs.m4 - various libraries -# Copyright (C) 1998 - 2008 Mark A. Wicks <mwicks@kettering.edu> -# Kettering University +# cho-libs.m4 - various libraries +# Copyright (C) 1998 - 2008 Jin-Hwan Cho <chofchof@ktug.or.kr> # # This file is free software; the copyright holders # give unlimited permission to copy and/or distribute it, @@ -8,10 +7,10 @@ # serial 1 -# MAW_HAS_ZLIB +# CHO_HAS_ZLIB # ------------ # Check for zlib -AC_DEFUN([MAW_HAS_ZLIB], +AC_DEFUN([CHO_HAS_ZLIB], [_cppflags=$CPPFLAGS _ldflags=$LDFLAGS AC_ARG_WITH([zlib], [AS_HELP_STRING([--with-zlib=DIR], [use zlib include/library files from DIR])], @@ -31,12 +30,12 @@ AC_DEFUN([MAW_HAS_ZLIB], [CPPFLAGS=$_cppflags LDDFLAGS=$_ldflags AC_MSG_RESULT(no)]) -])# MAW_HAS_ZLIB +])# CHO_HAS_ZLIB -# MAW_HAS_LIBPNG +# CHO_HAS_LIBPNG # -------------- # Check for libpng -AC_DEFUN([MAW_HAS_LIBPNG], +AC_DEFUN([CHO_HAS_LIBPNG], [_cppflags=$CPPFLAGS _ldflags=$LDFLAGS AC_ARG_WITH([png], [AS_HELP_STRING([--with-png=DIR], [use png include/library files from DIR])], @@ -56,12 +55,12 @@ AC_DEFUN([MAW_HAS_LIBPNG], [CPPFLAGS=$_cppflags LDDFLAGS=$_ldflags AC_MSG_RESULT(no)]) -])# MAW_HAS_LIBPNG +])# CHO_HAS_LIBPNG -# MAW_HAS_LIBPAPER +# CHO_HAS_LIBPAPER # ---------------- # Check for libpaper -AC_DEFUN([MAW_HAS_LIBPAPER], +AC_DEFUN([CHO_HAS_LIBPAPER], [_cppflags=$CPPFLAGS _ldflags=$LDFLAGS AC_ARG_WITH([paper], [AS_HELP_STRING([--with-paper=DIR], [use paper include/library files from DIR])], @@ -79,12 +78,12 @@ AC_DEFUN([MAW_HAS_LIBPAPER], [CPPFLAGS=$_cppflags LDDFLAGS=$_ldflags AC_MSG_RESULT(no)]) -])# MAW_HAS_LIBPAPER +])# CHO_HAS_LIBPAPER -# MAW_HAS_LIBFONTCONFIG +# CHO_HAS_LIBFONTCONFIG # --------------------- # Check for libfontconfig -AC_DEFUN([MAW_HAS_LIBFONTCONFIG], +AC_DEFUN([CHO_HAS_LIBFONTCONFIG], [_cppflags=$CPPFLAGS _ldflags=$LDFLAGS have_libfontconfig=no AC_ARG_WITH([fontconfig], @@ -105,12 +104,12 @@ AC_DEFUN([MAW_HAS_LIBFONTCONFIG], [CPPFLAGS=$_cppflags LDDFLAGS=$_ldflags AC_MSG_RESULT(no)]) -])# MAW_HAS_LIBFONTCONFIG +])# CHO_HAS_LIBFONTCONFIG -# MAW_CHECK_LIBFREETYPE(PACKAGE-NAME) +# CHO_CHECK_LIBFREETYPE(PACKAGE-NAME) # ----------------------------------- # Check for libfreetype, fail with error if not found -AC_DEFUN([MAW_CHECK_LIBFREETYPE], +AC_DEFUN([CHO_CHECK_LIBFREETYPE], [_cppflags=$CPPFLAGS _ldflags=$LDFLAGS using_installed_freetype=yes AC_ARG_WITH(ft2lib, @@ -147,5 +146,5 @@ AC_DEFUN([MAW_CHECK_LIBFREETYPE], You can use the --with-freetype2 option to indicate the location of the installed freetype2, or --with-ft2lib and --with-ft2include to point to the libfreetype.a library and the FreeType2 include files.])]) -])# MAW_CHECK_LIBFREETYPE +])# CHO_CHECK_LIBFREETYPE diff --git a/Build/source/texk/dvipdfmx/src/Makefile.in b/Build/source/texk/dvipdfmx/src/Makefile.in index 439f79eb26e..a3b1661c765 100644 --- a/Build/source/texk/dvipdfmx/src/Makefile.in +++ b/Build/source/texk/dvipdfmx/src/Makefile.in @@ -34,12 +34,12 @@ bin_PROGRAMS = dvipdfmx$(EXEEXT) subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/maw-kpse.m4 \ - $(top_srcdir)/m4/maw-libs.m4 $(top_srcdir)/m4/maw-time.m4 \ - $(top_srcdir)/../../libs/libpng/withenable.ac \ - $(top_srcdir)/../../libs/libpng/libpng.ac \ +am__aclocal_m4_deps = $(top_srcdir)/m4/cho-kpse.m4 \ + $(top_srcdir)/m4/cho-libs.m4 $(top_srcdir)/m4/maw-time.m4 \ $(top_srcdir)/../../libs/zlib/withenable.ac \ $(top_srcdir)/../../libs/zlib/zlib.ac \ + $(top_srcdir)/../../libs/libpng/withenable.ac \ + $(top_srcdir)/../../libs/libpng/libpng.ac \ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) |