# HG changeset patch # User Jaroslav Hajek # Date 1250312069 -7200 # Node ID 691545147aca93c32d91dfcb5a85d2113daf8951 # Parent ace0febd263e77e9f16bcc4c8e6c0da58fed6bb2 compatibility for earlier autoconfs diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-08-15 Jaroslav Hajek + + * aclocal.m4: Define the autoconf 2.64+ m4sugar macros `m4_ifblank' + and `m4_ifnblank' if on earlier autoconfs. + 2009-08-13 John W. Eaton * Makeconf.in (GLPK_CPPFLAGS, GLPK_LDFLAGS, diff --git a/aclocal.m4 b/aclocal.m4 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -19,6 +19,19 @@ dnl along with Octave; see the file COPYING. If not, see dnl . dnl +dnl +dnl If needed, define the m4_ifblank and m4_ifnblank macros from autoconf 2.64 +dnl This allows us to run with earlier Autoconfs as well. +ifdef([m4_ifblank],[],[ +m4_define([m4_ifblank], +[m4_if(m4_translit([[$1]], [ ][ ][ +]), [], [$2], [$3])])]) +dnl +ifdef([m4_ifnblank],[],[ +m4_define([m4_ifnblank], +[m4_if(m4_translit([[$1]], [ ][ ][ +]), [], [$3], [$2])])]) +dnl dnl ---------------------------------------------------------------------- dnl dnl Figure out the hardware-vendor-os info.