From ca05e3b1e35506aebe1d4a41168ea38f6ce35360 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 15 Jan 1996 20:57:15 +0000 Subject: [PATCH] (AC_OUTPUT_MAKE_DEFS): Match `#define foo' without trailing space in confdefs.h. --- acgeneral.m4 | 4 ++-- lib/autoconf/general.m4 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/acgeneral.m4 b/acgeneral.m4 index 780a8a4c..d4e1c679 100644 --- a/acgeneral.m4 +++ b/acgeneral.m4 @@ -1,7 +1,7 @@ dnl Parameterized macros. dnl Requires GNU m4. dnl This file is part of Autoconf. -dnl Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc. +dnl Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by @@ -1860,7 +1860,7 @@ dnl Using a here document instead of a string reduces the quoting nightmare. # Protect against Makefile macro expansion. cat > conftest.defs <<\EOF changequote(<<, >>)dnl -s%<<#define>> \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%-D\1=\2%g +s%<<#define>> \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g s%[ `~<<#>>$^&*(){}\\|;'"<>?]%\\&%g s%\[%\\&%g s%\]%\\&%g diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index 780a8a4c..d4e1c679 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -1,7 +1,7 @@ dnl Parameterized macros. dnl Requires GNU m4. dnl This file is part of Autoconf. -dnl Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc. +dnl Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by @@ -1860,7 +1860,7 @@ dnl Using a here document instead of a string reduces the quoting nightmare. # Protect against Makefile macro expansion. cat > conftest.defs <<\EOF changequote(<<, >>)dnl -s%<<#define>> \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%-D\1=\2%g +s%<<#define>> \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g s%[ `~<<#>>$^&*(){}\\|;'"<>?]%\\&%g s%\[%\\&%g s%\]%\\&%g