diff options
author | Jonathan Kew <jfkthame@googlemail.com> | 2008-03-13 14:51:08 +0000 |
---|---|---|
committer | Jonathan Kew <jfkthame@googlemail.com> | 2008-03-13 14:51:08 +0000 |
commit | 0430c99a4f05acd33a0910a2f34e6236ddba7132 (patch) | |
tree | a5e245954ba97d09dec7a186666ea38901a7b0dc /Build/source/texk/xdvipdfmx | |
parent | 9a80ce12ec6eac2668cbf798dd7b20e74277977d (diff) |
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
Diffstat (limited to 'Build/source/texk/xdvipdfmx')
-rw-r--r-- | Build/source/texk/xdvipdfmx/aclocal.m4 | 22 | ||||
-rwxr-xr-x | Build/source/texk/xdvipdfmx/configure | 80 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/configure.in | 16 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/m4/cho-kpse.m4 (renamed from Build/source/texk/xdvipdfmx/m4/maw-kpse.m4) | 17 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/m4/cho-libs.m4 (renamed from Build/source/texk/xdvipdfmx/m4/maw-libs.m4) | 35 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/m4/jfk-macos.m4 (renamed from Build/source/texk/xdvipdfmx/m4/maw-macos.m4) | 12 |
6 files changed, 88 insertions, 94 deletions
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/maw-kpse.m4 b/Build/source/texk/xdvipdfmx/m4/cho-kpse.m4 index b2d9aac4e63..9668fa21d85 100644 --- a/Build/source/texk/xdvipdfmx/m4/maw-kpse.m4 +++ b/Build/source/texk/xdvipdfmx/m4/cho-kpse.m4 @@ -1,6 +1,5 @@ -# maw-kpse.m4 - kpathsea features -# Copyright (C) 1998 - 2008 Mark A. Wicks <mwicks@kettering.edu> -# Kettering University +# cho-kpse.m4 - kpathsea features +# Copyright (C) 1998 - 2008 Jin-Hwan Cho <chofchof@ktug.or.kr> # # This file is free software; the copyright holders # give unlimited permission to copy and/or distribute it, @@ -8,10 +7,10 @@ # serial 1 -# MAW_CHECK_KPSE_SUPPORT(PACKAGE-NAME) +# CHO_CHECK_KPSE_SUPPORT(PACKAGE-NAME) # ------------------------------------ # Check for kpathsea features -AC_DEFUN([MAW_CHECK_KPSE_SUPPORT], +AC_DEFUN([CHO_CHECK_KPSE_SUPPORT], [AC_MSG_CHECKING([whether you have kpathsea headers and they know about the required file formats]) AC_TRY_COMPILE( [#include <stdio.h> @@ -32,12 +31,12 @@ If you are sure they are installed and in a standard place, maybe you need a newer version of kpathsea? You also might try setting the environment variable CPPFLAGS (or CFLAGS) with -I pointing to the directory containing the file "tex-file.h"])]) -])# MAW_CHECK_KPSE_SUPPORT +])# CHO_CHECK_KPSE_SUPPORT -# MAW_CHECK_KPSE_TDS_VERSION +# CHO_CHECK_KPSE_TDS_VERSION # -------------------------- # Check for enc, cmap, sfd formats -AC_DEFUN([MAW_CHECK_KPSE_TDS_VERSION], +AC_DEFUN([CHO_CHECK_KPSE_TDS_VERSION], [AC_MSG_CHECKING([whether kpathsea library supports TDS version 1.1 installation]) AC_TRY_COMPILE( [#include <stdio.h> @@ -53,5 +52,5 @@ AC_DEFUN([MAW_CHECK_KPSE_TDS_VERSION], [AC_MSG_RESULT(no) AC_DEFINE([__TDS_VERSION__], [0x200302L], [Define if your libkpathsea supports enc formats]) AM_CONDITIONAL([TDS_VERSION_11], [false])]) -])# MAW_CHECK_KPSE_TDS_VERSION +])# CHO_CHECK_KPSE_TDS_VERSION diff --git a/Build/source/texk/xdvipdfmx/m4/maw-libs.m4 b/Build/source/texk/xdvipdfmx/m4/cho-libs.m4 index 85222d14904..3687a0bb9f5 100644 --- a/Build/source/texk/xdvipdfmx/m4/maw-libs.m4 +++ b/Build/source/texk/xdvipdfmx/m4/cho-libs.m4 @@ -1,6 +1,5 @@ -# maw-libs.m4 - various libraries -# Copyright (C) 1998 - 2008 Mark A. Wicks <mwicks@kettering.edu> -# Kettering University +# cho-libs.m4 - various libraries +# Copyright (C) 1998 - 2008 Jin-Hwan Cho <chofchof@ktug.or.kr> # # This file is free software; the copyright holders # give unlimited permission to copy and/or distribute it, @@ -8,10 +7,10 @@ # serial 1 -# MAW_HAS_ZLIB +# CHO_HAS_ZLIB # ------------ # Check for zlib -AC_DEFUN([MAW_HAS_ZLIB], +AC_DEFUN([CHO_HAS_ZLIB], [_cppflags=$CPPFLAGS _ldflags=$LDFLAGS AC_ARG_WITH([zlib], [AS_HELP_STRING([--with-zlib=DIR], [use zlib include/library files from DIR])], @@ -31,12 +30,12 @@ AC_DEFUN([MAW_HAS_ZLIB], [CPPFLAGS=$_cppflags LDDFLAGS=$_ldflags AC_MSG_RESULT(no)]) -])# MAW_HAS_ZLIB +])# CHO_HAS_ZLIB -# MAW_HAS_LIBPNG +# CHO_HAS_LIBPNG # -------------- # Check for libpng -AC_DEFUN([MAW_HAS_LIBPNG], +AC_DEFUN([CHO_HAS_LIBPNG], [_cppflags=$CPPFLAGS _ldflags=$LDFLAGS AC_ARG_WITH([png], [AS_HELP_STRING([--with-png=DIR], [use png include/library files from DIR])], @@ -56,12 +55,12 @@ AC_DEFUN([MAW_HAS_LIBPNG], [CPPFLAGS=$_cppflags LDDFLAGS=$_ldflags AC_MSG_RESULT(no)]) -])# MAW_HAS_LIBPNG +])# CHO_HAS_LIBPNG -# MAW_HAS_LIBPAPER +# CHO_HAS_LIBPAPER # ---------------- # Check for libpaper -AC_DEFUN([MAW_HAS_LIBPAPER], +AC_DEFUN([CHO_HAS_LIBPAPER], [_cppflags=$CPPFLAGS _ldflags=$LDFLAGS AC_ARG_WITH([paper], [AS_HELP_STRING([--with-paper=DIR], [use paper include/library files from DIR])], @@ -79,12 +78,12 @@ AC_DEFUN([MAW_HAS_LIBPAPER], [CPPFLAGS=$_cppflags LDDFLAGS=$_ldflags AC_MSG_RESULT(no)]) -])# MAW_HAS_LIBPAPER +])# CHO_HAS_LIBPAPER -# MAW_HAS_LIBFONTCONFIG +# CHO_HAS_LIBFONTCONFIG # --------------------- # Check for libfontconfig -AC_DEFUN([MAW_HAS_LIBFONTCONFIG], +AC_DEFUN([CHO_HAS_LIBFONTCONFIG], [_cppflags=$CPPFLAGS _ldflags=$LDFLAGS have_libfontconfig=no AC_ARG_WITH([fontconfig], @@ -105,12 +104,12 @@ AC_DEFUN([MAW_HAS_LIBFONTCONFIG], [CPPFLAGS=$_cppflags LDDFLAGS=$_ldflags AC_MSG_RESULT(no)]) -])# MAW_HAS_LIBFONTCONFIG +])# CHO_HAS_LIBFONTCONFIG -# MAW_CHECK_LIBFREETYPE(PACKAGE-NAME) +# CHO_CHECK_LIBFREETYPE(PACKAGE-NAME) # ----------------------------------- # Check for libfreetype, fail with error if not found -AC_DEFUN([MAW_CHECK_LIBFREETYPE], +AC_DEFUN([CHO_CHECK_LIBFREETYPE], [_cppflags=$CPPFLAGS _ldflags=$LDFLAGS using_installed_freetype=yes AC_ARG_WITH(ft2lib, @@ -147,5 +146,5 @@ AC_DEFUN([MAW_CHECK_LIBFREETYPE], You can use the --with-freetype2 option to indicate the location of the installed freetype2, or --with-ft2lib and --with-ft2include to point to the libfreetype.a library and the FreeType2 include files.])]) -])# MAW_CHECK_LIBFREETYPE +])# CHO_CHECK_LIBFREETYPE diff --git a/Build/source/texk/xdvipdfmx/m4/maw-macos.m4 b/Build/source/texk/xdvipdfmx/m4/jfk-macos.m4 index 1a4a18f2b98..fc5a2bcae06 100644 --- a/Build/source/texk/xdvipdfmx/m4/maw-macos.m4 +++ b/Build/source/texk/xdvipdfmx/m4/jfk-macos.m4 @@ -1,6 +1,6 @@ -# maw-macos.m4 - Mac OS X ApplicationServices framework -# Copyright (C) 2005 - 2008 Jin-Hwan Cho <chofchof@ktug.or.kr> -# Some Affiliation ????????????? +# 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, @@ -8,10 +8,10 @@ # serial 1 -# CHO_HAS_APP_SERVICES +# JFK_HAS_APP_SERVICES # -------------------- # Check for ApplicationServices -AC_DEFUN([CHO_HAS_APP_SERVICES], +AC_DEFUN([JFK_HAS_APP_SERVICES], [AC_MSG_CHECKING([for Mac OS X ApplicationServices framework]) AC_TRY_COMPILE( [#include <ApplicationServices/ApplicationServices.h>], @@ -21,5 +21,5 @@ AC_DEFUN([CHO_HAS_APP_SERVICES], LIBS="$LIBS -framework ApplicationServices"], [have_app_services=no]) AC_MSG_RESULT([$have_app_services]) -])# CHO_HAS_APP_SERVICES +])# JFK_HAS_APP_SERVICES |