summaryrefslogtreecommitdiff
path: root/Build/source/utils
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/utils
parent6fe018282ebe6acac6f4c9aab818346f304e7373 (diff)
build system cleanup
git-svn-id: svn://tug.org/texlive/trunk@12807 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils')
-rw-r--r--Build/source/utils/Makefile.in12
-rw-r--r--Build/source/utils/aclocal.m410
-rwxr-xr-xBuild/source/utils/configure29
-rw-r--r--Build/source/utils/dialog/ac/withenable.ac2
-rw-r--r--Build/source/utils/pdfopen/ac/withenable.ac2
-rw-r--r--Build/source/utils/ps2eps/ac/withenable.ac2
-rw-r--r--Build/source/utils/psutils/ac/withenable.ac2
-rw-r--r--Build/source/utils/t1utils/ac/withenable.ac2
-rw-r--r--Build/source/utils/tpic2pdftex/ac/withenable.ac2
-rw-r--r--Build/source/utils/vlna/ac/withenable.ac2
10 files changed, 56 insertions, 9 deletions
diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in
index 3528c1e6355..9f9ee5fdc57 100644
--- a/Build/source/utils/Makefile.in
+++ b/Build/source/utils/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
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/utils/aclocal.m4 b/Build/source/utils/aclocal.m4
index c917492c6a5..9fae18de399 100644
--- a/Build/source/utils/aclocal.m4
+++ b/Build/source/utils/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/utils/configure b/Build/source/utils/configure
index f60611bb6af..bfdf78ebb1f 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -2169,6 +2169,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/
@@ -3311,15 +3312,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
@@ -3337,6 +3348,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/utils/dialog/ac/withenable.ac b/Build/source/utils/dialog/ac/withenable.ac
index a4120c20a51..cebc0feba3e 100644
--- a/Build/source/utils/dialog/ac/withenable.ac
+++ b/Build/source/utils/dialog/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 dialog
-KPSE_WITH_PROG([dialog])
+KPSE_ENABLE_PROG([dialog])
diff --git a/Build/source/utils/pdfopen/ac/withenable.ac b/Build/source/utils/pdfopen/ac/withenable.ac
index 027f2b58a6a..af5081f81ca 100644
--- a/Build/source/utils/pdfopen/ac/withenable.ac
+++ b/Build/source/utils/pdfopen/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 pdfopen
-KPSE_WITH_PROG([pdfopen])
+KPSE_ENABLE_PROG([pdfopen])
diff --git a/Build/source/utils/ps2eps/ac/withenable.ac b/Build/source/utils/ps2eps/ac/withenable.ac
index 0cc35384c75..d23be25fd0e 100644
--- a/Build/source/utils/ps2eps/ac/withenable.ac
+++ b/Build/source/utils/ps2eps/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 ps2eps
-KPSE_WITH_PROG([ps2eps])
+KPSE_ENABLE_PROG([ps2eps])
diff --git a/Build/source/utils/psutils/ac/withenable.ac b/Build/source/utils/psutils/ac/withenable.ac
index 5155149ea59..2a30553663b 100644
--- a/Build/source/utils/psutils/ac/withenable.ac
+++ b/Build/source/utils/psutils/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 psutils
-KPSE_WITH_PROG([psutils])
+KPSE_ENABLE_PROG([psutils])
diff --git a/Build/source/utils/t1utils/ac/withenable.ac b/Build/source/utils/t1utils/ac/withenable.ac
index 712ca6d3bcd..e4c5f91a37c 100644
--- a/Build/source/utils/t1utils/ac/withenable.ac
+++ b/Build/source/utils/t1utils/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 t1utils
-KPSE_WITH_PROG([t1utils])
+KPSE_ENABLE_PROG([t1utils])
diff --git a/Build/source/utils/tpic2pdftex/ac/withenable.ac b/Build/source/utils/tpic2pdftex/ac/withenable.ac
index a8f812e9660..99ca0ee87ca 100644
--- a/Build/source/utils/tpic2pdftex/ac/withenable.ac
+++ b/Build/source/utils/tpic2pdftex/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 tpic2pdftex
-KPSE_WITH_PROG([tpic2pdftex])
+KPSE_ENABLE_PROG([tpic2pdftex])
diff --git a/Build/source/utils/vlna/ac/withenable.ac b/Build/source/utils/vlna/ac/withenable.ac
index a1773efb38a..b81cc50e100 100644
--- a/Build/source/utils/vlna/ac/withenable.ac
+++ b/Build/source/utils/vlna/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 vlna
-KPSE_WITH_PROG([vlna])
+KPSE_ENABLE_PROG([vlna])