Mercurial > hg > octave-lyh

changeset 9525:691545147aca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compatibility for earlier autoconfs
author Jaroslav Hajek <highegg@gmail.com>
date Sat, 15 Aug 2009 06:54:29 +0200
parents ace0febd263e
children f3ebc728ffd7
files ChangeLog aclocal.m4
diffstat 2 files changed, 18 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-15  Jaroslav Hajek  <highegg@gmail.com>
+
+	* aclocal.m4: Define the autoconf 2.64+ m4sugar macros `m4_ifblank'
+	and `m4_ifnblank' if on earlier autoconfs.
+
 2009-08-13  John W. Eaton  <jwe@octave.org>
 
 	* Makeconf.in (GLPK_CPPFLAGS, GLPK_LDFLAGS,
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -19,6 +19,19 @@
 dnl along with Octave; see the file COPYING.  If not, see
 dnl <http://www.gnu.org/licenses/>.
 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.