From 5a9eb938fe7692fef0c13fb6bccda9c2a80db224 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 4 Jul 2010 16:12:35 +0200 Subject: [PATCH] havelib: Fix bug when AC_LIB_FROMPACKAGE is used more than twice. --- ChangeLog | 6 ++++++ m4/lib-link.m4 | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f64cc8ec8..9b6302ae7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-07-04 Bruno Haible + + havelib: Fix bug when AC_LIB_FROMPACKAGE is used more than twice. + * m4/lib-link.m4 (AC_LIB_FROMPACKAGE): Use m4_defn. + Reported by Martin Lambers . + 2010-07-04 Jim Meyering hash: once again explicitly disallow insertion of NULL diff --git a/m4/lib-link.m4 b/m4/lib-link.m4 index 59b367df0..9f3be3a2f 100644 --- a/m4/lib-link.m4 +++ b/m4/lib-link.m4 @@ -1,4 +1,4 @@ -# lib-link.m4 serial 23 (gettext-0.18.2) +# lib-link.m4 serial 24 (gettext-0.18.2) dnl Copyright (C) 2001-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -165,7 +165,7 @@ AC_DEFUN([AC_LIB_FROMPACKAGE], pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) define([acl_libsinpackage_]PACKUP, - m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1]) + m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1]) popdef([PACKUP]) popdef([PACK]) ]) -- 2.11.0