summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-09 14:49:21 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-09 14:49:21 +0000
commitf87b81c36d13160b0f2ae9058c548061b4cef6ae (patch)
treeaba38049520bf3ea296d33796b57addfbe780e88 /Build/source/texk/web2c
parentad4c3b9a96fd70284e4bf55ff0bab0578fb95345 (diff)
build system: more utils/xindy/ and general cleanup
git-svn-id: svn://tug.org/texlive/trunk@13020 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r--Build/source/texk/web2c/Makefile.am6
-rw-r--r--Build/source/texk/web2c/Makefile.in3
-rw-r--r--Build/source/texk/web2c/ac/web2c.ac50
-rwxr-xr-xBuild/source/texk/web2c/configure8
4 files changed, 39 insertions, 28 deletions
diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am
index 3e84dbd0bc6..812205a18e9 100644
--- a/Build/source/texk/web2c/Makefile.am
+++ b/Build/source/texk/web2c/Makefile.am
@@ -31,7 +31,7 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h
DISTCLEANFILES = $(EXTRA_LIBRARIES)
CLEANFILES =
-## in case of an SVN repository
+# in case of an SVN repository
dist-hook:
rm -rf `find $(distdir) -name .svn`
@@ -58,11 +58,11 @@ LDADD = $(proglib) $(KPATHSEA_LIBS)
## This does not work for the configure substitution $(KPATHSEA_LIBS),
## thus we let $(proglib) artificially depend on $(KPATHSEA_LIBS).
-## Rebuild $(proglib)
+# Rebuild $(proglib)
$(proglib): $(KPATHSEA_DEPEND) ${srcdir}/lib/*.c
cd lib && $(MAKE) $(AM_MAKEFLAGS)
-## Rebuild Web2C programs
+# Rebuild Web2C programs
web2c/stamp-fixwrites: $(web2c_common) ${srcdir}/web2c/*.[chly]
cd web2c && $(MAKE) $(AM_MAKEFLAGS) stamp-fixwrites
web2c/stamp-splitup: $(web2c_common) ${srcdir}/web2c/*.[chly]
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 8d9f5959f81..70dc2e6245c 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -7862,12 +7862,15 @@ uninstall-man: uninstall-man1 uninstall-man5
uninstall-man5
+# in case of an SVN repository
dist-hook:
rm -rf `find $(distdir) -name .svn`
+# Rebuild $(proglib)
$(proglib): $(KPATHSEA_DEPEND) ${srcdir}/lib/*.c
cd lib && $(MAKE) $(AM_MAKEFLAGS)
+# Rebuild Web2C programs
web2c/stamp-fixwrites: $(web2c_common) ${srcdir}/web2c/*.[chly]
cd web2c && $(MAKE) $(AM_MAKEFLAGS) stamp-fixwrites
web2c/stamp-splitup: $(web2c_common) ${srcdir}/web2c/*.[chly]
diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac
index 94ee84f2095..2080c3bce68 100644
--- a/Build/source/texk/web2c/ac/web2c.ac
+++ b/Build/source/texk/web2c/ac/web2c.ac
@@ -6,21 +6,21 @@ dnl
## configure options for TeX and MF
m4_define_default([kpse_indent_26], [26])[]dnl
AC_ARG_WITH([editor],
- [AS_HELP_STRING([--with-editor=CMD],
- [invoke CMD from the `e' option @<:@vi +%d %s@:>@])])[]dnl
+ AS_HELP_STRING([--with-editor=CMD],
+ [invoke CMD from the `e' option @<:@vi +%d %s@:>@]))[]dnl
AC_ARG_ENABLE([auto-core],
- [AS_HELP_STRING([--enable-auto-core],
- [cause TeX&MF to dump core, given a certain filename],
- kpse_indent_26)])[]dnl
+ AS_HELP_STRING([--enable-auto-core],
+ [cause TeX&MF to dump core, given a certain filename],
+ kpse_indent_26))[]dnl
AC_ARG_ENABLE([dump-share],
- [AS_HELP_STRING([--disable-dump-share],
- [make fmt/base/mem files architecture-dependent],
- kpse_indent_26)])[]dnl
+ AS_HELP_STRING([--disable-dump-share],
+ [make fmt/base/mem files architecture-dependent],
+ kpse_indent_26))[]dnl
## configure options for TeX
AC_ARG_ENABLE([ipc],
- [AS_HELP_STRING([--enable-ipc],
- [enable TeX's --ipc option, i.e., pipe to a program],
- kpse_indent_26)])[]dnl
+ AS_HELP_STRING([--enable-ipc],
+ [enable TeX's --ipc option, i.e., pipe to a program],
+ kpse_indent_26))[]dnl
m4_define([kpse_tex_progs], [dnl
[[tex], [yes], [no], [TeX], []],
[[etex], [no], [yes], [e-TeX], []],
@@ -34,16 +34,16 @@ m4_foreach([Kpse_Prog], [kpse_tex_progs],
[KPSE_WITH_XTEX(Kpse_Prog)])])[]dnl
## configure options for MF
AC_ARG_ENABLE([mf],
- [AS_HELP_STRING([--disable-mf],
- [do not build METAFONT],
- kpse_indent_26)])[]dnl
+ AS_HELP_STRING([--disable-mf],
+ [do not build METAFONT],
+ kpse_indent_26))[]dnl
AC_ARG_ENABLE([mf-nowin],
- [AS_HELP_STRING([--disable-mf-nowin],
- [do not build a separate non-windows-capable METAFONT],
- kpse_indent_26+2)])[]dnl
+ AS_HELP_STRING([--disable-mf-nowin],
+ [do not build a separate non-windows-capable METAFONT],
+ kpse_indent_26+2))[]dnl
AC_ARG_WITH([mf-x-toolkit],
- [AS_HELP_STRING([--without-mf-x-toolkit],
- [do not use X toolkit for METAFONT])])[]dnl
+ AS_HELP_STRING([--without-mf-x-toolkit],
+ [do not use X toolkit for METAFONT]))[]dnl
m4_define([kpse_mf_win], [dnl
[[epsf], [EPSF], [EPSF pseudo]],
[[hp2627], [HP2627], [HP 2627]],
@@ -59,11 +59,11 @@ m4_foreach([Kpse_Win], [kpse_mf_win],
[KPSE_WITH_MFWIN(Kpse_Win)])])[]dnl
## configure options for MP
AC_ARG_ENABLE([mp],
- [AS_HELP_STRING([--disable-mp],
- [do not build METAPOST],
- kpse_indent_26)])[]dnl
+ AS_HELP_STRING([--disable-mp],
+ [do not build METAPOST],
+ kpse_indent_26))[]dnl
## configure options for WEB programs
AC_ARG_ENABLE([web-progs],
- [AS_HELP_STRING([--disable-web-progs],
- [do not build WEB programs bibtex ... weave],
- kpse_indent_26)])[]dnl
+ AS_HELP_STRING([--disable-web-progs],
+ [do not build WEB programs bibtex ... weave],
+ kpse_indent_26))[]dnl
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 3544d4fff66..755e37e5b24 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -23756,6 +23756,10 @@ if test "x$with_system_xpdf" = xyes; then
POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
XPDF_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
XPDF_LIBS=`$PKG_CONFIG poppler --libs`
+elif test "x$need_xpdf:$with_system_xpdf" = 'xyes:yes'; then
+ { { $as_echo "$as_me:$LINENO: error: did not find poppler-0.10 or better" >&5
+$as_echo "$as_me: error: did not find poppler-0.10 or better" >&2;}
+ { (exit 1); exit 1; }; }
fi
else
XPDF_INCLUDES=`echo '-DPDF_PARSER_ONLY -IBLD/libs/xpdf -IBLD/libs/xpdf/goo -IBLD/libs/xpdf/xpdf' | sed \
@@ -23913,6 +23917,10 @@ if test "x$with_system_freetype2" = xyes; then
if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then
FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+elif test "x$need_freetype2:$with_freetype2_xpdf" = 'xyes:yes'; then
+ { { $as_echo "$as_me:$LINENO: error: did not find freetype-config required for system freetype2 library" >&5
+$as_echo "$as_me: error: did not find freetype-config required for system freetype2 library" >&2;}
+ { (exit 1); exit 1; }; }
fi
else
FREETYPE2_INCLUDES=`echo 'BLD/libs/freetype2' | sed \