diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-03-25 10:27:56 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-03-25 10:27:56 +0000 |
commit | 14fdf58582eb34614c899048041260830bf11319 (patch) | |
tree | 24c257e172a5759d4653886820e0debc19a79e75 /Build/source/texk/dvipdfm | |
parent | 1d49a87a191295313dd1fdbce07dfb18ddd65bfc (diff) |
new build system: update
git-svn-id: svn://tug.org/texlive/trunk@12515 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfm')
-rw-r--r-- | Build/source/texk/dvipdfm/Makefile.am | 2 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm/Makefile.in | 6 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm/aclocal.m4 | 3 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm/config.h.in | 6 | ||||
-rwxr-xr-x | Build/source/texk/dvipdfm/configure | 378 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm/configure.ac | 107 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm/m4/maw-time.m4 | 34 |
7 files changed, 271 insertions, 265 deletions
diff --git a/Build/source/texk/dvipdfm/Makefile.am b/Build/source/texk/dvipdfm/Makefile.am index 3ac73f3e439..910b639a896 100644 --- a/Build/source/texk/dvipdfm/Makefile.am +++ b/Build/source/texk/dvipdfm/Makefile.am @@ -1,5 +1,5 @@ ## -ACLOCAL_AMFLAGS = -I ../../m4 -I m4 +ACLOCAL_AMFLAGS = -I ../../m4 INCLUDES = $(KPATHSEA_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) AM_CPPFLAGS = -DKPATHSEA diff --git a/Build/source/texk/dvipdfm/Makefile.in b/Build/source/texk/dvipdfm/Makefile.in index ac3ebfd35db..bb65745712d 100644 --- a/Build/source/texk/dvipdfm/Makefile.in +++ b/Build/source/texk/dvipdfm/Makefile.in @@ -51,7 +51,7 @@ DIST_COMMON = README $(am__configure_deps) $(dist_bin_SCRIPTS) \ ../../build-aux/ylwrap AUTHORS COPYING ChangeLog INSTALL NEWS \ TODO ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/maw-time.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../../m4/cho-libs.m4 \ $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ @@ -61,7 +61,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/maw-time.m4 \ $(top_srcdir)/../../m4/ltsugar.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/../../m4/maw-time.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -253,7 +253,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../../m4 -I m4 +ACLOCAL_AMFLAGS = -I ../../m4 INCLUDES = $(KPATHSEA_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) AM_CPPFLAGS = -DKPATHSEA dvipdfm_SOURCES = colors.h colorsp.c colorsp.h dvi.c dvi.h dvicodes.h \ diff --git a/Build/source/texk/dvipdfm/aclocal.m4 b/Build/source/texk/dvipdfm/aclocal.m4 index 7ac198fccdc..b7c88645106 100644 --- a/Build/source/texk/dvipdfm/aclocal.m4 +++ b/Build/source/texk/dvipdfm/aclocal.m4 @@ -904,7 +904,7 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -m4_include([m4/maw-time.m4]) +m4_include([../../m4/cho-libs.m4]) m4_include([../../m4/kpse-common.m4]) m4_include([../../m4/kpse-kpathsea-flags.m4]) m4_include([../../m4/kpse-libpng-flags.m4]) @@ -914,3 +914,4 @@ m4_include([../../m4/ltoptions.m4]) m4_include([../../m4/ltsugar.m4]) m4_include([../../m4/ltversion.m4]) m4_include([../../m4/lt~obsolete.m4]) +m4_include([../../m4/maw-time.m4]) diff --git a/Build/source/texk/dvipdfm/config.h.in b/Build/source/texk/dvipdfm/config.h.in index f4d645487ac..533f84d0d15 100644 --- a/Build/source/texk/dvipdfm/config.h.in +++ b/Build/source/texk/dvipdfm/config.h.in @@ -46,12 +46,6 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H -/* Define if you have kpathsea. */ -#undef HAVE_KPATHSEA - -/* Define if kpathsea supports type1 and vf formats. */ -#undef HAVE_KPSE_FORMATS - /* Define if you have libpng and its headers. */ #undef HAVE_LIBPNG diff --git a/Build/source/texk/dvipdfm/configure b/Build/source/texk/dvipdfm/configure index cbee22cab85..9534feb1a10 100755 --- a/Build/source/texk/dvipdfm/configure +++ b/Build/source/texk/dvipdfm/configure @@ -13206,7 +13206,10 @@ fi { $as_echo "$as_me:$LINENO: checking whether time.h defines timezone as an external variable" >&5 $as_echo_n "checking whether time.h defines timezone as an external variable... " >&6; } - cat >conftest.$ac_ext <<_ACEOF +if test "${maw_cv_ext_timezone+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -13242,51 +13245,61 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define HAVE_TIMEZONE 1 -_ACEOF - + maw_cv_ext_timezone=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + maw_cv_ext_timezone=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 +{ $as_echo "$as_me:$LINENO: result: $maw_cv_ext_timezone" >&5 +$as_echo "$maw_cv_ext_timezone" >&6; } +if test "x$maw_cv_ext_timezone" = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_TIMEZONE 1 +_ACEOF -{ $as_echo "$as_me:$LINENO: checking whether struct tm has tm_gmtoff as a member" >&5 -$as_echo_n "checking whether struct tm has tm_gmtoff as a member... " >&6; } - cat >conftest.$ac_ext <<_ACEOF +fi + + +{ $as_echo "$as_me:$LINENO: checking for struct tm.tm_gmtoff" >&5 +$as_echo_n "checking for struct tm.tm_gmtoff... " >&6; } +if test "${ac_cv_member_struct_tm_tm_gmtoff+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. */ #include <time.h> + int main () { -struct tm *tp; tp->tm_gmtoff; +static struct tm ac_aggr; +if (ac_aggr.tm_gmtoff) +return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +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_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -13295,28 +13308,71 @@ $as_echo "$ac_try_echo") >&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 - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + } && test -s conftest.$ac_objext; then + ac_cv_member_struct_tm_tm_gmtoff=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -cat >>confdefs.h <<\_ACEOF -#define HAVE_TM_GMTOFF 1 + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <time.h> +int +main () +{ +static struct tm ac_aggr; +if (sizeof ac_aggr.tm_gmtoff) +return 0; + ; + return 0; +} +_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_cv_member_struct_tm_tm_gmtoff=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + ac_cv_member_struct_tm_tm_gmtoff=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_gmtoff" >&5 +$as_echo "$ac_cv_member_struct_tm_tm_gmtoff" >&6; } +if test "x$ac_cv_member_struct_tm_tm_gmtoff" = x""yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_TM_GMTOFF 1 +_ACEOF + fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext { $as_echo "$as_me:$LINENO: checking for working memcmp" >&5 @@ -15020,26 +15076,29 @@ ${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngcon fi -save_CPPFLAGS=$CPPFLAGS -save_LIBS=$LIBS +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS CPPFLAGS="$CPPFLAGS $KPATHSEA_INCLUDES" LIBS="$KPATHSEA_LIBS $LIBS" -{ $as_echo "$as_me:$LINENO: checking whether you have kpathsea headers and they know about the required file formats" >&5 -$as_echo_n "checking whether you have kpathsea headers and they know about the required file formats... " >&6; } -cat >conftest.$ac_ext <<_ACEOF + +{ $as_echo "$as_me:$LINENO: checking whether kpathsea declares the kpse_type1_format" >&5 +$as_echo_n "checking whether kpathsea declares the kpse_type1_format... " >&6; } +if test "${kpse_cv_have_type1_format+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. */ -#include <stdio.h> -#include <kpathsea/tex-file.h> +#include <kpathsea/kpathsea.h> int main () { -kpse_tex_ps_header_format; kpse_type1_format; kpse_vf_format; +kpse_type1_format ; return 0; } @@ -15065,63 +15124,61 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define HAVE_KPATHSEA 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define HAVE_KPSE_FORMATS 1 -_ACEOF - + kpse_cv_have_type1_format=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: PS_HEADER and/or VF formats not found in Kpathsea header files. + kpse_cv_have_type1_format=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 +{ $as_echo "$as_me:$LINENO: result: $kpse_cv_have_type1_format" >&5 +$as_echo "$kpse_cv_have_type1_format" >&6; } +if test "x$kpse_cv_have_type1_format" = xyes; then + : +else + { { $as_echo "$as_me:$LINENO: error: Required file formats not found in Kpathsea header files. This version of dvipdfm 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/tex-file.h\" +the file \"kpathsea/kpathsea.h\" " >&5 -$as_echo "$as_me: error: PS_HEADER and/or VF formats not found in Kpathsea header files. +$as_echo "$as_me: error: Required file formats not found in Kpathsea header files. This version of dvipdfm 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/tex-file.h\" +the file \"kpathsea/kpathsea.h\" " >&2;} { (exit 1); exit 1; }; } fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: checking whether your kpathsea supports Omega OFM file formats" >&5 -$as_echo_n "checking whether your kpathsea supports Omega OFM file formats... " >&6; } -cat >conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:$LINENO: checking whether kpathsea declares the kpse_ofm_format" >&5 +$as_echo_n "checking whether kpathsea declares the kpse_ofm_format... " >&6; } +if test "${kpse_cv_have_ofm_format+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. */ -#include <stdio.h> -#include <kpathsea/tex-file.h> +#include <kpathsea/kpathsea.h> int main () { -kpse_ofm_format; +kpse_ofm_format ; return 0; } @@ -15147,39 +15204,45 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define HAVE_OMEGA_FORMATS 1 -_ACEOF - + kpse_cv_have_ofm_format=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + kpse_cv_have_ofm_format=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 +{ $as_echo "$as_me:$LINENO: result: $kpse_cv_have_ofm_format" >&5 +$as_echo "$kpse_cv_have_ofm_format" >&6; } +if test "x$kpse_cv_have_ofm_format" = xyes; then -{ $as_echo "$as_me:$LINENO: checking whether your kpathsea supports Truetype (TTF) file formats" >&5 -$as_echo_n "checking whether your kpathsea supports Truetype (TTF) file formats... " >&6; } -cat >conftest.$ac_ext <<_ACEOF +cat >>confdefs.h <<\_ACEOF +#define HAVE_OMEGA_FORMATS 1 +_ACEOF + +fi + + +{ $as_echo "$as_me:$LINENO: checking whether kpathsea declares the kpse_truetype_format" >&5 +$as_echo_n "checking whether kpathsea declares the kpse_truetype_format... " >&6; } +if test "${kpse_cv_have_truetype_format+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. */ -#include <stdio.h> -#include <kpathsea/tex-file.h> +#include <kpathsea/kpathsea.h> int main () { -kpse_truetype_format; +kpse_truetype_format ; return 0; } @@ -15205,25 +15268,29 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - have_ttf=yes - -cat >>confdefs.h <<\_ACEOF -#define HAVE_TTF_FORMATS 1 -_ACEOF - + kpse_cv_have_truetype_format=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - have_ttf=no + kpse_cv_have_truetype_format=no fi rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $have_ttf" >&5 -$as_echo "$have_ttf" >&6; } - if test "x$have_ttf" = xyes; then +fi +{ $as_echo "$as_me:$LINENO: result: $kpse_cv_have_truetype_format" >&5 +$as_echo "$kpse_cv_have_truetype_format" >&6; } +if test "x$kpse_cv_have_truetype_format" = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_TTF_FORMATS 1 +_ACEOF + +fi + + if test "x$kpse_cv_have_truetype_format" = xyes; then HAVE_TTF_TRUE= HAVE_TTF_FALSE='#' else @@ -15232,33 +15299,39 @@ else fi -{ $as_echo "$as_me:$LINENO: checking whether your kpathsea has xbasename" >&5 -$as_echo_n "checking whether your kpathsea has xbasename... " >&6; } -cat >conftest.$ac_ext <<_ACEOF +{ $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 + $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. */ -#include <stdio.h> -#include <kpathsea/lib.h> +#include <kpathsea/kpathsea.h> + int main () { -xbasename; +#ifndef xbasename + (void) xbasename; +#endif + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +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_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -15267,35 +15340,38 @@ $as_echo "$ac_try_echo") >&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 - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + } && test -s conftest.$ac_objext; then + ac_cv_have_decl_xbasename=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_decl_xbasename=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_xbasename" >&5 +$as_echo "$ac_cv_have_decl_xbasename" >&6; } +if test "x$ac_cv_have_decl_xbasename" = x""yes; then cat >>confdefs.h <<\_ACEOF #define HAVE_XBASENAME 1 _ACEOF -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -CPPFLAGS="$save_CPPFLAGS $ZLIB_INCLUDES" -LIBS="$ZLIB_LIBS $save_LIBS" + +CPPFLAGS="$CPPFLAGS $ZLIB_INCLUDES" +LIBS="$ZLIB_LIBS $LIBS" { $as_echo "$as_me:$LINENO: checking for zlib header files and library" >&5 $as_echo_n "checking for zlib header files and library... " >&6; } -cat >conftest.$ac_ext <<_ACEOF +if test "${cho_cv_have_zlib+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -15331,8 +15407,21 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + cho_cv_have_zlib=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cho_cv_have_zlib=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 +{ $as_echo "$as_me:$LINENO: result: $cho_cv_have_zlib" >&5 +$as_echo "$cho_cv_have_zlib" >&6; } +if test "x$cho_cv_have_zlib" = xyes; then for ac_func in compress do @@ -15543,24 +15632,19 @@ done fi done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + CPPFLAGS="$CPPFLAGS $LIBPNG_INCLUDES" LIBS="$LIBPNG_LIBS $LIBS" -{ $as_echo "$as_me:$LINENO: checking for png header files and library" >&5 -$as_echo_n "checking for png header files and library... " >&6; } -cat >conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:$LINENO: checking for libpng header files and library" >&5 +$as_echo_n "checking for libpng header files and library... " >&6; } +if test "${cho_cv_have_png+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -15596,8 +15680,21 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + cho_cv_have_png=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cho_cv_have_png=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 +{ $as_echo "$as_me:$LINENO: result: $cho_cv_have_png" >&5 +$as_echo "$cho_cv_have_png" >&6; } +if test "x$cho_cv_have_png" = xyes; then for ac_func in png_get_image_width do @@ -15703,20 +15800,13 @@ _ACEOF fi done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -CPPFLAGS=$save_CPPFLAGS -LIBS=$save_LIBS + +CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + ac_config_files="$ac_config_files Makefile" diff --git a/Build/source/texk/dvipdfm/configure.ac b/Build/source/texk/dvipdfm/configure.ac index 2ac9883160f..3a1e1f4eb5f 100644 --- a/Build/source/texk/dvipdfm/configure.ac +++ b/Build/source/texk/dvipdfm/configure.ac @@ -40,90 +40,45 @@ KPSE_KPATHSEA_FLAGS KPSE_ZLIB_FLAGS KPSE_LIBPNG_FLAGS -save_CPPFLAGS=$CPPFLAGS -save_LIBS=$LIBS - -CPPFLAGS="$CPPFLAGS $KPATHSEA_INCLUDES" -LIBS="$KPATHSEA_LIBS $LIBS" - -AC_MSG_CHECKING([whether you have kpathsea headers and they know about the required file formats]) -AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h> -#include <kpathsea/tex-file.h>]], - [[kpse_tex_ps_header_format; kpse_type1_format; kpse_vf_format;]])], - [AC_MSG_RESULT([yes]) - AC_DEFINE([HAVE_KPATHSEA], 1, - [Define if you have kpathsea.]) - AC_DEFINE([HAVE_KPSE_FORMATS], 1, - [Define if kpathsea supports type1 and vf formats.])], - [AC_MSG_RESULT([no]) - AC_MSG_ERROR([PS_HEADER and/or VF formats not found in Kpathsea header files. +KPSE_ADD_FLAGS([kpathsea]) + +dnl Check for required file formats. +dnl We need tex-ps_header, type1, and vf; +dnl of these type1 was introduced last (Feb 1996). +KPSE_CHECK_KPSE_FORMAT([type1], , + [AC_MSG_ERROR([Required file formats not found in Kpathsea header files. This version of dvipdfm 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/tex-file.h" +the file "kpathsea/kpathsea.h" ])]) -AC_MSG_CHECKING([whether your kpathsea supports Omega OFM file formats]) -AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h> -#include <kpathsea/tex-file.h>]], - [[kpse_ofm_format;]])], - [AC_MSG_RESULT([yes]) - AC_DEFINE([HAVE_OMEGA_FORMATS], 1, - [Define if kpathsea understands Omega (OFM/OVF) formats.])], - [AC_MSG_RESULT([no])]) - -AC_MSG_CHECKING([whether your kpathsea supports Truetype (TTF) file formats]) -AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h> -#include <kpathsea/tex-file.h>]], - [[kpse_truetype_format;]])], - [have_ttf=yes - AC_DEFINE([HAVE_TTF_FORMATS], 1, - [Define if kpathsea understands TrueType (TTF) formats.])], - [have_ttf=no]) -AC_MSG_RESULT([$have_ttf]) -AM_CONDITIONAL([HAVE_TTF], [test "x$have_ttf" = xyes]) - -AC_MSG_CHECKING([whether your kpathsea has xbasename]) -AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h> -#include <kpathsea/lib.h>]], - [[xbasename;]])], - [AC_MSG_RESULT([yes]) - AC_DEFINE([HAVE_XBASENAME], 1, - [Define if you have xbasename() in your libkpathsea instead of basename().])], - [AC_MSG_RESULT([no])]) - -CPPFLAGS="$save_CPPFLAGS $ZLIB_INCLUDES" -LIBS="$ZLIB_LIBS $save_LIBS" - -AC_MSG_CHECKING([for zlib header files and library]) -AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <zlib.h>]], - [[z_stream p;]])], - [AC_MSG_RESULT([yes]) - AC_CHECK_FUNCS([compress], - [AC_DEFINE([HAVE_ZLIB], 1, - [Define if you have zlib and its headers.]) - AC_CHECK_FUNCS([compress2], - [AC_DEFINE([HAVE_ZLIB_COMPRESS2], 1, - [Define if your zlib has the compress2 function.])])])], - [AC_MSG_RESULT([no])]) - -CPPFLAGS="$CPPFLAGS $LIBPNG_INCLUDES" -LIBS="$LIBPNG_LIBS $LIBS" - -AC_MSG_CHECKING([for png header files and library]) -AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <png.h>]], - [[png_infop p;]])], - [AC_MSG_RESULT([yes]) - AC_CHECK_FUNCS([png_get_image_width], - [AC_DEFINE([HAVE_LIBPNG], 1, - [Define if you have libpng and its headers.])])], - [AC_MSG_RESULT([no])]) - -CPPFLAGS=$save_CPPFLAGS -LIBS=$save_LIBS +dnl Check for ofm format. +KPSE_CHECK_KPSE_FORMAT([ofm], + [AC_DEFINE([HAVE_OMEGA_FORMATS], 1, + [Define if kpathsea understands Omega (OFM/OVF) formats.])]) + +dnl Check for truetype format. +KPSE_CHECK_KPSE_FORMAT([truetype], + [AC_DEFINE([HAVE_TTF_FORMATS], 1, + [Define if kpathsea understands TrueType (TTF) formats.])]) +AM_CONDITIONAL([HAVE_TTF], [test "x$kpse_cv_have_truetype_format" = xyes]) + +dnl Check for xbasename. +KPSE_CHECK_XBASENAME([AC_DEFINE([HAVE_XBASENAME], 1, + [Define if you have xbasename() in your libkpathsea + instead of basename().])]) + +KPSE_ADD_FLAGS([zlib]) +CHO_CHECK_ZLIB + +KPSE_ADD_FLAGS([libpng]) +CHO_CHECK_LIBPNG + +KPSE_RESTORE_FLAGS AC_CONFIG_FILES([Makefile]) diff --git a/Build/source/texk/dvipdfm/m4/maw-time.m4 b/Build/source/texk/dvipdfm/m4/maw-time.m4 deleted file mode 100644 index 91a6c005ddd..00000000000 --- a/Build/source/texk/dvipdfm/m4/maw-time.m4 +++ /dev/null @@ -1,34 +0,0 @@ -# maw-time.m4 - timezone tests -# Copyright (C) 1998 - 2009 Mark A. Wicks <mwicks@kettering.edu> -# Kettering University -# -# This file is free software; the copyright holder -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# MAW_EXT_TIMEZONE -# ---------------- -AC_DEFUN([MAW_EXT_TIMEZONE], -[AC_MSG_CHECKING([whether time.h defines timezone as an external variable]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], - [[-timezone;]])], - [AC_MSG_RESULT([yes]) - AC_DEFINE([HAVE_TIMEZONE], 1, - [Define if <time.h> has timezone as an external variable.])], - [AC_MSG_RESULT([no])]) -])# MAW_EXT_TIMEZONE - -# MAW_TM_HAS_TM_GMTOFF -# -------------------- -AC_DEFUN([MAW_TM_HAS_TM_GMTOFF], -[AC_MSG_CHECKING([whether struct tm has tm_gmtoff as a member]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], - [[struct tm *tp; tp->tm_gmtoff;]])], - [AC_MSG_RESULT([yes]) - AC_DEFINE([HAVE_TM_GMTOFF], 1, - [Define if struct tm has tm_gmtoff as a member.])], - [AC_MSG_RESULT([no])]) -])# MAW_TM_HAS_TM_GMTOFF - |