From 6e3faef0865a4455ee8dd159d7c550d8bf151866 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 7 Mar 2005 00:26:17 +0000 Subject: [PATCH] check dynamic link, by checking if kpathsea executable is < 40k --- ChangeLog | 3 +++ configure.in | 3 ++- stepmake/aclocal.m4 | 10 +++++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23a749a8f1..2714a9ba42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-03-07 Han-Wen Nienhuys + * stepmake/aclocal.m4: check dynamic link, by checking if kpathsea + executable is < 40k + * lily/main.cc (setup_paths): remove tfm1 tfm2 tfm3 include path hack. diff --git a/configure.in b/configure.in index b4fce2da9b..c496d7415d 100644 --- a/configure.in +++ b/configure.in @@ -30,6 +30,8 @@ AC_ARG_ENABLE(gui, # must come before any header checks STEPMAKE_COMPILE +STEPMAKE_KPATHSEA + STEPMAKE_PYTHON(REQUIRED,2.1) STEPMAKE_GCC(REQUIRED, 2.8) STEPMAKE_CXX(REQUIRED) @@ -49,7 +51,6 @@ STEPMAKE_MSGFMT(REQUIRED) STEPMAKE_TEXMF(REQUIRED) STEPMAKE_TEXMF_DIRS STEPMAKE_GUILE_DEVEL(REQUIRED, 1.6.5) -STEPMAKE_KPATHSEA STEPMAKE_MAKEINFO(REQUIRED) STEPMAKE_PYTHON_DEVEL(REQUIRED) diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 0ad2655aaf..c87968c4e2 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -796,8 +796,16 @@ AC_DEFUN(STEPMAKE_KPATHSEA, [ AC_MSG_CHECKING([for shared libkpathsea]) AC_TRY_LINK([#include ], [kpse_var_expand ("\$TEXMF");], - [have_libkpathsea_so=yes], + [have_libkpathsea_so=maybe; + shared_size=`wc -c conftest | sed 's/ .*//g'`] [have_libkpathsea_so=no]) + + if test "$have_libkpathsea_so" = "maybe"; then + if test $shared_size -lt 40000 ; then + have_libkpathsea_so=yes + fi + fi + AC_MSG_RESULT($have_libkpathsea_so) if test "$have_libkpathsea_so" = "yes"; then AC_DEFINE(HAVE_LIBKPATHSEA_SO) -- 2.39.5