From 0430c99a4f05acd33a0910a2f34e6236ddba7132 Mon Sep 17 00:00:00 2001 From: Jonathan Kew Date: Thu, 13 Mar 2008 14:51:08 +0000 Subject: update attributions of various configure tests that aren't from the original dvipdfm git-svn-id: svn://tug.org/texlive/trunk@6953 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/xdvipdfmx/aclocal.m4 | 22 ++-- Build/source/texk/xdvipdfmx/configure | 80 +++++++-------- Build/source/texk/xdvipdfmx/configure.in | 16 +-- Build/source/texk/xdvipdfmx/m4/cho-kpse.m4 | 56 +++++++++++ Build/source/texk/xdvipdfmx/m4/cho-libs.m4 | 150 +++++++++++++++++++++++++++ Build/source/texk/xdvipdfmx/m4/jfk-macos.m4 | 25 +++++ Build/source/texk/xdvipdfmx/m4/maw-kpse.m4 | 57 ----------- Build/source/texk/xdvipdfmx/m4/maw-libs.m4 | 151 ---------------------------- Build/source/texk/xdvipdfmx/m4/maw-macos.m4 | 25 ----- 9 files changed, 288 insertions(+), 294 deletions(-) create mode 100644 Build/source/texk/xdvipdfmx/m4/cho-kpse.m4 create mode 100644 Build/source/texk/xdvipdfmx/m4/cho-libs.m4 create mode 100644 Build/source/texk/xdvipdfmx/m4/jfk-macos.m4 delete mode 100644 Build/source/texk/xdvipdfmx/m4/maw-kpse.m4 delete mode 100644 Build/source/texk/xdvipdfmx/m4/maw-libs.m4 delete mode 100644 Build/source/texk/xdvipdfmx/m4/maw-macos.m4 (limited to 'Build/source/texk/xdvipdfmx') diff --git a/Build/source/texk/xdvipdfmx/aclocal.m4 b/Build/source/texk/xdvipdfmx/aclocal.m4 index 919616687c2..cbfa4e44d41 100644 --- a/Build/source/texk/xdvipdfmx/aclocal.m4 +++ b/Build/source/texk/xdvipdfmx/aclocal.m4 @@ -1895,16 +1895,12 @@ esac AC_MSG_RESULT([$dynamic_linker]) test "$dynamic_linker" = no && can_build_shared=no -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" - AC_MSG_NOTICE([overriding sys_lib_search_path_spec with]) - AC_MSG_NOTICE([ predefined value: $sys_lib_search_path_spec]) -fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - AC_MSG_NOTICE([overriding sys_lib_dlsearch_path_spec with]) - AC_MSG_NOTICE([ predefined value: $sys_lib_dlsearch_path_spec]) -fi +AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], +[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], +[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then @@ -7557,7 +7553,7 @@ 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/maw-macos.m4]) +m4_include([m4/cho-kpse.m4]) +m4_include([m4/cho-libs.m4]) +m4_include([m4/jfk-macos.m4]) m4_include([m4/maw-time.m4]) diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure index cee6b8b351b..876170a0896 100755 --- a/Build/source/texk/xdvipdfmx/configure +++ b/Build/source/texk/xdvipdfmx/configure @@ -9739,20 +9739,20 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" - { echo "$as_me:$LINENO: overriding sys_lib_search_path_spec with" >&5 -echo "$as_me: overriding sys_lib_search_path_spec with" >&6;} - { echo "$as_me:$LINENO: predefined value: $sys_lib_search_path_spec" >&5 -echo "$as_me: predefined value: $sys_lib_search_path_spec" >&6;} + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - { echo "$as_me:$LINENO: overriding sys_lib_dlsearch_path_spec with" >&5 -echo "$as_me: overriding sys_lib_dlsearch_path_spec with" >&6;} - { echo "$as_me:$LINENO: predefined value: $sys_lib_dlsearch_path_spec" >&5 -echo "$as_me: predefined value: $sys_lib_dlsearch_path_spec" >&6;} + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" fi +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -13702,20 +13702,20 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" - { echo "$as_me:$LINENO: overriding sys_lib_search_path_spec with" >&5 -echo "$as_me: overriding sys_lib_search_path_spec with" >&6;} - { echo "$as_me:$LINENO: predefined value: $sys_lib_search_path_spec" >&5 -echo "$as_me: predefined value: $sys_lib_search_path_spec" >&6;} + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - { echo "$as_me:$LINENO: overriding sys_lib_dlsearch_path_spec with" >&5 -echo "$as_me: overriding sys_lib_dlsearch_path_spec with" >&6;} - { echo "$as_me:$LINENO: predefined value: $sys_lib_dlsearch_path_spec" >&5 -echo "$as_me: predefined value: $sys_lib_dlsearch_path_spec" >&6;} + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" fi +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -16323,20 +16323,20 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" - { echo "$as_me:$LINENO: overriding sys_lib_search_path_spec with" >&5 -echo "$as_me: overriding sys_lib_search_path_spec with" >&6;} - { echo "$as_me:$LINENO: predefined value: $sys_lib_search_path_spec" >&5 -echo "$as_me: predefined value: $sys_lib_search_path_spec" >&6;} + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - { echo "$as_me:$LINENO: overriding sys_lib_dlsearch_path_spec with" >&5 -echo "$as_me: overriding sys_lib_dlsearch_path_spec with" >&6;} - { echo "$as_me:$LINENO: predefined value: $sys_lib_dlsearch_path_spec" >&5 -echo "$as_me: predefined value: $sys_lib_dlsearch_path_spec" >&6;} + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" fi +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -18944,20 +18944,20 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" - { echo "$as_me:$LINENO: overriding sys_lib_search_path_spec with" >&5 -echo "$as_me: overriding sys_lib_search_path_spec with" >&6;} - { echo "$as_me:$LINENO: predefined value: $sys_lib_search_path_spec" >&5 -echo "$as_me: predefined value: $sys_lib_search_path_spec" >&6;} + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - { echo "$as_me:$LINENO: overriding sys_lib_dlsearch_path_spec with" >&5 -echo "$as_me: overriding sys_lib_dlsearch_path_spec with" >&6;} - { echo "$as_me:$LINENO: predefined value: $sys_lib_dlsearch_path_spec" >&5 -echo "$as_me: predefined value: $sys_lib_dlsearch_path_spec" >&6;} + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" fi +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" diff --git a/Build/source/texk/xdvipdfmx/configure.in b/Build/source/texk/xdvipdfmx/configure.in index 301cf9ddca0..6960310c53b 100644 --- a/Build/source/texk/xdvipdfmx/configure.in +++ b/Build/source/texk/xdvipdfmx/configure.in @@ -69,13 +69,13 @@ with -L pointing to the directory containing libkpathsea.a. ) dnl Check kpathsea support for required formats and funcs. - MAW_CHECK_KPSE_SUPPORT([xdvipdfmx]) + CHO_CHECK_KPSE_SUPPORT([xdvipdfmx]) dnl Check for TDS version kpathsea library supports. - MAW_CHECK_KPSE_TDS_VERSION + CHO_CHECK_KPSE_TDS_VERSION dnl Check for libfreetype, required for xdvipdfmx features - MAW_CHECK_LIBFREETYPE([xdvipdfmx]) + CHO_CHECK_LIBFREETYPE([xdvipdfmx]) fi dnl Checks for header files. @@ -106,8 +106,8 @@ AC_CHECK_SIZEOF(long) dnl Check for additonal libraries. -MAW_HAS_LIBFONTCONFIG -CHO_HAS_APP_SERVICES +CHO_HAS_LIBFONTCONFIG +JFK_HAS_APP_SERVICES if test "x$enable_tetex_build" = xyes; then # Get these common libraries from the sources, too. @@ -149,9 +149,9 @@ if test "x$enable_tetex_build" = xyes; then AC_SUBST(xdvipdfmx_LDFLAGS) 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/xdvipdfmx/m4/cho-kpse.m4 b/Build/source/texk/xdvipdfmx/m4/cho-kpse.m4 new file mode 100644 index 00000000000..9668fa21d85 --- /dev/null +++ b/Build/source/texk/xdvipdfmx/m4/cho-kpse.m4 @@ -0,0 +1,56 @@ +# cho-kpse.m4 - kpathsea features +# Copyright (C) 1998 - 2008 Jin-Hwan Cho +# +# 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 +#include ], + [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 +#include +#include ], + [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 new file mode 100644 index 00000000000..3687a0bb9f5 --- /dev/null +++ b/Build/source/texk/xdvipdfmx/m4/cho-libs.m4 @@ -0,0 +1,150 @@ +# cho-libs.m4 - various libraries +# Copyright (C) 1998 - 2008 Jin-Hwan Cho +# +# 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 ], + [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_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 ], + [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 ], + [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 new file mode 100644 index 00000000000..fc5a2bcae06 --- /dev/null +++ b/Build/source/texk/xdvipdfmx/m4/jfk-macos.m4 @@ -0,0 +1,25 @@ +# jfk-macos.m4 - Mac OS X ApplicationServices framework +# Copyright (C) 2005 - 2008 Jonathan Kew +# 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 ], + [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-kpse.m4 b/Build/source/texk/xdvipdfmx/m4/maw-kpse.m4 deleted file mode 100644 index b2d9aac4e63..00000000000 --- a/Build/source/texk/xdvipdfmx/m4/maw-kpse.m4 +++ /dev/null @@ -1,57 +0,0 @@ -# maw-kpse.m4 - kpathsea features -# Copyright (C) 1998 - 2008 Mark A. Wicks -# Kettering University -# -# 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 - -# MAW_CHECK_KPSE_SUPPORT(PACKAGE-NAME) -# ------------------------------------ -# Check for kpathsea features -AC_DEFUN([MAW_CHECK_KPSE_SUPPORT], -[AC_MSG_CHECKING([whether you have kpathsea headers and they know about the required file formats]) - AC_TRY_COMPILE( - [#include -#include ], - [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"])]) -])# MAW_CHECK_KPSE_SUPPORT - -# MAW_CHECK_KPSE_TDS_VERSION -# -------------------------- -# Check for enc, cmap, sfd formats -AC_DEFUN([MAW_CHECK_KPSE_TDS_VERSION], -[AC_MSG_CHECKING([whether kpathsea library supports TDS version 1.1 installation]) - AC_TRY_COMPILE( - [#include -#include -#include ], - [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])]) -])# MAW_CHECK_KPSE_TDS_VERSION - diff --git a/Build/source/texk/xdvipdfmx/m4/maw-libs.m4 b/Build/source/texk/xdvipdfmx/m4/maw-libs.m4 deleted file mode 100644 index 85222d14904..00000000000 --- a/Build/source/texk/xdvipdfmx/m4/maw-libs.m4 +++ /dev/null @@ -1,151 +0,0 @@ -# maw-libs.m4 - various libraries -# Copyright (C) 1998 - 2008 Mark A. Wicks -# Kettering University -# -# 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 - -# MAW_HAS_ZLIB -# ------------ -# Check for zlib -AC_DEFUN([MAW_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 ], - [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)]) -])# MAW_HAS_ZLIB - -# MAW_HAS_LIBPNG -# -------------- -# Check for libpng -AC_DEFUN([MAW_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_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)]) -])# MAW_HAS_LIBPNG - -# MAW_HAS_LIBPAPER -# ---------------- -# Check for libpaper -AC_DEFUN([MAW_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 ], - [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)]) -])# MAW_HAS_LIBPAPER - -# MAW_HAS_LIBFONTCONFIG -# --------------------- -# Check for libfontconfig -AC_DEFUN([MAW_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 ], - [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)]) -])# MAW_HAS_LIBFONTCONFIG - -# MAW_CHECK_LIBFREETYPE(PACKAGE-NAME) -# ----------------------------------- -# Check for libfreetype, fail with error if not found -AC_DEFUN([MAW_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.])]) -])# MAW_CHECK_LIBFREETYPE - diff --git a/Build/source/texk/xdvipdfmx/m4/maw-macos.m4 b/Build/source/texk/xdvipdfmx/m4/maw-macos.m4 deleted file mode 100644 index 1a4a18f2b98..00000000000 --- a/Build/source/texk/xdvipdfmx/m4/maw-macos.m4 +++ /dev/null @@ -1,25 +0,0 @@ -# maw-macos.m4 - Mac OS X ApplicationServices framework -# Copyright (C) 2005 - 2008 Jin-Hwan Cho -# Some Affiliation ????????????? -# -# 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_APP_SERVICES -# -------------------- -# Check for ApplicationServices -AC_DEFUN([CHO_HAS_APP_SERVICES], -[AC_MSG_CHECKING([for Mac OS X ApplicationServices framework]) - AC_TRY_COMPILE( - [#include ], - [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]) -])# CHO_HAS_APP_SERVICES - -- cgit v1.2.3