From 2a6bdca468b851336fb82ebc7af0c884a7eb64af Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Sat, 31 Jan 2004 14:34:41 +0000
Subject: [PATCH] * m4/regex.m4: Do not AC_SUBST(LIBOBJS), and quote most
 arguments. * tests/regex.test: New file. * tests/Makefile.am (TESTS): Add
 regex.test.

---
 ChangeLog         |  6 ++++++
 m4/regex.m4       | 19 +++++++++----------
 tests/Makefile.am |  1 +
 tests/Makefile.in |  1 +
 tests/regex.test  | 34 ++++++++++++++++++++++++++++++++++
 5 files changed, 51 insertions(+), 10 deletions(-)
 create mode 100755 tests/regex.test

diff --git a/ChangeLog b/ChangeLog
index 2ebad40f..be8ec3d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-31  Alexandre Duret-Lutz  <adl@gnu.org>
+
+	* m4/regex.m4: Do not AC_SUBST(LIBOBJS), and quote most arguments.
+	* tests/regex.test: New file.
+	* tests/Makefile.am (TESTS): Add regex.test.
+
 2004-01-28  Alexandre Duret-Lutz  <adl@gnu.org>
 
 	* Makefile.am (maintainer-check): Check for unquoted $(DESTDIR) uses.
diff --git a/m4/regex.m4 b/m4/regex.m4
index 702da0dd..f05456f9 100644
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -2,7 +2,7 @@
 ## Check if --with-regex was given.  ##
 ## --------------------------------- ##
 
-# Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 # Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-# serial 5
+# serial 6
 
 # AM_WITH_REGEX
 # -------------
@@ -41,14 +41,14 @@ AC_DEFUN([AM_WITH_REGEX],
 [AC_PREREQ(2.50)dnl
 AC_LIBSOURCES([rx.h, rx.c, regex.c, regex.h])dnl
 AC_MSG_CHECKING([which of GNU rx or gawk's regex is wanted])
-AC_ARG_WITH(regex,
+AC_ARG_WITH([regex],
 [  --without-regex         use GNU rx in lieu of gawk's regex for matching],
 	    [test "$withval" = yes && am_with_regex=1],
 	    [am_with_regex=1])
 if test -n "$am_with_regex"; then
-  AC_MSG_RESULT(regex)
-  AC_DEFINE(WITH_REGEX, 1, [Define if using GNU regex])
-  AC_CACHE_CHECK([for GNU regex in libc], am_cv_gnu_regex,
+  AC_MSG_RESULT([regex])
+  AC_DEFINE([WITH_REGEX], 1, [Define if using GNU regex])
+  AC_CACHE_CHECK([for GNU regex in libc], [am_cv_gnu_regex],
     [AC_TRY_LINK([],
 		 [extern int re_max_failures; re_max_failures = 1],
 		 [am_cv_gnu_regex=yes],
@@ -57,10 +57,9 @@ if test -n "$am_with_regex"; then
     AC_LIBOBJ([regex])
   fi
 else
-  AC_MSG_RESULT(rx)
-  AC_CHECK_FUNC(re_rx_search, , [AC_LIBOBJ([rx])])
-fi
-AC_SUBST(LIBOBJS)dnl
+  AC_MSG_RESULT([rx])
+  AC_CHECK_FUNC([re_rx_search], , [AC_LIBOBJ([rx])])
+fi[]dnl
 ])
 
 AU_DEFUN([fp_WITH_REGEX], [AM_WITH_REGEX])
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 572dedb5..3c86a6b6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -400,6 +400,7 @@ remake2.test \
 remake3.test \
 remake4.test \
 remake5.test \
+regex.test \
 req.test \
 reqd.test \
 reqd2.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 7bf4df89..ad56ddd1 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -514,6 +514,7 @@ remake2.test \
 remake3.test \
 remake4.test \
 remake5.test \
+regex.test \
 req.test \
 reqd.test \
 reqd2.test \
diff --git a/tests/regex.test b/tests/regex.test
new file mode 100755
index 00000000..2a80b3da
--- /dev/null
+++ b/tests/regex.test
@@ -0,0 +1,34 @@
+#! /bin/sh
+# Copyright (C) 2004  Free Software Foundation, Inc.
+#
+# This file is part of GNU Automake.
+#
+# GNU Automake is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# GNU Automake is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Automake; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# Make sure AM_WITH_REGEX compiles and runs.
+
+. ./defs || exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AM_WITH_REGEX
+END
+
+$ACLOCAL
+$AUTOCONF
+./configure
+./configure --without-regex
-- 
2.43.5