use $jm_with_regex, now $WITH_REGEX

diff --git a/m4/regex.m4 b/m4/regex.m4
index bf4d194893df3602c3e58cf94b2c1a7ce83b9b2d..0d55c4496dbe7cd45e8c395bd8abcb09cde5fc33 100644 (file)
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -6,26 +6,11 @@ AC_DEFUN(jm_WITH_REGEX,
   [
     AC_ARG_WITH(included-regex,
                [  --without-included-regex don't compile regex],
-               USE_REGEX=$withval,
-               USE_REGEX=yes)
-
-    if test "$USE_REGEX" = yes; then
+               jm_with_regex=$withval,
+               jm_with_regex=yes)
 
+    if test "$jm_with_regex" = yes; then
       LIBOBJS="$LIBOBJS regex.o"
-
-    else
-      if test x = y; then
-       # This code is deliberately never run via ./configure.
-       # FIXME: this is a hack to make autoheader put the corresponding
-       # HAVE_* undef for this symbol in config.h.in.  This saves me the
-       # trouble of having to maintain the #undef in acconfig.h manually.
-       AC_CHECK_FUNCS(LIBC_REGEX)
-      fi
-      # Defining it this way (rather than via AC_DEFINE) short-circuits the
-      # autoheader check -- autoheader doesn't know it's already been taken
-      # care of by the hack above.
-      ac_kludge=HAVE_LIBC_REGEX
-      AC_DEFINE_UNQUOTED($ac_kludge)
     fi
   ]
 )