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/xdvipdfmx | |
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/xdvipdfmx')
-rw-r--r-- | Build/source/texk/xdvipdfmx/Makefile.am | 5 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/Makefile.in | 15 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/aclocal.m4 | 7 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/config.h.in | 4 | ||||
-rwxr-xr-x | Build/source/texk/xdvipdfmx/configure | 467 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/configure.ac | 133 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/m4/cho-kpse.m4 | 56 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/m4/cho-libs.m4 | 150 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/m4/jfk-macos.m4 | 25 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/m4/maw-time.m4 | 34 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/src/Makefile.in | 7 |
11 files changed, 330 insertions, 573 deletions
diff --git a/Build/source/texk/xdvipdfmx/Makefile.am b/Build/source/texk/xdvipdfmx/Makefile.am index 2e44239c72d..e064309bd63 100644 --- a/Build/source/texk/xdvipdfmx/Makefile.am +++ b/Build/source/texk/xdvipdfmx/Makefile.am @@ -1,5 +1,5 @@ ## -ACLOCAL_AMFLAGS = -I ../../m4 -I m4 +ACLOCAL_AMFLAGS = -I ../../m4 if build SUBDIRS = src @@ -12,7 +12,6 @@ EXTRA_DIST = \ data \ doc \ index.html \ - m4/cho-kpse.m4 \ style_base.css \ style_dflt.css \ style_ie.css \ @@ -20,7 +19,7 @@ EXTRA_DIST = \ ## in case of an SVN repository dist-hook: - rm -rf `find $(distdir)/$(ZLIB_TREE) -name .svn` + rm -rf `find $(distdir) -name .svn` ## Eventually delete these files ## diff --git a/Build/source/texk/xdvipdfmx/Makefile.in b/Build/source/texk/xdvipdfmx/Makefile.in index afabe0885e5..a05d3f3a546 100644 --- a/Build/source/texk/xdvipdfmx/Makefile.in +++ b/Build/source/texk/xdvipdfmx/Makefile.in @@ -46,19 +46,20 @@ DIST_COMMON = README $(am__configure_deps) \ ../../build-aux/ylwrap AUTHORS COPYING ChangeLog INSTALL NEWS \ TODO ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/cho-libs.m4 \ - $(top_srcdir)/m4/jfk-macos.m4 $(top_srcdir)/m4/maw-time.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../../m4/cho-kpse.m4 \ + $(top_srcdir)/../../m4/cho-libs.m4 \ $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ + $(top_srcdir)/../../m4/kpse-macos-framework.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 \ $(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 \ @@ -214,11 +215,11 @@ 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 @build_TRUE@SUBDIRS = src EXTRA_DIST = BUGS ChangeLog.TL contrib data doc index.html \ - m4/cho-kpse.m4 style_base.css style_dflt.css style_ie.css \ - style_plain.css Makefile.am.orig configure.in.orig + style_base.css style_dflt.css style_ie.css style_plain.css \ + Makefile.am.orig configure.in.orig all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -672,7 +673,7 @@ uninstall-am: dist-hook: - rm -rf `find $(distdir)/$(ZLIB_TREE) -name .svn` + rm -rf `find $(distdir) -name .svn` # 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. .NOEXPORT: diff --git a/Build/source/texk/xdvipdfmx/aclocal.m4 b/Build/source/texk/xdvipdfmx/aclocal.m4 index 09b4ae10a1b..5a09e956e66 100644 --- a/Build/source/texk/xdvipdfmx/aclocal.m4 +++ b/Build/source/texk/xdvipdfmx/aclocal.m4 @@ -904,16 +904,17 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -m4_include([m4/cho-libs.m4]) -m4_include([m4/jfk-macos.m4]) -m4_include([m4/maw-time.m4]) +m4_include([../../m4/cho-kpse.m4]) +m4_include([../../m4/cho-libs.m4]) m4_include([../../m4/kpse-common.m4]) m4_include([../../m4/kpse-freetype2-flags.m4]) m4_include([../../m4/kpse-kpathsea-flags.m4]) m4_include([../../m4/kpse-libpng-flags.m4]) +m4_include([../../m4/kpse-macos-framework.m4]) m4_include([../../m4/kpse-zlib-flags.m4]) m4_include([../../m4/libtool.m4]) 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/xdvipdfmx/config.h.in b/Build/source/texk/xdvipdfmx/config.h.in index f7f79fe406a..7db29be6c6c 100644 --- a/Build/source/texk/xdvipdfmx/config.h.in +++ b/Build/source/texk/xdvipdfmx/config.h.in @@ -6,8 +6,8 @@ /* Define to 1 if the `closedir' function returns void instead of `int'. */ #undef CLOSEDIR_VOID -/* Define if you have Mac OS X ApplicationServices */ -#undef HAVE_APP_SERVICES +/* Define to 1 if you have the Mac OS X ApplicationServices framework. */ +#undef HAVE_APPLICATIONSERVICES /* Define to 1 if you have the <assert.h> header file. */ #undef HAVE_ASSERT_H diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure index 117ec697b50..cda840b9bae 100755 --- a/Build/source/texk/xdvipdfmx/configure +++ b/Build/source/texk/xdvipdfmx/configure @@ -14238,7 +14238,10 @@ $as_echo "$as_me: error: unknown endianness { $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 @@ -14274,51 +14277,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 -{ $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 +cat >>confdefs.h <<\_ACEOF +#define HAVE_TIMEZONE 1 +_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 @@ -14327,28 +14340,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 # The cast to long int works around a bug in the HP C Compiler @@ -17332,31 +17388,28 @@ ${top_builddir}/../../libs/freetype2/ft2build.h: 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_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_tex_ps_header_format; - kpse_type1_format; - kpse_vf_format; - kpse_ofm_format; - kpse_ovf_format; - kpse_truetype_format; +kpse_truetype_format ; return 0; } @@ -17382,35 +17435,77 @@ $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; } - { $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 + kpse_cv_have_truetype_format=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + 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 +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 + : +else + { { $as_echo "$as_me:$LINENO: error: Required file formats not found in Kpathsea header files. + +This version of xdvipdfmx 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/kpathsea.h\" + +" >&5 +$as_echo "$as_me: error: Required file formats not found in Kpathsea header files. + +This version of xdvipdfmx 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/kpathsea.h\" + +" >&2;} + { (exit 1); exit 1; }; } +fi + +{ $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 @@ -17419,75 +17514,45 @@ $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 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: This version of xdvipdfmx requires xbasename() in kpathsea library." >&5 -$as_echo "$as_me: error: This version of xdvipdfmx requires xbasename() in kpathsea library." >&2;} - { (exit 1); exit 1; }; } + ac_cv_have_decl_xbasename=no fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +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 + : 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: Required file formats not found in Kpathsea header files. - -This version of xdvipdfmx 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\" - -" >&5 -$as_echo "$as_me: error: Required file formats not found in Kpathsea header files. - -This version of xdvipdfmx 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\" - -" >&2;} + { { $as_echo "$as_me:$LINENO: error: This version of xdvipdfmx requires xbasename in libkpathsea." >&5 +$as_echo "$as_me: error: This version of xdvipdfmx requires xbasename in libkpathsea." >&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 kpathsea library supports TDS version 1.1 installation" >&5 -$as_echo_n "checking whether kpathsea library supports TDS version 1.1 installation... " >&6; } -cat >conftest.$ac_ext <<_ACEOF + +{ $as_echo "$as_me:$LINENO: checking whether kpathsea declares the kpse_opentype_format" >&5 +$as_echo_n "checking whether kpathsea declares the kpse_opentype_format... " >&6; } +if test "${kpse_cv_have_opentype_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/kpathsea.h> -#include <kpathsea/tex-file.h> int main () { -kpse_enc_format; - kpse_cmap_format; - kpse_sfd_format; - kpse_opentype_format; +kpse_opentype_format ; return 0; } @@ -17513,6 +17578,21 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then + kpse_cv_have_opentype_format=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + kpse_cv_have_opentype_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_opentype_format" >&5 +$as_echo "$kpse_cv_have_opentype_format" >&6; } +if test "x$kpse_cv_have_opentype_format" = xyes; then tds_version_11=yes cat >>confdefs.h <<\_ACEOF @@ -17520,19 +17600,15 @@ cat >>confdefs.h <<\_ACEOF _ACEOF else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - tds_version_11=no - cat >>confdefs.h <<\_ACEOF + tds_version_11=no + cat >>confdefs.h <<\_ACEOF #define __TDS_VERSION__ 0x200302L _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 whether libkpathsea supports TDS version 1.1 installation" >&5 +$as_echo_n "checking whether libkpathsea supports TDS version 1.1 installation... " >&6; } { $as_echo "$as_me:$LINENO: result: $tds_version_11" >&5 $as_echo "$tds_version_11" >&6; } if test "x$tds_version_11" = xyes; then @@ -17544,12 +17620,16 @@ else fi -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 @@ -17585,8 +17665,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 @@ -17797,24 +17890,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 @@ -17850,8 +17938,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 @@ -17957,24 +18058,19 @@ _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="$CPPFLAGS $FREETYPE2_INCLUDES" LIBS="$FREETYPE2_LIBS $LIBS" { $as_echo "$as_me:$LINENO: checking for freetype2 header files and library" >&5 $as_echo_n "checking for freetype2 header files and library... " >&6; } -cat >conftest.$ac_ext <<_ACEOF +if test "${cho_cv_have_freetype+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18011,8 +18107,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_freetype=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cho_cv_have_freetype=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_freetype" >&5 +$as_echo "$cho_cv_have_freetype" >&6; } +if test "x$cho_cv_have_freetype" = xyes; then for ac_func in FT_Init_FreeType do @@ -18119,26 +18228,20 @@ 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; } - { { $as_echo "$as_me:$LINENO: error: This version of xdvipdfmx requires that FreeType2 and its headers be available. + { { $as_echo "$as_me:$LINENO: error: This version of xdvipdfmx requires that FreeType2 and its headers be available. You can use the --with-freetype2-includes and/or --with-freetype2-libdir options -to indicate the location of the installed freetype2 library and headers" >&5 +to indicate the location of the installed freetype2 library and headers." >&5 $as_echo "$as_me: error: This version of xdvipdfmx requires that FreeType2 and its headers be available. You can use the --with-freetype2-includes and/or --with-freetype2-libdir options -to indicate the location of the installed freetype2 library and headers" >&2;} +to indicate the location of the installed freetype2 library and headers." >&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 -CPPFLAGS=$save_CPPFLAGS -LIBS=$save_LIBS + +CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + if test "x$enable_tetex_build" != xyes || test ! -d $srdir/../kpathsea; then _cppflags=$CPPFLAGS _ldflags=$LDFLAGS @@ -18296,7 +18399,10 @@ fi { $as_echo "$as_me:$LINENO: checking for Mac OS X ApplicationServices framework" >&5 $as_echo_n "checking for Mac OS X ApplicationServices framework... " >&6; } - cat >conftest.$ac_ext <<_ACEOF +if test "${kpse_cv_have_ApplicationServices+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18306,7 +18412,7 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -ATSFontRef fontRef; +ATSFontRef fontRef ; return 0; } @@ -18329,25 +18435,36 @@ $as_echo "$ac_try_echo") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - have_app_services=yes - -cat >>confdefs.h <<\_ACEOF -#define HAVE_APP_SERVICES 1 -_ACEOF - - LIBS="$LIBS -framework ApplicationServices" + kpse_cv_have_ApplicationServices=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - have_app_services=no + kpse_cv_have_ApplicationServices=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: result: $have_app_services" >&5 -$as_echo "$have_app_services" >&6; } +fi +{ $as_echo "$as_me:$LINENO: result: $kpse_cv_have_ApplicationServices" >&5 +$as_echo "$kpse_cv_have_ApplicationServices" >&6; } +if test "x$kpse_cv_have_ApplicationServices" = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_APPLICATIONSERVICES 1 +_ACEOF -if test "x$have_app_services" = xno; then +fi + + +if test "x$kpse_cv_have_ApplicationServices" = xyes; then + build=yes + +cat >>confdefs.h <<\_ACEOF +#define XETEX_MAC 1 +_ACEOF + + LIBS="$LIBS -framework ApplicationServices" +else _cppflags=$CPPFLAGS _ldflags=$LDFLAGS have_libfontconfig=no @@ -18501,21 +18618,9 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + build=$have_libfontconfig fi -# check that it's valid to define XETEX and possibly XETEX_MAC -if test "x$have_app_services" = xyes; then - build=yes - -cat >>confdefs.h <<\_ACEOF -#define XETEX_MAC 1 -_ACEOF - -elif test "x$have_libfontconfig" = xyes; then - build=yes -else - build=no -fi if test "x$build" = xyes; then cat >>confdefs.h <<\_ACEOF diff --git a/Build/source/texk/xdvipdfmx/configure.ac b/Build/source/texk/xdvipdfmx/configure.ac index 00d2965b8cf..db6fd5ee46e 100644 --- a/Build/source/texk/xdvipdfmx/configure.ac +++ b/Build/source/texk/xdvipdfmx/configure.ac @@ -49,126 +49,41 @@ KPSE_ZLIB_FLAGS KPSE_LIBPNG_FLAGS KPSE_FREETYPE2_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; - kpse_ofm_format; - kpse_ovf_format; - kpse_truetype_format;]])], - [AC_MSG_RESULT([yes]) - 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_MSG_RESULT([no]) - AC_MSG_ERROR([This version of ]Kpse_Package[ requires xbasename() in kpathsea library.])])], - [AC_MSG_RESULT([no]) - AC_MSG_ERROR([Required file formats not found in Kpathsea header files. - -This version of ]Kpse_Package[ 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" - -])]) - -AC_MSG_CHECKING([whether kpathsea library supports TDS version 1.1 installation]) -AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h> -#include <kpathsea/kpathsea.h> -#include <kpathsea/tex-file.h>]], - [[kpse_enc_format; - kpse_cmap_format; - kpse_sfd_format; - kpse_opentype_format;]])], - [tds_version_11=yes - AC_DEFINE([__TDS_VERSION__], [0x200406L], - [Define as 0x200406L if your libkpathsea supports enc formats, - or as 0x200302L otherwise.])], - [tds_version_11=no - AC_DEFINE([__TDS_VERSION__], [0x200302L])]) -AC_MSG_RESULT([$tds_version_11]) -AM_CONDITIONAL([TDS_VERSION_11], [test "x$tds_version_11" = xyes]) - -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="$CPPFLAGS $FREETYPE2_INCLUDES" -LIBS="$FREETYPE2_LIBS $LIBS" - -AC_MSG_CHECKING([for freetype2 header files and library]) -AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ft2build.h> -#include FT_FREETYPE_H]], - [[FT_Face face;]])], - [AC_MSG_RESULT([yes]) - AC_CHECK_FUNCS([FT_Init_FreeType], - [AC_DEFINE([HAVE_LIBFREETYPE], 1, - [Define if you have libfreetype and its headers.])])], - [AC_MSG_RESULT([no]) - AC_MSG_ERROR([This version of ]Kpse_Package[ requires that FreeType2 and its headers be available. -You can use the --with-freetype2-includes and/or --with-freetype2-libdir options -to indicate the location of the installed freetype2 library and headers])]) - -CPPFLAGS=$save_CPPFLAGS -LIBS=$save_LIBS - -dnl We do not provide the configure option '--enable-tetex-build, but may +KPSE_ADD_FLAGS([kpathsea]) +CHO_CHECK_KPSE_SUPPORT([xdvipdfmx]) +CHO_CHECK_KPSE_TDS_VERSION + +KPSE_ADD_FLAGS([zlib]) +CHO_CHECK_ZLIB + +KPSE_ADD_FLAGS([libpng]) +CHO_CHECK_LIBPNG + +KPSE_ADD_FLAGS([freetype2]) +CHO_CHECK_LIBFREETYPE([xdvipdfmx]) + +KPSE_RESTORE_FLAGS + +dnl We do not provide the configure option '--enable-tetex-build', but may dnl inherit enable_tetex_build when part of a teTeX / TeX Live installation. dnl If not, check for libpaper. if test "x$enable_tetex_build" != xyes || test ! -d $srdir/../kpathsea; then - CHO_HAS_LIBPAPER + CHO_CHECK_LIBPAPER fi -dnl Check for additonal libraries. +dnl Check for additional libraries. -JFK_HAS_APP_SERVICES -if test "x$have_app_services" = xno; then - CHO_HAS_LIBFONTCONFIG -fi +KPSE_CHECK_FRAMEWORK([ApplicationServices], [ATSFontRef fontRef]) -# check that it's valid to define XETEX and possibly XETEX_MAC -if test "x$have_app_services" = xyes; then +if test "x$kpse_cv_have_ApplicationServices" = xyes; then build=yes AC_DEFINE([XETEX_MAC], 1, [Define if part of a teTeX/TeX Live build for Mac OS X.]) -elif test "x$have_libfontconfig" = xyes; then - build=yes + LIBS="$LIBS -framework ApplicationServices" else - build=no + CHO_CHECK_LIBFONTCONFIG + build=$have_libfontconfig fi + if test "x$build" = xyes; then AC_DEFINE([XETEX], 1, [Define if part of a teTeX/TeX Live build.]) else diff --git a/Build/source/texk/xdvipdfmx/m4/cho-kpse.m4 b/Build/source/texk/xdvipdfmx/m4/cho-kpse.m4 deleted file mode 100644 index 9668fa21d85..00000000000 --- a/Build/source/texk/xdvipdfmx/m4/cho-kpse.m4 +++ /dev/null @@ -1,56 +0,0 @@ -# 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, -# with or without modifications, as long as this notice is preserved. - -# serial 1 - -# CHO_CHECK_KPSE_SUPPORT(PACKAGE-NAME) -# ------------------------------------ -# Check for kpathsea features -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> -#include <kpathsea/kpathsea.h>], - [kpse_tex_ps_header_format; - kpse_type1_format; - kpse_vf_format; - kpse_ofm_format; - kpse_ovf_format; - kpse_truetype_format;], - [AC_MSG_RESULT(yes) - AC_CHECK_LIB([kpathsea], [xbasename], - [], - [AC_MSG_ERROR([This version of $1 requires xbasename() in kpathsea library.])])], - [AC_MSG_RESULT(no) - AC_MSG_ERROR([This version of $1 requires that kpathsea and its headers be installed. -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"])]) -])# CHO_CHECK_KPSE_SUPPORT - -# CHO_CHECK_KPSE_TDS_VERSION -# -------------------------- -# Check for enc, cmap, sfd formats -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> -#include <kpathsea/kpathsea.h> -#include <kpathsea/tex-file.h>], - [kpse_enc_format; - kpse_cmap_format; - kpse_sfd_format; - kpse_opentype_format;], - [AC_MSG_RESULT(yes) - AC_DEFINE([__TDS_VERSION__], [0x200406L], [Define if your libkpathsea supports enc formats]) - AM_CONDITIONAL([TDS_VERSION_11], [true])], - [AC_MSG_RESULT(no) - AC_DEFINE([__TDS_VERSION__], [0x200302L], [Define if your libkpathsea supports enc formats]) - AM_CONDITIONAL([TDS_VERSION_11], [false])]) -])# CHO_CHECK_KPSE_TDS_VERSION - diff --git a/Build/source/texk/xdvipdfmx/m4/cho-libs.m4 b/Build/source/texk/xdvipdfmx/m4/cho-libs.m4 deleted file mode 100644 index 3687a0bb9f5..00000000000 --- a/Build/source/texk/xdvipdfmx/m4/cho-libs.m4 +++ /dev/null @@ -1,150 +0,0 @@ -# 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, -# with or without modifications, as long as this notice is preserved. - -# serial 1 - -# CHO_HAS_ZLIB -# ------------ -# Check for 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])], - [if test -d "$withval"; then - CPPFLAGS="$CPPFLAGS -I$withval/include" - LDFLAGS="$LDFLAGS -L$withval/lib" - fi]) - AC_MSG_CHECKING([for zlib header files]) - AC_TRY_COMPILE( - [#include <zlib.h>], - [z_stream p;], - [AC_MSG_RESULT(yes) - AC_SEARCH_LIBS([compress], [z], - [AC_DEFINE([HAVE_ZLIB], 1, [Define if you have zlib and its headers]) - AC_CHECK_LIB([z], [compress2], - [AC_DEFINE([HAVE_ZLIB_COMPRESS2], 1, [Define if your zlib has the compress2 function])])])], - [CPPFLAGS=$_cppflags - LDDFLAGS=$_ldflags - AC_MSG_RESULT(no)]) -])# CHO_HAS_ZLIB - -# CHO_HAS_LIBPNG -# -------------- -# Check for 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])], - [if test -d "$withval"; then - CPPFLAGS="$CPPFLAGS -I$withval/include" - LDFLAGS="$LDFLAGS -L$withval/lib" - fi]) - AC_SEARCH_LIBS([pow], [m]) - AC_MSG_CHECKING([for png header files]) - AC_TRY_COMPILE( - [#include <png.h>], - [png_infop p;], - [AC_MSG_RESULT(yes) - AC_SEARCH_LIBS(png_get_image_width, png, - [AC_DEFINE([HAVE_LIBPNG], 1, [Define if you have libpng])], - [], [-lz])], - [CPPFLAGS=$_cppflags - LDDFLAGS=$_ldflags - AC_MSG_RESULT(no)]) -])# CHO_HAS_LIBPNG - -# CHO_HAS_LIBPAPER -# ---------------- -# Check for 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])], - [if test -d "$withval"; then - CPPFLAGS="$CPPFLAGS -I$withval/include" - LDFLAGS="$LDFLAGS -L$withval/lib" - fi]) - AC_MSG_CHECKING([for paper header files]) - AC_TRY_COMPILE( - [#include <paper.h>], - [struct paper *p;], - [AC_MSG_RESULT(yes) - AC_SEARCH_LIBS([paperpswidth], [paper], - [AC_DEFINE(HAVE_LIBPAPER, 1, [Define if you have libpaper])])], - [CPPFLAGS=$_cppflags - LDDFLAGS=$_ldflags - AC_MSG_RESULT(no)]) -])# CHO_HAS_LIBPAPER - -# CHO_HAS_LIBFONTCONFIG -# --------------------- -# Check for libfontconfig -AC_DEFUN([CHO_HAS_LIBFONTCONFIG], -[_cppflags=$CPPFLAGS _ldflags=$LDFLAGS - have_libfontconfig=no - AC_ARG_WITH([fontconfig], - [AS_HELP_STRING([--with-fontconfig=DIR],[use fontconfig include/library files from DIR])], - [if test -d "$withval"; then - CPPFLAGS="$CPPFLAGS -I$withval/include" - LDFLAGS="$LDFLAGS -L$withval/lib" - FONTCONFIGLDFLAGS="-L$withval/lib" - fi]) - AC_MSG_CHECKING([for fontconfig header files]) - AC_TRY_COMPILE( - [#include <fontconfig/fontconfig.h>], - [FcObjectSet *os;], - [AC_MSG_RESULT(yes) - AC_SEARCH_LIBS([FcInit], [fontconfig], - [AC_DEFINE([HAVE_LIBFONTCONFIG], 1, [Define if you have libfontconfig]) - have_libfontconfig=yes])], - [CPPFLAGS=$_cppflags - LDDFLAGS=$_ldflags - AC_MSG_RESULT(no)]) -])# CHO_HAS_LIBFONTCONFIG - -# CHO_CHECK_LIBFREETYPE(PACKAGE-NAME) -# ----------------------------------- -# Check for libfreetype, fail with error if not found -AC_DEFUN([CHO_CHECK_LIBFREETYPE], -[_cppflags=$CPPFLAGS _ldflags=$LDFLAGS - using_installed_freetype=yes - AC_ARG_WITH(ft2lib, - [AS_HELP_STRING([--with-ft2lib=LIB], [use freetype2 library LIB])], - [if test x"$withval" != x; then - LIBS="$LIBS $withval" - using_installed_freetype=no - fi]) - AC_ARG_WITH([ft2include], - [AS_HELP_STRING([--with-ft2include=DIR], [use freetype2 include files from DIR])], - [if test -d "$withval"; then - CPPFLAGS="$CPPFLAGS -I$withval" - fi]) - AC_ARG_WITH([freetype2], - [AS_HELP_STRING([--with-freetype2=DIR], [use installed freetype2 include & lib files from DIR])], - [if test -d "$withval"; then - CPPFLAGS="$CPPFLAGS -I$withval/include/freetype2" - LDFLAGS="$LDFLAGS -L$withval/lib" - fi]) - AC_MSG_CHECKING([for freetype2 header files and library]) - AC_TRY_COMPILE( - [#include "ft2build.h" -#include FT_FREETYPE_H], - [FT_Face face;], - [AC_MSG_RESULT(yes) - if test x"$using_installed_freetype" = xyes; then - AC_SEARCH_LIBS([FT_Init_FreeType], [freetype], - [AC_DEFINE([HAVE_LIBFREETYPE], 1, [Define if you have libfreetype])]) - else - AC_DEFINE([HAVE_LIBFREETYPE], 1) - fi], - [AC_MSG_RESULT(no) - AC_MSG_ERROR([This version of $1 requires that FreeType2 and its headers be available. -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.])]) -])# CHO_CHECK_LIBFREETYPE - diff --git a/Build/source/texk/xdvipdfmx/m4/jfk-macos.m4 b/Build/source/texk/xdvipdfmx/m4/jfk-macos.m4 deleted file mode 100644 index fc5a2bcae06..00000000000 --- a/Build/source/texk/xdvipdfmx/m4/jfk-macos.m4 +++ /dev/null @@ -1,25 +0,0 @@ -# jfk-macos.m4 - Mac OS X ApplicationServices framework -# Copyright (C) 2005 - 2008 Jonathan Kew <jonathan_kew@sil.org> -# SIL International -# -# This file is free software; the copyright holders -# give unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 1 - -# JFK_HAS_APP_SERVICES -# -------------------- -# Check for ApplicationServices -AC_DEFUN([JFK_HAS_APP_SERVICES], -[AC_MSG_CHECKING([for Mac OS X ApplicationServices framework]) - AC_TRY_COMPILE( - [#include <ApplicationServices/ApplicationServices.h>], - [ATSFontRef fontRef;], - [have_app_services=yes - AC_DEFINE([HAVE_APP_SERVICES], 1, [Define if you have Mac OS X ApplicationServices]) - LIBS="$LIBS -framework ApplicationServices"], - [have_app_services=no]) - AC_MSG_RESULT([$have_app_services]) -])# JFK_HAS_APP_SERVICES - diff --git a/Build/source/texk/xdvipdfmx/m4/maw-time.m4 b/Build/source/texk/xdvipdfmx/m4/maw-time.m4 deleted file mode 100644 index 91a6c005ddd..00000000000 --- a/Build/source/texk/xdvipdfmx/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 - diff --git a/Build/source/texk/xdvipdfmx/src/Makefile.in b/Build/source/texk/xdvipdfmx/src/Makefile.in index 7ab66a4fa32..4640e60fe57 100644 --- a/Build/source/texk/xdvipdfmx/src/Makefile.in +++ b/Build/source/texk/xdvipdfmx/src/Makefile.in @@ -36,19 +36,20 @@ bin_PROGRAMS = xdvipdfmx$(EXEEXT) subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/cho-libs.m4 \ - $(top_srcdir)/m4/jfk-macos.m4 $(top_srcdir)/m4/maw-time.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../../m4/cho-kpse.m4 \ + $(top_srcdir)/../../m4/cho-libs.m4 \ $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ + $(top_srcdir)/../../m4/kpse-macos-framework.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 \ $(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) mkinstalldirs = $(install_sh) -d |