X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/1f41899519dcf9dd525b68035baf5bc5ed74efc6..5f6da1c0f87fce6498af745949507b5991641251:/data/m4sugar/m4sugar.m4

diff --git a/data/m4sugar/m4sugar.m4 b/data/m4sugar/m4sugar.m4
index c2d3f7a8..ea532930 100644
--- a/data/m4sugar/m4sugar.m4
+++ b/data/m4sugar/m4sugar.m4
@@ -2,7 +2,7 @@ divert(-1)#                                                  -*- Autoconf -*-
 # This file is part of Autoconf.
 # Base M4 layer.
 # Requires GNU M4.
-# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,8 +16,8 @@ divert(-1)#                                                  -*- Autoconf -*-
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception, the Free Software Foundation gives unlimited
 # permission to copy, distribute and modify the configure scripts that
@@ -432,7 +432,8 @@ m4_define([m4_bmatch],
 # of LIST (which can be lists themselves, for multiple arguments MACROs).
 m4_define([m4_fst], [$1])
 m4_define([m4_map],
-[m4_if([$2], [[]], [],
+[m4_if([$2], [], [],
+       [$2], [[]], [],
        [$1(m4_fst($2))[]dnl
 m4_map([$1], m4_cdr($2))])])
 
@@ -843,7 +844,7 @@ m4_define([m4_undivert],
 # m4_require'd.
 #
 # The implementation is based on two ideas, (i) using diversions to
-# prepare the expansion of the macro and its dependencies (by François
+# prepare the expansion of the macro and its dependencies (by Franc,ois
 # Pinard), and (ii) expand the most recently m4_require'd macros _after_
 # the previous macros (by Axel Thimm).
 #
@@ -1745,15 +1746,6 @@ m4_define([m4_version_compare],
              (m4_split(m4_version_unletter([$2]), [\.])))])
 
 
-# m4_PACKAGE_NAME
-# m4_PACKAGE_TARNAME
-# m4_PACKAGE_VERSION
-# m4_PACKAGE_STRING
-# m4_PACKAGE_BUGREPORT
-# --------------------
-m4_include([m4sugar/version.m4])
-
-
 # m4_version_prereq(VERSION, [IF-OK], [IF-NOT = FAIL])
 # ----------------------------------------------------
 # Check this Autoconf version against VERSION.