diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-21 09:44:45 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-21 09:44:45 +0000 |
commit | b77e78eaf3652b80e78ae80f770bd3bdf721363d (patch) | |
tree | d3c67296e30534c63d02c5bb5e5790b1d9150cd0 /Build/source/texk/lcdf-typetools | |
parent | ad04e2284cbf8d1a4b268636c7451f89d29c4d0a (diff) |
new build system: mode texk/xdvik and general update
git-svn-id: svn://tug.org/texlive/trunk@12771 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/lcdf-typetools')
-rw-r--r-- | Build/source/texk/lcdf-typetools/ac/lcdf-typetools.ac | 6 | ||||
-rw-r--r-- | Build/source/texk/lcdf-typetools/ac/withenable.ac | 6 | ||||
-rwxr-xr-x | Build/source/texk/lcdf-typetools/configure | 49 | ||||
-rw-r--r-- | Build/source/texk/lcdf-typetools/configure.ac | 4 |
4 files changed, 58 insertions, 7 deletions
diff --git a/Build/source/texk/lcdf-typetools/ac/lcdf-typetools.ac b/Build/source/texk/lcdf-typetools/ac/lcdf-typetools.ac index 22adc8a8b9d..7df15574618 100644 --- a/Build/source/texk/lcdf-typetools/ac/lcdf-typetools.ac +++ b/Build/source/texk/lcdf-typetools/ac/lcdf-typetools.ac @@ -1,4 +1,8 @@ -## texk/lcdf-typetools/ac/lcdf-typetools.ac +## texk/lcdf-typetools/ac/lcdf-typetools.ac: configure.ac fragment for the TeX Live subdirectory texk/lcdf-typetools/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options for lcdf-typetools m4_define_default([kpse_indent_26], [26])[]dnl m4_define([kpse_lcdf_typetools_progs], diff --git a/Build/source/texk/lcdf-typetools/ac/withenable.ac b/Build/source/texk/lcdf-typetools/ac/withenable.ac index ea825fd10e1..fdefd1ed472 100644 --- a/Build/source/texk/lcdf-typetools/ac/withenable.ac +++ b/Build/source/texk/lcdf-typetools/ac/withenable.ac @@ -1,4 +1,8 @@ -## texk/lcdf-typetools/ac/withenable.ac +## texk/lcdf-typetools/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/lcdf-typetools/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for lcdf-typetools KPSE_WITH_PROG([lcdf-typetools], [kpathsea]) m4_include(kpse_TL[texk/lcdf-typetools/ac/lcdf-typetools.ac]) diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure index be732244e31..53003774c77 100755 --- a/Build/source/texk/lcdf-typetools/configure +++ b/Build/source/texk/lcdf-typetools/configure @@ -17325,7 +17325,6 @@ if test "${enable_cxx_runtime_hack+set}" = set; then fi -cpp_link_hack=false if test "x$GXX:$enable_cxx_runtime_hack" = xyes:yes; then ac_ext=cpp @@ -17857,7 +17856,7 @@ fi -## texk/lcdf-typetools/ac/lcdf-typetools.ac +## texk/lcdf-typetools/ac/lcdf-typetools.ac: configure.ac fragment for the TeX Live subdirectory texk/lcdf-typetools/ ## configure options for lcdf-typetools # Check whether --enable-cfftot1 was given. if test "${enable_cfftot1+set}" = set; then @@ -19717,6 +19716,28 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test "x$with_kpathsea" = xno; then + if test "x$enable_build" = xno; then + { $as_echo "$as_me:$LINENO: WARNING: building lcdf-typetools has been disabled and would fail because + +========================================= + +I can't find the kpathsea header and/or library files. Tell me where to look +using the --with-kpathsea-includes=DIR option (header files under +DIR/kpathsea) and --with-kpathsea-libdir=DIR option (library under DIR), or +disable support using --without-kpathsea. + +=========================================" >&5 +$as_echo "$as_me: WARNING: building lcdf-typetools has been disabled and would fail because + +========================================= + +I can't find the kpathsea header and/or library files. Tell me where to look +using the --with-kpathsea-includes=DIR option (header files under +DIR/kpathsea) and --with-kpathsea-libdir=DIR option (library under DIR), or +disable support using --without-kpathsea. + +=========================================" >&2;} +else { { $as_echo "$as_me:$LINENO: error: ========================================= @@ -19736,6 +19757,9 @@ disable support using --without-kpathsea. =========================================" >&2;} { (exit 1); exit 1; }; } +fi + + fi fi if test "x$with_kpathsea" != xno; then @@ -22824,7 +22848,23 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi fi if test $ac_ntoh_defined = no; then - { { $as_echo "$as_me:$LINENO: error: + if test "x$enable_build" = xno; then + { $as_echo "$as_me:$LINENO: WARNING: building lcdf-typetools has been disabled and would fail because + +========================================= + +Cannot find a definition for ntohs and/or ntohl! + +=========================================" >&5 +$as_echo "$as_me: WARNING: building lcdf-typetools has been disabled and would fail because + +========================================= + +Cannot find a definition for ntohs and/or ntohl! + +=========================================" >&2;} +else + { { $as_echo "$as_me:$LINENO: error: ========================================= Cannot find a definition for ntohs and/or ntohl! @@ -22838,6 +22878,9 @@ Cannot find a definition for ntohs and/or ntohl! =========================================" >&2;} { (exit 1); exit 1; }; } fi + + +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff --git a/Build/source/texk/lcdf-typetools/configure.ac b/Build/source/texk/lcdf-typetools/configure.ac index fcd61407b1c..d0870155c1d 100644 --- a/Build/source/texk/lcdf-typetools/configure.ac +++ b/Build/source/texk/lcdf-typetools/configure.ac @@ -73,7 +73,7 @@ if test "x$with_kpathsea" != xno; then with_kpathsea=no]) if test "x$with_kpathsea" = xno; then - AC_MSG_ERROR([ + KPSE_MSG_ERROR([lcdf-typetools], [ ========================================= I can't find the kpathsea header and/or library files. Tell me where to look @@ -245,7 +245,7 @@ ac_ntoh_defined=yes], fi fi if test $ac_ntoh_defined = no; then - AC_MSG_ERROR([ + KPSE_MSG_ERROR([lcdf-typetools], [ ========================================= Cannot find a definition for ntohs and/or ntohl! |