From: Jan Nieuwenhuizen Date: Mon, 28 Mar 2005 15:51:01 +0000 (+0000) Subject: Fix shared size test: add missing comma, do X-Git-Tag: release/2.5.17~16 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=32f10f1e5741ddadbae0ed5d4bd3008a22fb6fb9;p=lilypond.git Fix shared size test: add missing comma, do not use debugging. --- diff --git a/ChangeLog b/ChangeLog index 839a4b0bfc..fb0ac3a46e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-03-28 Jan Nieuwenhuizen + + * stepmake/aclocal.m4: Fix shared size test: add missing comma, do + not use debugging. + 2005-03-28 Han-Wen Nienhuys * Documentation/user/instrument-notation.itely (String number @@ -16,7 +21,7 @@ 2005-03-28 Jan Nieuwenhuizen - * config.make.in (HAVE_LIBKPATHSEA_SO): + * config.make.in (HAVE_LIBKPATHSEA_SO): * stepmake/aclocal.m4: Also subst HAVE_LIBKPATHSEA_SO. * lily/GNUmakefile (MODULE_LDFLAGS): Only if not HAVE_KPATHSEA_SO, diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index d4c59bacc9..62989a5009 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -792,12 +792,12 @@ AC_DEFUN(STEPMAKE_KPATHSEA, [ fi save_CFLAGS="$CFLAGS" - CFLAGS="-shared $CFLAGS" + CFLAGS=$(echo "-shared $CFLAGS" | sed -e 's/ -g//') AC_MSG_CHECKING([for shared libkpathsea]) AC_TRY_LINK([#include ], [kpse_var_expand ("\$TEXMF");], [have_libkpathsea_so=maybe; - shared_size=`wc -c conftest | sed 's/ .*//g'`] + shared_size=`wc -c conftest | sed -e 's/ .*//g'`], [have_libkpathsea_so=no]) if test "$have_libkpathsea_so" = "maybe"; then