summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-04-23 16:33:37 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-04-23 16:33:37 +0000
commitb789d9d640329830153fd0b4ec23c7545100969b (patch)
treec4a428db3de017c18afac09b8a5648162e960e8e /Build/source/texk
parent6fe018282ebe6acac6f4c9aab818346f304e7373 (diff)
build system cleanup
git-svn-id: svn://tug.org/texlive/trunk@12807 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/Makefile.in12
-rw-r--r--Build/source/texk/aclocal.m410
-rw-r--r--Build/source/texk/afm2pl/ac/withenable.ac2
-rwxr-xr-xBuild/source/texk/afm2pl/configure1
-rw-r--r--Build/source/texk/bibtex8/ac/withenable.ac2
-rwxr-xr-xBuild/source/texk/bibtex8/configure1
-rw-r--r--Build/source/texk/cjkutils/ac/withenable.ac2
-rwxr-xr-xBuild/source/texk/cjkutils/configure1
-rwxr-xr-xBuild/source/texk/configure29
-rw-r--r--Build/source/texk/detex/ac/withenable.ac2
-rwxr-xr-xBuild/source/texk/detex/configure1
-rw-r--r--Build/source/texk/devnag/ac/withenable.ac2
-rw-r--r--Build/source/texk/dtl/ac/withenable.ac2
-rwxr-xr-xBuild/source/texk/dtl/configure1
-rw-r--r--Build/source/texk/dvi2tty/ac/withenable.ac2
-rwxr-xr-xBuild/source/texk/dvi2tty/configure1
-rw-r--r--Build/source/texk/dvidvi/ac/withenable.ac2
-rwxr-xr-xBuild/source/texk/dvidvi/configure1
-rw-r--r--Build/source/texk/dviljk/ac/withenable.ac2
-rwxr-xr-xBuild/source/texk/dviljk/configure1
-rw-r--r--Build/source/texk/dvipdfm/ac/withenable.ac2
-rwxr-xr-xBuild/source/texk/dvipdfm/configure3
-rw-r--r--Build/source/texk/dvipdfmx/ac/withenable.ac2
-rwxr-xr-xBuild/source/texk/dvipdfmx/configure37
-rw-r--r--Build/source/texk/dvipng/ac/withenable.ac2
-rwxr-xr-xBuild/source/texk/dvipng/configure72
-rw-r--r--Build/source/texk/dvipng/configure.ac12
-rw-r--r--Build/source/texk/dvipos/ac/withenable.ac2
-rwxr-xr-xBuild/source/texk/dvipos/configure1
-rw-r--r--Build/source/texk/dvipsk/ac/withenable.ac2
-rwxr-xr-xBuild/source/texk/dvipsk/configure1
-rw-r--r--Build/source/texk/gsftopk/ac/withenable.ac2
-rwxr-xr-xBuild/source/texk/gsftopk/configure1
-rw-r--r--Build/source/texk/lacheck/ac/withenable.ac2
-rw-r--r--Build/source/texk/lcdf-typetools/ac/withenable.ac2
-rwxr-xr-xBuild/source/texk/lcdf-typetools/configure1
-rw-r--r--Build/source/texk/makeindexk/ac/withenable.ac2
-rwxr-xr-xBuild/source/texk/makeindexk/configure1
-rw-r--r--Build/source/texk/musixflx/ac/withenable.ac2
-rw-r--r--Build/source/texk/ps2pkm/ac/withenable.ac2
-rwxr-xr-xBuild/source/texk/ps2pkm/configure1
-rw-r--r--Build/source/texk/seetexk/ac/withenable.ac2
-rwxr-xr-xBuild/source/texk/seetexk/configure1
-rw-r--r--Build/source/texk/tetex/ac/withenable.ac2
-rw-r--r--Build/source/texk/tex4htk/ac/withenable.ac2
-rwxr-xr-xBuild/source/texk/tex4htk/configure1
-rw-r--r--Build/source/texk/texlive/ac/withenable.ac2
-rw-r--r--Build/source/texk/ttf2pk/ac/withenable.ac2
-rwxr-xr-xBuild/source/texk/ttf2pk/configure2
-rw-r--r--Build/source/texk/ttfdump/ac/withenable.ac2
-rwxr-xr-xBuild/source/texk/ttfdump/configure1
-rw-r--r--Build/source/texk/web2c/ac/withenable.ac2
-rwxr-xr-xBuild/source/texk/web2c/configure75
-rw-r--r--Build/source/texk/xdv2pdf/ac/withenable.ac2
-rwxr-xr-xBuild/source/texk/xdv2pdf/configure1
-rw-r--r--Build/source/texk/xdvik/ac/withenable.ac2
-rwxr-xr-xBuild/source/texk/xdvik/configure2
-rw-r--r--Build/source/texk/xdvipdfmx/ac/withenable.ac2
-rwxr-xr-xBuild/source/texk/xdvipdfmx/configure64
-rw-r--r--Build/source/texk/xdvipdfmx/configure.ac8
60 files changed, 219 insertions, 185 deletions
diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in
index 6fb5f028f74..c218294970a 100644
--- a/Build/source/texk/Makefile.in
+++ b/Build/source/texk/Makefile.in
@@ -44,11 +44,21 @@ DIST_COMMON = README $(am__configure_deps) \
../build-aux/ltmain.sh ../build-aux/missing \
../build-aux/texinfo.tex ../build-aux/ylwrap ChangeLog
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cxx-hack.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
+ $(top_srcdir)/../m4/kpse-cxx-hack.m4 \
+ $(top_srcdir)/../m4/kpse-freetype-flags.m4 \
+ $(top_srcdir)/../m4/kpse-freetype2-flags.m4 \
+ $(top_srcdir)/../m4/kpse-gd-flags.m4 \
+ $(top_srcdir)/../m4/kpse-graphite-flags.m4 \
+ $(top_srcdir)/../m4/kpse-kpathsea-flags.m4 \
+ $(top_srcdir)/../m4/kpse-libpng-flags.m4 \
$(top_srcdir)/../m4/kpse-options.m4 \
$(top_srcdir)/../m4/kpse-pkgs.m4 \
$(top_srcdir)/../m4/kpse-setup.m4 \
+ $(top_srcdir)/../m4/kpse-t1lib-flags.m4 \
+ $(top_srcdir)/../m4/kpse-teckit-flags.m4 \
$(top_srcdir)/../m4/kpse-web2c.m4 \
+ $(top_srcdir)/../m4/kpse-zlib-flags.m4 \
$(top_srcdir)/../ac/withenable.ac \
$(top_srcdir)/../utils/ac/withenable.ac \
$(top_srcdir)/../utils/dialog/ac/withenable.ac \
diff --git a/Build/source/texk/aclocal.m4 b/Build/source/texk/aclocal.m4
index c917492c6a5..9fae18de399 100644
--- a/Build/source/texk/aclocal.m4
+++ b/Build/source/texk/aclocal.m4
@@ -616,8 +616,18 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+m4_include([../m4/kpse-common.m4])
m4_include([../m4/kpse-cxx-hack.m4])
+m4_include([../m4/kpse-freetype-flags.m4])
+m4_include([../m4/kpse-freetype2-flags.m4])
+m4_include([../m4/kpse-gd-flags.m4])
+m4_include([../m4/kpse-graphite-flags.m4])
+m4_include([../m4/kpse-kpathsea-flags.m4])
+m4_include([../m4/kpse-libpng-flags.m4])
m4_include([../m4/kpse-options.m4])
m4_include([../m4/kpse-pkgs.m4])
m4_include([../m4/kpse-setup.m4])
+m4_include([../m4/kpse-t1lib-flags.m4])
+m4_include([../m4/kpse-teckit-flags.m4])
m4_include([../m4/kpse-web2c.m4])
+m4_include([../m4/kpse-zlib-flags.m4])
diff --git a/Build/source/texk/afm2pl/ac/withenable.ac b/Build/source/texk/afm2pl/ac/withenable.ac
index 7d7539504f6..eb802145f06 100644
--- a/Build/source/texk/afm2pl/ac/withenable.ac
+++ b/Build/source/texk/afm2pl/ac/withenable.ac
@@ -4,4 +4,4 @@ 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 afm2pl
-KPSE_WITH_PROG([afm2pl], [kpathsea])
+KPSE_ENABLE_PROG([afm2pl], [kpathsea])
diff --git a/Build/source/texk/afm2pl/configure b/Build/source/texk/afm2pl/configure
index de624ecda92..9a83640af15 100755
--- a/Build/source/texk/afm2pl/configure
+++ b/Build/source/texk/afm2pl/configure
@@ -14248,6 +14248,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e 's,BLD/texk/,${top_builddir}/../,g'`
KPATHSEA_RULE='# Rebuild libkpathsea
diff --git a/Build/source/texk/bibtex8/ac/withenable.ac b/Build/source/texk/bibtex8/ac/withenable.ac
index 93a32cec26c..b7af8cd8739 100644
--- a/Build/source/texk/bibtex8/ac/withenable.ac
+++ b/Build/source/texk/bibtex8/ac/withenable.ac
@@ -4,4 +4,4 @@ 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 bibtex8
-KPSE_WITH_PROG([bibtex8], [kpathsea])
+KPSE_ENABLE_PROG([bibtex8], [kpathsea])
diff --git a/Build/source/texk/bibtex8/configure b/Build/source/texk/bibtex8/configure
index e3f9efd07d8..fd9a193bb82 100755
--- a/Build/source/texk/bibtex8/configure
+++ b/Build/source/texk/bibtex8/configure
@@ -14148,6 +14148,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e 's,BLD/texk/,${top_builddir}/../,g'`
KPATHSEA_RULE='# Rebuild libkpathsea
diff --git a/Build/source/texk/cjkutils/ac/withenable.ac b/Build/source/texk/cjkutils/ac/withenable.ac
index 723c8a1ab3c..d8d34f12e4d 100644
--- a/Build/source/texk/cjkutils/ac/withenable.ac
+++ b/Build/source/texk/cjkutils/ac/withenable.ac
@@ -4,4 +4,4 @@ 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 cjkutils
-KPSE_WITH_PROG([cjkutils], [kpathsea])
+KPSE_ENABLE_PROG([cjkutils], [kpathsea])
diff --git a/Build/source/texk/cjkutils/configure b/Build/source/texk/cjkutils/configure
index 9ae1fe2b057..e0e7c8fd42c 100755
--- a/Build/source/texk/cjkutils/configure
+++ b/Build/source/texk/cjkutils/configure
@@ -14549,6 +14549,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e 's,BLD/texk/,${top_builddir}/../,g'`
KPATHSEA_RULE='# Rebuild libkpathsea
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 47f47afedbd..f00c9d22282 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -2192,6 +2192,7 @@ if test "x$enable_multiplatform" = xyes; then
fi
+
## ac/withenable.ac: configure.ac fragment for the TeX Live top-level
## utils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/
@@ -3334,15 +3335,25 @@ $as_echo "$as_me: -> installed \`libpng' headers and library" >&6;}
$as_echo "$as_me: error: Sorry, \`--with-system-gd' requires \`--with-system-libpng'" >&2;}
{ (exit 1); exit 1; }; }
fi
+ if test "x$with_system_freetype2" = x; then
+ { $as_echo "$as_me:$LINENO: -> installed \`freetype2' headers and library" >&5
+$as_echo "$as_me: -> installed \`freetype2' headers and library" >&6;}
+ with_system_freetype2=yes
+ ac_configure_args="$ac_configure_args '--with-system-freetype2'"
+ elif test "x$with_system_freetype2" != xyes; then
+ { { $as_echo "$as_me:$LINENO: error: Sorry, \`--with-system-gd' requires \`--with-system-freetype2'" >&5
+$as_echo "$as_me: error: Sorry, \`--with-system-gd' requires \`--with-system-freetype2'" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
fi
test "x$need_gd" = xyes && {
need_libpng=yes
+ need_freetype2=yes
}
## libs/freetype2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/
-## configure options and TL libraries required for freetype2
# Check whether --with-system-freetype2 was given.
if test "${with_system_freetype2+set}" = set; then
@@ -3360,6 +3371,22 @@ $as_echo "$as_me: Assuming installed \`freetype2' headers and library" >&6;}
fi
ac_configure_args="$ac_configure_args '--with-system-freetype2=$with_system_freetype2'"
fi
+if test "x$with_system_freetype2" = xyes; then
+ if test "x$with_system_zlib" = x; then
+ { $as_echo "$as_me:$LINENO: -> installed \`zlib' headers and library" >&5
+$as_echo "$as_me: -> installed \`zlib' headers and library" >&6;}
+ with_system_zlib=yes
+ ac_configure_args="$ac_configure_args '--with-system-zlib'"
+ elif test "x$with_system_zlib" != xyes; then
+ { { $as_echo "$as_me:$LINENO: error: Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" >&5
+$as_echo "$as_me: error: Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+fi
+
+test "x$need_freetype2" = xyes && {
+ need_zlib=yes
+}
## libs/freetype/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype/
diff --git a/Build/source/texk/detex/ac/withenable.ac b/Build/source/texk/detex/ac/withenable.ac
index 3c1c983f3ad..e342f6fd2d7 100644
--- a/Build/source/texk/detex/ac/withenable.ac
+++ b/Build/source/texk/detex/ac/withenable.ac
@@ -4,4 +4,4 @@ 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 detex
-KPSE_WITH_PROG([detex], [kpathsea])
+KPSE_ENABLE_PROG([detex], [kpathsea])
diff --git a/Build/source/texk/detex/configure b/Build/source/texk/detex/configure
index f358f201543..b77bacfbf44 100755
--- a/Build/source/texk/detex/configure
+++ b/Build/source/texk/detex/configure
@@ -14447,6 +14447,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e 's,BLD/texk/,${top_builddir}/../,g'`
KPATHSEA_RULE='# Rebuild libkpathsea
diff --git a/Build/source/texk/devnag/ac/withenable.ac b/Build/source/texk/devnag/ac/withenable.ac
index 1927321a1d7..862a4ae7e2e 100644
--- a/Build/source/texk/devnag/ac/withenable.ac
+++ b/Build/source/texk/devnag/ac/withenable.ac
@@ -4,4 +4,4 @@ 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 devnag
-KPSE_WITH_PROG([devnag])
+KPSE_ENABLE_PROG([devnag])
diff --git a/Build/source/texk/dtl/ac/withenable.ac b/Build/source/texk/dtl/ac/withenable.ac
index 89606bf9304..200c09e1663 100644
--- a/Build/source/texk/dtl/ac/withenable.ac
+++ b/Build/source/texk/dtl/ac/withenable.ac
@@ -4,4 +4,4 @@ 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 dtl
-KPSE_WITH_PROG([dtl], [kpathsea])
+KPSE_ENABLE_PROG([dtl], [kpathsea])
diff --git a/Build/source/texk/dtl/configure b/Build/source/texk/dtl/configure
index 58c23905fb2..f017cb17d4f 100755
--- a/Build/source/texk/dtl/configure
+++ b/Build/source/texk/dtl/configure
@@ -14580,6 +14580,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e 's,BLD/texk/,${top_builddir}/../,g'`
KPATHSEA_RULE='# Rebuild libkpathsea
diff --git a/Build/source/texk/dvi2tty/ac/withenable.ac b/Build/source/texk/dvi2tty/ac/withenable.ac
index 2a6c817a08d..09ef82add68 100644
--- a/Build/source/texk/dvi2tty/ac/withenable.ac
+++ b/Build/source/texk/dvi2tty/ac/withenable.ac
@@ -4,4 +4,4 @@ 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 dvi2tty
-KPSE_WITH_PROG([dvi2tty], [kpathsea])
+KPSE_ENABLE_PROG([dvi2tty], [kpathsea])
diff --git a/Build/source/texk/dvi2tty/configure b/Build/source/texk/dvi2tty/configure
index 505f9d47606..289e4605456 100755
--- a/Build/source/texk/dvi2tty/configure
+++ b/Build/source/texk/dvi2tty/configure
@@ -14160,6 +14160,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e 's,BLD/texk/,${top_builddir}/../,g'`
KPATHSEA_RULE='# Rebuild libkpathsea
diff --git a/Build/source/texk/dvidvi/ac/withenable.ac b/Build/source/texk/dvidvi/ac/withenable.ac
index 78579276db8..e875dd52937 100644
--- a/Build/source/texk/dvidvi/ac/withenable.ac
+++ b/Build/source/texk/dvidvi/ac/withenable.ac
@@ -4,4 +4,4 @@ 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 dvidvi
-KPSE_WITH_PROG([dvidvi], [kpathsea])
+KPSE_ENABLE_PROG([dvidvi], [kpathsea])
diff --git a/Build/source/texk/dvidvi/configure b/Build/source/texk/dvidvi/configure
index ea3f1420212..9f014f528ee 100755
--- a/Build/source/texk/dvidvi/configure
+++ b/Build/source/texk/dvidvi/configure
@@ -14160,6 +14160,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e 's,BLD/texk/,${top_builddir}/../,g'`
KPATHSEA_RULE='# Rebuild libkpathsea
diff --git a/Build/source/texk/dviljk/ac/withenable.ac b/Build/source/texk/dviljk/ac/withenable.ac
index b76e05d6c47..22ea684d4b2 100644
--- a/Build/source/texk/dviljk/ac/withenable.ac
+++ b/Build/source/texk/dviljk/ac/withenable.ac
@@ -4,4 +4,4 @@ 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 dviljk
-KPSE_WITH_PROG([dviljk], [kpathsea])
+KPSE_ENABLE_PROG([dviljk], [kpathsea])
diff --git a/Build/source/texk/dviljk/configure b/Build/source/texk/dviljk/configure
index ea24179ec69..d2ab4feb889 100755
--- a/Build/source/texk/dviljk/configure
+++ b/Build/source/texk/dviljk/configure
@@ -14675,6 +14675,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e 's,BLD/texk/,${top_builddir}/../,g'`
KPATHSEA_RULE='# Rebuild libkpathsea
diff --git a/Build/source/texk/dvipdfm/ac/withenable.ac b/Build/source/texk/dvipdfm/ac/withenable.ac
index 6dea45665b8..789042b226d 100644
--- a/Build/source/texk/dvipdfm/ac/withenable.ac
+++ b/Build/source/texk/dvipdfm/ac/withenable.ac
@@ -4,4 +4,4 @@ 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 dvipdfm
-KPSE_WITH_PROG([dvipdfm], [kpathsea libpng])
+KPSE_ENABLE_PROG([dvipdfm], [kpathsea libpng])
diff --git a/Build/source/texk/dvipdfm/configure b/Build/source/texk/dvipdfm/configure
index c7f60eb525b..6edcf5e1a98 100755
--- a/Build/source/texk/dvipdfm/configure
+++ b/Build/source/texk/dvipdfm/configure
@@ -14988,6 +14988,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e 's,BLD/texk/,${top_builddir}/../,g'`
KPATHSEA_RULE='# Rebuild libkpathsea
@@ -15027,6 +15028,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \
-e 's,BLD/,${top_builddir}/../../,g'`
ZLIB_RULE='# Rebuild libz
@@ -15066,6 +15068,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
LIBPNG_LIBS=`echo 'BLD/libs/libpng/libpng.a' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
LIBPNG_DEPEND=`echo 'BLD/libs/libpng/libpng.a' | sed \
-e 's,BLD/,${top_builddir}/../../,g'`
LIBPNG_RULE='# Rebuild libpng
diff --git a/Build/source/texk/dvipdfmx/ac/withenable.ac b/Build/source/texk/dvipdfmx/ac/withenable.ac
index a41e7d396ee..6233831bc89 100644
--- a/Build/source/texk/dvipdfmx/ac/withenable.ac
+++ b/Build/source/texk/dvipdfmx/ac/withenable.ac
@@ -4,4 +4,4 @@ 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 dvipdfmx
-KPSE_WITH_PROG([dvipdfmx], [kpathsea libpng])
+KPSE_ENABLE_PROG([dvipdfmx], [kpathsea libpng])
diff --git a/Build/source/texk/dvipdfmx/configure b/Build/source/texk/dvipdfmx/configure
index d299bc8fe8c..5c26f7c6f0a 100755
--- a/Build/source/texk/dvipdfmx/configure
+++ b/Build/source/texk/dvipdfmx/configure
@@ -17245,6 +17245,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e 's,BLD/texk/,${top_builddir}/../,g'`
KPATHSEA_RULE='# Rebuild libkpathsea
@@ -17284,6 +17285,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \
-e 's,BLD/,${top_builddir}/../../,g'`
ZLIB_RULE='# Rebuild libz
@@ -17323,6 +17325,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
LIBPNG_LIBS=`echo 'BLD/libs/libpng/libpng.a' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
LIBPNG_DEPEND=`echo 'BLD/libs/libpng/libpng.a' | sed \
-e 's,BLD/,${top_builddir}/../../,g'`
LIBPNG_RULE='# Rebuild libpng
@@ -17397,6 +17400,28 @@ $as_echo "$kpse_cv_have_truetype_format" >&6; }
if test "x$kpse_cv_have_truetype_format" = xyes; then
:
else
+ if test "x$enable_build" = xno; then
+ { $as_echo "$as_me:$LINENO: WARNING: building dvipdfmx has been disabled and would fail because
+Required file formats not found in Kpathsea header files.
+
+This version of dvipdfmx 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: WARNING: building dvipdfmx has been disabled and would fail because
+Required file formats not found in Kpathsea header files.
+
+This version of dvipdfmx 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;}
+else
{ { $as_echo "$as_me:$LINENO: error: Required file formats not found in Kpathsea header files.
This version of dvipdfmx requires that kpathsea and its headers be available.
@@ -17418,6 +17443,9 @@ the file \"kpathsea/kpathsea.h\"
{ (exit 1); exit 1; }; }
fi
+
+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
@@ -17475,12 +17503,21 @@ $as_echo "$ac_cv_have_decl_xbasename" >&6; }
if test "x$ac_cv_have_decl_xbasename" = x""yes; then
:
else
+ if test "x$enable_build" = xno; then
+ { $as_echo "$as_me:$LINENO: WARNING: building dvipdfmx has been disabled and would fail because
+This version of dvipdfmx requires xbasename in libkpathsea." >&5
+$as_echo "$as_me: WARNING: building dvipdfmx has been disabled and would fail because
+This version of dvipdfmx requires xbasename in libkpathsea." >&2;}
+else
{ { $as_echo "$as_me:$LINENO: error: This version of dvipdfmx requires xbasename in libkpathsea." >&5
$as_echo "$as_me: error: This version of dvipdfmx requires xbasename in libkpathsea." >&2;}
{ (exit 1); exit 1; }; }
fi
+fi
+
+
{ $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; }
diff --git a/Build/source/texk/dvipng/ac/withenable.ac b/Build/source/texk/dvipng/ac/withenable.ac
index 102fcee7cf4..0ccd52f780e 100644
--- a/Build/source/texk/dvipng/ac/withenable.ac
+++ b/Build/source/texk/dvipng/ac/withenable.ac
@@ -4,5 +4,5 @@ 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 dvipng
-KPSE_WITH_PROG([dvipng], [kpathsea freetype2 gd t1lib])
+KPSE_ENABLE_PROG([dvipng], [kpathsea freetype2 gd t1lib])
m4_include(kpse_TL[texk/dvipng/ac/dvipng.ac])
diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure
index 32189fb41c6..f2d716a822e 100755
--- a/Build/source/texk/dvipng/configure
+++ b/Build/source/texk/dvipng/configure
@@ -961,8 +961,6 @@ with_system_t1lib
with_t1lib_includes
with_t1lib_libdir
with_system_freetype2
-with_freetype2_includes
-with_freetype2_libdir
with_system_gd
with_gd_includes
with_gd_libdir
@@ -1645,10 +1643,7 @@ Optional Packages:
t1lib headers installed in DIR
--with-t1lib-libdir=DIR t1lib library installed in DIR
--with-system-freetype2 use installed freetype2 headers and library
- --with-freetype2-includes=DIR
- freetype2 headers installed in DIR
- --with-freetype2-libdir=DIR
- freetype2 library installed in DIR
+ (requires freetype-config)
--with-system-gd use installed gd headers and library
--with-gd-includes=DIR gd headers installed in DIR
--with-gd-libdir=DIR gd library installed in DIR
@@ -4244,13 +4239,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4247: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4242: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4250: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4245: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4253: output\"" >&5)
+ (eval echo "\"\$as_me:4248: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5456,7 +5451,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5459 "configure"' > conftest.$ac_ext
+ echo '#line 5454 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7503,11 +7498,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7506: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7501: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7510: \$? = $ac_status" >&5
+ echo "$as_me:7505: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7842,11 +7837,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7845: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7840: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7849: \$? = $ac_status" >&5
+ echo "$as_me:7844: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7947,11 +7942,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7950: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7945: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7954: \$? = $ac_status" >&5
+ echo "$as_me:7949: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8002,11 +7997,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8005: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8000: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8009: \$? = $ac_status" >&5
+ echo "$as_me:8004: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10802,7 +10797,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10805 "configure"
+#line 10800 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10898,7 +10893,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10901 "configure"
+#line 10896 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -17991,6 +17986,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e 's,BLD/texk/,${top_builddir}/../,g'`
KPATHSEA_RULE='# Rebuild libkpathsea
@@ -18030,6 +18026,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \
-e 's,BLD/,${top_builddir}/../../,g'`
ZLIB_RULE='# Rebuild libz
@@ -18069,6 +18066,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
LIBPNG_LIBS=`echo 'BLD/libs/libpng/libpng.a' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
LIBPNG_DEPEND=`echo 'BLD/libs/libpng/libpng.a' | sed \
-e 's,BLD/,${top_builddir}/../../,g'`
LIBPNG_RULE='# Rebuild libpng
@@ -18108,6 +18106,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
T1LIB_LIBS=`echo 'BLD/libs/t1lib/libt1.a' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
T1LIB_DEPEND=`echo 'BLD/libs/t1lib/libt1.a' | sed \
-e 's,BLD/,${top_builddir}/../../,g'`
T1LIB_RULE='# Rebuild libt1
@@ -18215,16 +18214,6 @@ fi
if test "${with_system_freetype2+set}" = set; then
withval=$with_system_freetype2;
fi
-
-# Check whether --with-freetype2-includes was given.
-if test "${with_freetype2_includes+set}" = set; then
- withval=$with_freetype2_includes;
-fi
-
-# Check whether --with-freetype2-libdir was given.
-if test "${with_freetype2_libdir+set}" = set; then
- withval=$with_freetype2_libdir;
-fi
if test "x$with_system_freetype2" = xyes; then
if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then
FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
@@ -18235,11 +18224,13 @@ $as_echo "$as_me: error: Can not use installed freetype2 headers and library" >&
{ (exit 1); exit 1; }; }
fi
else
- FREETYPE2_INCLUDES=`echo 'cat BLD/libs/freetype2/ft-' | sed \
+ FREETYPE2_INCLUDES=`echo 'BLD/libs/freetype2' | sed \
-e "s,SRC/,$kpse_SRC/,g" \
-e "s,BLD/,$kpse_BLD/,g"`
FREETYPE2_LIBS=`echo 'BLD/libs/freetype2/libfreetype.a' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+ FREETYPE2_LIBS=`cat $FREETYPE2_INCLUDES/ft-libs`
+ FREETYPE2_INCLUDES=`cat $FREETYPE2_INCLUDES/ft-includes`
FREETYPE2_DEPEND=`echo 'BLD/libs/freetype2/libfreetype.a' | sed \
-e 's,BLD/,${top_builddir}/../../,g'`
FREETYPE2_RULE='# Rebuild libfreetype
@@ -18248,13 +18239,7 @@ $(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h
${top_builddir}/../../libs/freetype2/ft2build.h:
cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS)'
fi
-if test "x$with_system_freetype2" = xno; then
- FREETYPE2_LIBS='`'"$FREETYPE2_INCLUDES"'libs`'
- FREETYPE2_INCLUDES='`'"$FREETYPE2_INCLUDES"'includes`'
-fi
-kpse_save_FREETYPE2_INCLUDES=$FREETYPE2_INCLUDES
-kpse_save_FREETYPE2_LIBS=$FREETYPE2_LIBS
## _KPSE_LIB_FLAGS: Setup gd (-lgd) flags
# Check whether --with-system-gd was given.
@@ -18285,6 +18270,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
GD_LIBS=`echo 'BLD/libs/gd/libgd.a' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
GD_DEPEND=`echo 'BLD/libs/gd/libgd.a' | sed \
-e 's,BLD/,${top_builddir}/../../,g'`
GD_RULE='# Rebuild libgd
@@ -18506,16 +18492,6 @@ fi
fi
-set -x
-kpse_save_FREETYPE2_INCLUDES=$FREETYPE2_INCLUDES
-kpse_save_FREETYPE2_LIBS=$FREETYPE2_LIBS
-eval FREETYPE2_INCLUDES="$FREETYPE2_INCLUDES"
-eval FREETYPE2_LIBS="$FREETYPE2_LIBS"
-set +x
-{ $as_echo "$as_me:$LINENO: FREETYPE2_INCLUDES=\"$FREETYPE2_INCLUDES\"" >&5
-$as_echo "$as_me: FREETYPE2_INCLUDES=\"$FREETYPE2_INCLUDES\"" >&6;}
-{ $as_echo "$as_me:$LINENO: FREETYPE2_LIBS=\"$FREETYPE2_LIBS\"" >&5
-$as_echo "$as_me: FREETYPE2_LIBS=\"$FREETYPE2_LIBS\"" >&6;}
CPPFLAGS="$CPPFLAGS $FREETYPE2_INCLUDES"
LIBS="$FREETYPE2_LIBS $LIBS"
@@ -19466,8 +19442,6 @@ fi
CPPFLAGS=$kpse_save_CPPFLAGS
LIBS=$kpse_save_LIBS
-FREETYPE2_INCLUDES=$kpse_save_FREETYPE2_INCLUDES
-FREETYPE2_LIBS=$kpse_save_FREETYPE2_LIBS
DVIPNG_VERSION=1.12
diff --git a/Build/source/texk/dvipng/configure.ac b/Build/source/texk/dvipng/configure.ac
index 135f48276c2..153cb8538fa 100644
--- a/Build/source/texk/dvipng/configure.ac
+++ b/Build/source/texk/dvipng/configure.ac
@@ -99,8 +99,6 @@ KPSE_ZLIB_FLAGS
KPSE_LIBPNG_FLAGS
KPSE_T1LIB_FLAGS
KPSE_FREETYPE2_FLAGS
-kpse_save_FREETYPE2_INCLUDES=$FREETYPE2_INCLUDES
-kpse_save_FREETYPE2_LIBS=$FREETYPE2_LIBS
KPSE_GD_FLAGS
dnl We have to check properties of libraries, either installed (system)
@@ -119,14 +117,6 @@ AC_CHECK_FUNC([png_read_image],
[Define to 1 if you have the `png' library (-lpng).])],
[KPSE_MSG_ERROR([dvipng], [cannot find/use libpng])])
-set -x
-kpse_save_FREETYPE2_INCLUDES=$FREETYPE2_INCLUDES
-kpse_save_FREETYPE2_LIBS=$FREETYPE2_LIBS
-eval FREETYPE2_INCLUDES="$FREETYPE2_INCLUDES"
-eval FREETYPE2_LIBS="$FREETYPE2_LIBS"
-set +x
-AC_MSG_NOTICE([FREETYPE2_INCLUDES=\"$FREETYPE2_INCLUDES\"])
-AC_MSG_NOTICE([FREETYPE2_LIBS=\"$FREETYPE2_LIBS\"])
KPSE_ADD_FLAGS([freetype2])
KPSE_ADD_FLAGS([gd])
AC_CHECK_FUNC([gdImageCreate],
@@ -174,8 +164,6 @@ AC_CHECK_FUNCS([gdImageCreateTrueColor gdImageCreateFromJpeg gdImagePngEx gdImag
AM_CONDITIONAL([have_gif], [test "x$ac_cv_func_gdImageGif" = xyes])
KPSE_RESTORE_FLAGS
-FREETYPE2_INCLUDES=$kpse_save_FREETYPE2_INCLUDES
-FREETYPE2_LIBS=$kpse_save_FREETYPE2_LIBS
DVIPNG_VERSION=dvipng_version
AC_SUBST([DVIPNG_VERSION])
diff --git a/Build/source/texk/dvipos/ac/withenable.ac b/Build/source/texk/dvipos/ac/withenable.ac
index c4b7525dfba..93ed26f5508 100644
--- a/Build/source/texk/dvipos/ac/withenable.ac
+++ b/Build/source/texk/dvipos/ac/withenable.ac
@@ -4,4 +4,4 @@ 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 dvipos
-KPSE_WITH_PROG([dvipos], [kpathsea])
+KPSE_ENABLE_PROG([dvipos], [kpathsea])
diff --git a/Build/source/texk/dvipos/configure b/Build/source/texk/dvipos/configure
index bdbfede8445..19efdbc4276 100755
--- a/Build/source/texk/dvipos/configure
+++ b/Build/source/texk/dvipos/configure
@@ -14248,6 +14248,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e 's,BLD/texk/,${top_builddir}/../,g'`
KPATHSEA_RULE='# Rebuild libkpathsea
diff --git a/Build/source/texk/dvipsk/ac/withenable.ac b/Build/source/texk/dvipsk/ac/withenable.ac
index 82596630bfc..836ab8fa68c 100644
--- a/Build/source/texk/dvipsk/ac/withenable.ac
+++ b/Build/source/texk/dvipsk/ac/withenable.ac
@@ -4,4 +4,4 @@ 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 dvipsk
-KPSE_WITH_PROG([dvipsk], [kpathsea])
+KPSE_ENABLE_PROG([dvipsk], [kpathsea])
diff --git a/Build/source/texk/dvipsk/configure b/Build/source/texk/dvipsk/configure
index 9f4a0358568..08108d4d6ee 100755
--- a/Build/source/texk/dvipsk/configure
+++ b/Build/source/texk/dvipsk/configure
@@ -14609,6 +14609,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e 's,BLD/texk/,${top_builddir}/../,g'`
KPATHSEA_RULE='# Rebuild libkpathsea
diff --git a/Build/source/texk/gsftopk/ac/withenable.ac b/Build/source/texk/gsftopk/ac/withenable.ac
index 323fe7654fe..97b38b19f9f 100644
--- a/Build/source/texk/gsftopk/ac/withenable.ac
+++ b/Build/source/texk/gsftopk/ac/withenable.ac
@@ -4,4 +4,4 @@ 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 gsftopk
-KPSE_WITH_PROG([gsftopk], [kpathsea])
+KPSE_ENABLE_PROG([gsftopk], [kpathsea])
diff --git a/Build/source/texk/gsftopk/configure b/Build/source/texk/gsftopk/configure
index d61053975a4..5902c6c1850 100755
--- a/Build/source/texk/gsftopk/configure
+++ b/Build/source/texk/gsftopk/configure
@@ -15373,6 +15373,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e 's,BLD/texk/,${top_builddir}/../,g'`
KPATHSEA_RULE='# Rebuild libkpathsea
diff --git a/Build/source/texk/lacheck/ac/withenable.ac b/Build/source/texk/lacheck/ac/withenable.ac
index ec65f8d6623..ca1b10f6a75 100644
--- a/Build/source/texk/lacheck/ac/withenable.ac
+++ b/Build/source/texk/lacheck/ac/withenable.ac
@@ -4,4 +4,4 @@ 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 lacheck
-KPSE_WITH_PROG([lacheck], [kpathsea])
+KPSE_ENABLE_PROG([lacheck], [kpathsea])
diff --git a/Build/source/texk/lcdf-typetools/ac/withenable.ac b/Build/source/texk/lcdf-typetools/ac/withenable.ac
index fdefd1ed472..86de85c9e2e 100644
--- a/Build/source/texk/lcdf-typetools/ac/withenable.ac
+++ b/Build/source/texk/lcdf-typetools/ac/withenable.ac
@@ -4,5 +4,5 @@ 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])
+KPSE_ENABLE_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 53003774c77..351a7938fdf 100755
--- a/Build/source/texk/lcdf-typetools/configure
+++ b/Build/source/texk/lcdf-typetools/configure
@@ -19574,6 +19574,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e 's,BLD/texk/,${top_builddir}/../,g'`
KPATHSEA_RULE='# Rebuild libkpathsea
diff --git a/Build/source/texk/makeindexk/ac/withenable.ac b/Build/source/texk/makeindexk/ac/withenable.ac
index d00b0ab0a42..abaf9f784fc 100644
--- a/Build/source/texk/makeindexk/ac/withenable.ac
+++ b/Build/source/texk/makeindexk/ac/withenable.ac
@@ -4,4 +4,4 @@ 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 makeindexk
-KPSE_WITH_PROG([makeindexk], [kpathsea])
+KPSE_ENABLE_PROG([makeindexk], [kpathsea])
diff --git a/Build/source/texk/makeindexk/configure b/Build/source/texk/makeindexk/configure
index 340c9a62b87..783f5aebd91 100755
--- a/Build/source/texk/makeindexk/configure
+++ b/Build/source/texk/makeindexk/configure
@@ -14408,6 +14408,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e 's,BLD/texk/,${top_builddir}/../,g'`
KPATHSEA_RULE='# Rebuild libkpathsea
diff --git a/Build/source/texk/musixflx/ac/withenable.ac b/Build/source/texk/musixflx/ac/withenable.ac
index 7fcb84a537b..819073a1653 100644
--- a/Build/source/texk/musixflx/ac/withenable.ac
+++ b/Build/source/texk/musixflx/ac/withenable.ac
@@ -4,4 +4,4 @@ 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 musixflx
-KPSE_WITH_PROG([musixflx])
+KPSE_ENABLE_PROG([musixflx])
diff --git a/Build/source/texk/ps2pkm/ac/withenable.ac b/Build/source/texk/ps2pkm/ac/withenable.ac
index d517dcb468d..f96aef61269 100644
--- a/Build/source/texk/ps2pkm/ac/withenable.ac
+++ b/Build/source/texk/ps2pkm/ac/withenable.ac
@@ -4,4 +4,4 @@ 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 ps2pkm
-KPSE_WITH_PROG([ps2pkm], [kpathsea])
+KPSE_ENABLE_PROG([ps2pkm], [kpathsea])
diff --git a/Build/source/texk/ps2pkm/configure b/Build/source/texk/ps2pkm/configure
index 93a3c14ad11..2fcb34d8701 100755
--- a/Build/source/texk/ps2pkm/configure
+++ b/Build/source/texk/ps2pkm/configure
@@ -14866,6 +14866,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e 's,BLD/texk/,${top_builddir}/../,g'`
KPATHSEA_RULE='# Rebuild libkpathsea
diff --git a/Build/source/texk/seetexk/ac/withenable.ac b/Build/source/texk/seetexk/ac/withenable.ac
index e4b11948e59..d0595792f7a 100644
--- a/Build/source/texk/seetexk/ac/withenable.ac
+++ b/Build/source/texk/seetexk/ac/withenable.ac
@@ -4,4 +4,4 @@ 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 seetexk
-KPSE_WITH_PROG([seetexk], [kpathsea])
+KPSE_ENABLE_PROG([seetexk], [kpathsea])
diff --git a/Build/source/texk/seetexk/configure b/Build/source/texk/seetexk/configure
index c0601926578..2dd886cb428 100755
--- a/Build/source/texk/seetexk/configure
+++ b/Build/source/texk/seetexk/configure
@@ -14774,6 +14774,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e 's,BLD/texk/,${top_builddir}/../,g'`
KPATHSEA_RULE='# Rebuild libkpathsea
diff --git a/Build/source/texk/tetex/ac/withenable.ac b/Build/source/texk/tetex/ac/withenable.ac
index 91ceb8cf219..abe1536b16b 100644
--- a/Build/source/texk/tetex/ac/withenable.ac
+++ b/Build/source/texk/tetex/ac/withenable.ac
@@ -4,4 +4,4 @@ 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 tetex
-KPSE_WITH_PROG([tetex], , , [teTeX scripts])
+KPSE_ENABLE_PROG([tetex], , , [teTeX scripts])
diff --git a/Build/source/texk/tex4htk/ac/withenable.ac b/Build/source/texk/tex4htk/ac/withenable.ac
index e79a0d42611..e4f1de2ddb3 100644
--- a/Build/source/texk/tex4htk/ac/withenable.ac
+++ b/Build/source/texk/tex4htk/ac/withenable.ac
@@ -4,4 +4,4 @@ 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 tex4htk
-KPSE_WITH_PROG([tex4htk], [kpathsea])
+KPSE_ENABLE_PROG([tex4htk], [kpathsea])
diff --git a/Build/source/texk/tex4htk/configure b/Build/source/texk/tex4htk/configure
index 491c4f69731..cef9d13a207 100755
--- a/Build/source/texk/tex4htk/configure
+++ b/Build/source/texk/tex4htk/configure
@@ -14520,6 +14520,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e 's,BLD/texk/,${top_builddir}/../,g'`
KPATHSEA_RULE='# Rebuild libkpathsea
diff --git a/Build/source/texk/texlive/ac/withenable.ac b/Build/source/texk/texlive/ac/withenable.ac
index 974153136a2..82d635fb7ca 100644
--- a/Build/source/texk/texlive/ac/withenable.ac
+++ b/Build/source/texk/texlive/ac/withenable.ac
@@ -4,4 +4,4 @@ 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 texlive
-KPSE_WITH_PROG([texlive], , , [TeX Live scripts])
+KPSE_ENABLE_PROG([texlive], , , [TeX Live scripts])
diff --git a/Build/source/texk/ttf2pk/ac/withenable.ac b/Build/source/texk/ttf2pk/ac/withenable.ac
index 6709c989f42..fcebeff82bd 100644
--- a/Build/source/texk/ttf2pk/ac/withenable.ac
+++ b/Build/source/texk/ttf2pk/ac/withenable.ac
@@ -4,4 +4,4 @@ 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 ttf2pk
-KPSE_WITH_PROG([ttf2pk], [kpathsea freetype])
+KPSE_ENABLE_PROG([ttf2pk], [kpathsea freetype])
diff --git a/Build/source/texk/ttf2pk/configure b/Build/source/texk/ttf2pk/configure
index 1f1cb75d9f2..22a58454c57 100755
--- a/Build/source/texk/ttf2pk/configure
+++ b/Build/source/texk/ttf2pk/configure
@@ -14260,6 +14260,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e 's,BLD/texk/,${top_builddir}/../,g'`
KPATHSEA_RULE='# Rebuild libkpathsea
@@ -14299,6 +14300,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
FREETYPE_LIBS=`echo 'BLD/libs/freetype/libttf.a' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
FREETYPE_DEPEND=`echo 'BLD/libs/freetype/libttf.a' | sed \
-e 's,BLD/,${top_builddir}/../../,g'`
FREETYPE_RULE='# Rebuild libttf
diff --git a/Build/source/texk/ttfdump/ac/withenable.ac b/Build/source/texk/ttfdump/ac/withenable.ac
index 14dcb612872..682d555186a 100644
--- a/Build/source/texk/ttfdump/ac/withenable.ac
+++ b/Build/source/texk/ttfdump/ac/withenable.ac
@@ -4,4 +4,4 @@ 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 ttfdump
-KPSE_WITH_PROG([ttfdump], [kpathsea])
+KPSE_ENABLE_PROG([ttfdump], [kpathsea])
diff --git a/Build/source/texk/ttfdump/configure b/Build/source/texk/ttfdump/configure
index 403c926a8da..13581829f5b 100755
--- a/Build/source/texk/ttfdump/configure
+++ b/Build/source/texk/ttfdump/configure
@@ -15996,6 +15996,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e 's,BLD/texk/,${top_builddir}/../,g'`
KPATHSEA_RULE='# Rebuild libkpathsea
diff --git a/Build/source/texk/web2c/ac/withenable.ac b/Build/source/texk/web2c/ac/withenable.ac
index 42d9c3f6e99..42e6b71eedc 100644
--- a/Build/source/texk/web2c/ac/withenable.ac
+++ b/Build/source/texk/web2c/ac/withenable.ac
@@ -4,5 +4,5 @@ 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 web2c
-KPSE_WITH_PROG([web2c], [kpathsea zlib], , [TeX & Co.])
+KPSE_ENABLE_PROG([web2c], [kpathsea zlib], , [TeX & Co.])
m4_include(kpse_TL[texk/web2c/ac/web2c.ac])
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index c4ee2195f78..e69855d8a81 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -1070,8 +1070,6 @@ with_system_graphite
with_graphite_includes
with_graphite_libdir
with_system_freetype2
-with_freetype2_includes
-with_freetype2_libdir
with_system_teckit
with_teckit_includes
with_teckit_libdir
@@ -1790,10 +1788,7 @@ Optional Packages:
--with-graphite-libdir=DIR
graphite library installed in DIR
--with-system-freetype2 use installed freetype2 headers and library
- --with-freetype2-includes=DIR
- freetype2 headers installed in DIR
- --with-freetype2-libdir=DIR
- freetype2 library installed in DIR
+ (requires freetype-config)
--with-system-teckit use installed teckit headers and library
--with-teckit-includes=DIR
teckit headers installed in DIR
@@ -4407,13 +4402,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4410: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4405: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4413: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4408: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4416: output\"" >&5)
+ (eval echo "\"\$as_me:4411: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5619,7 +5614,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5622 "configure"' > conftest.$ac_ext
+ echo '#line 5617 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7666,11 +7661,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7669: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7664: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7673: \$? = $ac_status" >&5
+ echo "$as_me:7668: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8005,11 +8000,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8008: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8003: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8012: \$? = $ac_status" >&5
+ echo "$as_me:8007: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8110,11 +8105,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8113: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8108: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8117: \$? = $ac_status" >&5
+ echo "$as_me:8112: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8165,11 +8160,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8168: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8163: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8172: \$? = $ac_status" >&5
+ echo "$as_me:8167: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10965,7 +10960,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10968 "configure"
+#line 10963 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11061,7 +11056,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11064 "configure"
+#line 11059 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -16077,11 +16072,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16080: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16075: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16084: \$? = $ac_status" >&5
+ echo "$as_me:16079: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16176,11 +16171,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16179: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16174: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16183: \$? = $ac_status" >&5
+ echo "$as_me:16178: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16228,11 +16223,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16231: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16226: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16235: \$? = $ac_status" >&5
+ echo "$as_me:16230: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -23368,6 +23363,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e 's,BLD/texk/,${top_builddir}/../,g'`
KPATHSEA_RULE='# Rebuild libkpathsea
@@ -23407,6 +23403,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \
-e 's,BLD/,${top_builddir}/../../,g'`
ZLIB_RULE='# Rebuild libz
@@ -23446,6 +23443,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
LIBPNG_LIBS=`echo 'BLD/libs/libpng/libpng.a' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
LIBPNG_DEPEND=`echo 'BLD/libs/libpng/libpng.a' | sed \
-e 's,BLD/,${top_builddir}/../../,g'`
LIBPNG_RULE='# Rebuild libpng
@@ -23461,6 +23459,7 @@ fi
-e "s,BLD/,$kpse_BLD/,g"`
XPDF_LIBS=`echo 'BLD/libs/xpdf/libxpdf.a' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
XPDF_DEPEND=`echo 'BLD/libs/xpdf/libxpdf.a' | sed \
-e 's,BLD/,${top_builddir}/../../,g'`
XPDF_RULE='# Rebuild libxpdf
@@ -23499,6 +23498,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
GRAPHITE_LIBS=`echo 'BLD/libs/graphite/libgraphite.a' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
GRAPHITE_DEPEND=`echo 'BLD/libs/graphite/libgraphite.a' | sed \
-e 's,BLD/,${top_builddir}/../../,g'`
GRAPHITE_RULE='# Rebuild libgraphite
@@ -23604,16 +23604,6 @@ fi
if test "${with_system_freetype2+set}" = set; then
withval=$with_system_freetype2;
fi
-
-# Check whether --with-freetype2-includes was given.
-if test "${with_freetype2_includes+set}" = set; then
- withval=$with_freetype2_includes;
-fi
-
-# Check whether --with-freetype2-libdir was given.
-if test "${with_freetype2_libdir+set}" = set; then
- withval=$with_freetype2_libdir;
-fi
if test "x$with_system_freetype2" = xyes; then
if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then
FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
@@ -23624,11 +23614,13 @@ $as_echo "$as_me: error: Can not use installed freetype2 headers and library" >&
{ (exit 1); exit 1; }; }
fi
else
- FREETYPE2_INCLUDES=`echo 'cat BLD/libs/freetype2/ft-' | sed \
+ FREETYPE2_INCLUDES=`echo 'BLD/libs/freetype2' | sed \
-e "s,SRC/,$kpse_SRC/,g" \
-e "s,BLD/,$kpse_BLD/,g"`
FREETYPE2_LIBS=`echo 'BLD/libs/freetype2/libfreetype.a' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+ FREETYPE2_LIBS=`cat $FREETYPE2_INCLUDES/ft-libs`
+ FREETYPE2_INCLUDES=`cat $FREETYPE2_INCLUDES/ft-includes`
FREETYPE2_DEPEND=`echo 'BLD/libs/freetype2/libfreetype.a' | sed \
-e 's,BLD/,${top_builddir}/../../,g'`
FREETYPE2_RULE='# Rebuild libfreetype
@@ -23637,10 +23629,6 @@ $(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h
${top_builddir}/../../libs/freetype2/ft2build.h:
cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS)'
fi
-if test "x$with_system_freetype2" = xno; then
- FREETYPE2_LIBS='`'"$FREETYPE2_INCLUDES"'libs`'
- FREETYPE2_INCLUDES='`'"$FREETYPE2_INCLUDES"'includes`'
-fi
## _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags
@@ -23672,6 +23660,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
TECKIT_LIBS=`echo 'BLD/libs/teckit/libTECkit.a' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
TECKIT_DEPEND=`echo 'BLD/libs/teckit/libTECkit.a' | sed \
-e 's,BLD/,${top_builddir}/../../,g'`
TECKIT_RULE='# Rebuild libTECkit
@@ -23685,6 +23674,7 @@ fi
-e "s,BLD/,$kpse_BLD/,g"`
ICU_LIBS=`echo 'BLD/libs/icu/icu-build/lib/libsicuuc.a BLD/libs/icu/icu-build/lib/libsicule.a BLD/libs/icu/icu-build/lib/libsicudata.a' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
ICU_DEPEND=`echo 'BLD/libs/icu/icu-build/lib/libsicuuc.a BLD/libs/icu/icu-build/lib/libsicule.a BLD/libs/icu/icu-build/lib/libsicudata.a' | sed \
-e 's,BLD/,${top_builddir}/../../,g'`
ICU_RULE='# Rebuild libsicuxxx
@@ -23699,10 +23689,13 @@ ${top_builddir}/../../libs/icu/icu-build/common/unicode/platform.h:
-e "s,BLD/,$kpse_BLD/,g"`
OBSDCOMPAT_LIBS=`echo 'BLD/libs/obsdcompat/libopenbsd-compat.a' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
OBSDCOMPAT_DEPEND=`echo 'BLD/libs/obsdcompat/libopenbsd-compat.a' | sed \
-e 's,BLD/,${top_builddir}/../../,g'`
OBSDCOMPAT_RULE='# Rebuild libopenbsd-compat
$(OBSDCOMPAT_DEPEND): ${top_srcdir}/../../libs/obsdcompat/*.[ch]
+ cd ${top_builddir}/../../libs/obsdcompat && $(MAKE) $(AM_MAKEFLAGS)
+${top_srcdir}/../../libs/obsdcompat/*.[ch]:
cd ${top_builddir}/../../libs/obsdcompat && $(MAKE) $(AM_MAKEFLAGS)'
diff --git a/Build/source/texk/xdv2pdf/ac/withenable.ac b/Build/source/texk/xdv2pdf/ac/withenable.ac
index a543a2b1dd3..9256f69e776 100644
--- a/Build/source/texk/xdv2pdf/ac/withenable.ac
+++ b/Build/source/texk/xdv2pdf/ac/withenable.ac
@@ -4,4 +4,4 @@ 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 xdv2pdf
-KPSE_WITH_PROG([xdv2pdf], [kpathsea])
+KPSE_ENABLE_PROG([xdv2pdf], [kpathsea])
diff --git a/Build/source/texk/xdv2pdf/configure b/Build/source/texk/xdv2pdf/configure
index 23169dbbea5..fa7e6146796 100755
--- a/Build/source/texk/xdv2pdf/configure
+++ b/Build/source/texk/xdv2pdf/configure
@@ -19050,6 +19050,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e 's,BLD/texk/,${top_builddir}/../,g'`
KPATHSEA_RULE='# Rebuild libkpathsea
diff --git a/Build/source/texk/xdvik/ac/withenable.ac b/Build/source/texk/xdvik/ac/withenable.ac
index 1156ac51f71..cefdcc4f609 100644
--- a/Build/source/texk/xdvik/ac/withenable.ac
+++ b/Build/source/texk/xdvik/ac/withenable.ac
@@ -4,5 +4,5 @@ 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 xdvik
-KPSE_WITH_PROG([xdvik], [kpathsea t1lib])
+KPSE_ENABLE_PROG([xdvik], [kpathsea t1lib])
m4_include(kpse_TL[texk/xdvik/ac/xdvik.ac])
diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure
index 9a49616890f..adaccc54b1b 100755
--- a/Build/source/texk/xdvik/configure
+++ b/Build/source/texk/xdvik/configure
@@ -23181,6 +23181,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e 's,BLD/texk/,${top_builddir}/../,g'`
KPATHSEA_RULE='# Rebuild libkpathsea
@@ -23220,6 +23221,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
T1LIB_LIBS=`echo 'BLD/libs/t1lib/libt1.a' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
T1LIB_DEPEND=`echo 'BLD/libs/t1lib/libt1.a' | sed \
-e 's,BLD/,${top_builddir}/../../,g'`
T1LIB_RULE='# Rebuild libt1
diff --git a/Build/source/texk/xdvipdfmx/ac/withenable.ac b/Build/source/texk/xdvipdfmx/ac/withenable.ac
index 421a0b3997a..69043225dbf 100644
--- a/Build/source/texk/xdvipdfmx/ac/withenable.ac
+++ b/Build/source/texk/xdvipdfmx/ac/withenable.ac
@@ -4,4 +4,4 @@ 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 xdvipdfmx
-KPSE_WITH_PROG([xdvipdfmx], [kpathsea freetype2 libpng])
+KPSE_ENABLE_PROG([xdvipdfmx], [kpathsea freetype2 libpng])
diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure
index 4e1b5058133..47cf6788a06 100755
--- a/Build/source/texk/xdvipdfmx/configure
+++ b/Build/source/texk/xdvipdfmx/configure
@@ -938,8 +938,6 @@ with_system_libpng
with_libpng_includes
with_libpng_libdir
with_system_freetype2
-with_freetype2_includes
-with_freetype2_libdir
with_paper
with_fontconfig
'
@@ -1614,10 +1612,7 @@ Optional Packages:
--with-libpng-libdir=DIR
libpng library installed in DIR
--with-system-freetype2 use installed freetype2 headers and library
- --with-freetype2-includes=DIR
- freetype2 headers installed in DIR
- --with-freetype2-libdir=DIR
- freetype2 library installed in DIR
+ (requires freetype-config)
--with-paper=DIR use paper include/library files from DIR
--with-fontconfig=DIR use fontconfig include/library files from DIR
@@ -4212,13 +4207,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4215: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4210: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4218: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4213: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4221: output\"" >&5)
+ (eval echo "\"\$as_me:4216: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5424,7 +5419,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5427 "configure"' > conftest.$ac_ext
+ echo '#line 5422 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7471,11 +7466,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7474: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7469: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7478: \$? = $ac_status" >&5
+ echo "$as_me:7473: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7810,11 +7805,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7813: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7808: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7817: \$? = $ac_status" >&5
+ echo "$as_me:7812: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7915,11 +7910,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7918: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7913: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7922: \$? = $ac_status" >&5
+ echo "$as_me:7917: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -7970,11 +7965,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7973: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7968: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7977: \$? = $ac_status" >&5
+ echo "$as_me:7972: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10770,7 +10765,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10773 "configure"
+#line 10768 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10866,7 +10861,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10869 "configure"
+#line 10864 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -17262,6 +17257,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
-e 's,BLD/texk/,${top_builddir}/../,g'`
KPATHSEA_RULE='# Rebuild libkpathsea
@@ -17301,6 +17297,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \
-e 's,BLD/,${top_builddir}/../../,g'`
ZLIB_RULE='# Rebuild libz
@@ -17340,6 +17337,7 @@ else
-e "s,BLD/,$kpse_BLD/,g"`
LIBPNG_LIBS=`echo 'BLD/libs/libpng/libpng.a' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+
LIBPNG_DEPEND=`echo 'BLD/libs/libpng/libpng.a' | sed \
-e 's,BLD/,${top_builddir}/../../,g'`
LIBPNG_RULE='# Rebuild libpng
@@ -17447,16 +17445,6 @@ fi
if test "${with_system_freetype2+set}" = set; then
withval=$with_system_freetype2;
fi
-
-# Check whether --with-freetype2-includes was given.
-if test "${with_freetype2_includes+set}" = set; then
- withval=$with_freetype2_includes;
-fi
-
-# Check whether --with-freetype2-libdir was given.
-if test "${with_freetype2_libdir+set}" = set; then
- withval=$with_freetype2_libdir;
-fi
if test "x$with_system_freetype2" = xyes; then
if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then
FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
@@ -17467,11 +17455,13 @@ $as_echo "$as_me: error: Can not use installed freetype2 headers and library" >&
{ (exit 1); exit 1; }; }
fi
else
- FREETYPE2_INCLUDES=`echo 'cat BLD/libs/freetype2/ft-' | sed \
+ FREETYPE2_INCLUDES=`echo 'BLD/libs/freetype2' | sed \
-e "s,SRC/,$kpse_SRC/,g" \
-e "s,BLD/,$kpse_BLD/,g"`
FREETYPE2_LIBS=`echo 'BLD/libs/freetype2/libfreetype.a' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
+ FREETYPE2_LIBS=`cat $FREETYPE2_INCLUDES/ft-libs`
+ FREETYPE2_INCLUDES=`cat $FREETYPE2_INCLUDES/ft-includes`
FREETYPE2_DEPEND=`echo 'BLD/libs/freetype2/libfreetype.a' | sed \
-e 's,BLD/,${top_builddir}/../../,g'`
FREETYPE2_RULE='# Rebuild libfreetype
@@ -17480,10 +17470,6 @@ $(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h
${top_builddir}/../../libs/freetype2/ft2build.h:
cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS)'
fi
-if test "x$with_system_freetype2" = xno; then
- FREETYPE2_LIBS='`'"$FREETYPE2_INCLUDES"'libs`'
- FREETYPE2_INCLUDES='`'"$FREETYPE2_INCLUDES"'includes`'
-fi
kpse_save_CPPFLAGS=$CPPFLAGS
@@ -18194,12 +18180,6 @@ fi
-set -x
-kpse_save_FREETYPE2_INCLUDES=$FREETYPE2_INCLUDES
-kpse_save_FREETYPE2_LIBS=$FREETYPE2_LIBS
-eval FREETYPE2_INCLUDES="$FREETYPE2_INCLUDES"
-eval FREETYPE2_LIBS="$FREETYPE2_LIBS"
-set +x
CPPFLAGS="$CPPFLAGS $FREETYPE2_INCLUDES"
LIBS="$FREETYPE2_LIBS $LIBS"
@@ -18393,8 +18373,6 @@ fi
CPPFLAGS=$kpse_save_CPPFLAGS
LIBS=$kpse_save_LIBS
-FREETYPE2_INCLUDES=$kpse_save_FREETYPE2_INCLUDES
-FREETYPE2_LIBS=$kpse_save_FREETYPE2_LIBS
if test "x$enable_tetex_build" != xyes || test ! -d $srdir/../kpathsea; then
_cppflags=$CPPFLAGS _ldflags=$LDFLAGS
diff --git a/Build/source/texk/xdvipdfmx/configure.ac b/Build/source/texk/xdvipdfmx/configure.ac
index 08fc22347a6..db6fd5ee46e 100644
--- a/Build/source/texk/xdvipdfmx/configure.ac
+++ b/Build/source/texk/xdvipdfmx/configure.ac
@@ -59,18 +59,10 @@ CHO_CHECK_ZLIB
KPSE_ADD_FLAGS([libpng])
CHO_CHECK_LIBPNG
-set -x
-kpse_save_FREETYPE2_INCLUDES=$FREETYPE2_INCLUDES
-kpse_save_FREETYPE2_LIBS=$FREETYPE2_LIBS
-eval FREETYPE2_INCLUDES="$FREETYPE2_INCLUDES"
-eval FREETYPE2_LIBS="$FREETYPE2_LIBS"
-set +x
KPSE_ADD_FLAGS([freetype2])
CHO_CHECK_LIBFREETYPE([xdvipdfmx])
KPSE_RESTORE_FLAGS
-FREETYPE2_INCLUDES=$kpse_save_FREETYPE2_INCLUDES
-FREETYPE2_LIBS=$kpse_save_FREETYPE2_LIBS
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.