check dynamic link, by checking if kpathsea

executable is < 40k

diff --git a/ChangeLog b/ChangeLog
index 23a749a8f12fd2982a2e81efd30913ceb6eeaf1a..2714a9ba42e9ef235e945fb50c61aec3460f1c4b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-03-07  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * 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 b4fce2da9b4ec76d51e8f47e17c5579a020029ad..c496d7415d9baacd6d7c51696510537dfef8f35c 100644 (file)
--- 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 0ad2655aafee44618128247c25f6a193e7678b78..c87968c4e24cea0371b016ae57d4d20fd746f060 100644 (file)
--- 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 <kpathsea/kpathsea.h>],
                  [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)