X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fregex.m4;h=e5468c655b642f762fa1c6865d42456f02cd9288;hb=a4b08c6402dda3bf4e19761c7df21d30bd638bd9;hp=2a7bfe014332561c87ca2257b97cf0700edf3f4a;hpb=5591b1ab18345b4ec37df47fea367a6845dbb166;p=gnulib.git

diff --git a/m4/regex.m4 b/m4/regex.m4
index 2a7bfe014..e5468c655 100644
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -1,14 +1,23 @@
-#serial 1
+#serial 2
 
-dnl From grep.
+dnl Derived from code in GNU grep.
 
 AC_DEFUN(jm_WITH_REGEX,
   [
-    AC_ARG_WITH(included-regex,
-		[  --without-included-regex         don't compile regex],
-		USE_REGEX=$withval,
-		USE_REGEX=yes)
+    dnl Even packages that don't use regex.c can use this macro.
+    dnl Of course, for them it doesn't do anything.
 
-    test "$USE_REGEX" = "yes" && LIBOBJS="$LIBOBJS regex.o"
+    syscmd([test -f lib/regex.c])
+    ifelse(sysval, 0,
+      [
+	AC_ARG_WITH(included-regex,
+	    [  --without-included-regex don't compile regex (use with caution)],
+		    jm_with_regex=$withval,
+		    jm_with_regex=yes)
+	if test "$jm_with_regex" = yes; then
+	  LIBOBJS="$LIBOBJS regex.o"
+	fi
+      ],
+    )
   ]
 )