havelib: Fix bug when AC_LIB_FROMPACKAGE is used more than twice.

diff --git a/ChangeLog b/ChangeLog
index f64cc8ec80ac1dbb4283b9545c3419bef1d4f7be..9b6302ae7676f99ce37b4bca7400e10292310dc2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-04  Bruno Haible  <bruno@clisp.org>
+
+       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 <marlam@marlam.de>.
+
 2010-07-04  Jim Meyering  <meyering@redhat.com>
 
        hash: once again explicitly disallow insertion of NULL

diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
index 59b367df09de32157b451a7cac28f24294727445..9f3be3a2fdaea2672ebfe2d709d42d6521f8732b 100644 (file)
--- 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])
 ])