X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fregex.m4;h=35759aabcf4d089e213930372c0b4311a70657a9;hb=118c7c3af6b537e01580f3ddd29262cdc7ee17b9;hp=c8194b2147c5dfa3d3cafa8a43fce40edf5f9826;hpb=2c33d34e2a0d9cb0fa744c08c660c145979615bf;p=gnulib.git diff --git a/m4/regex.m4 b/m4/regex.m4 index c8194b214..35759aabc 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,4 +1,4 @@ -#serial 7 +#serial 8 dnl Initially derived from code in GNU grep. dnl Mostly written by Jim Meyering. @@ -51,10 +51,9 @@ AC_DEFUN(jm_INCLUDED_REGEX, fi test -n "$1" || AC_MSG_ERROR([missing argument]) - syscmd([test -f $1]) - ifelse(sysval, 0, + m4_syscmd([test -f $1]) + ifelse(m4_sysval, 0, [ - AC_ARG_WITH(included-regex, [ --without-included-regex don't compile regex; this is the default on systems with version 2 of the GNU C library @@ -62,8 +61,7 @@ AC_DEFUN(jm_INCLUDED_REGEX, jm_with_regex=$withval, jm_with_regex=$ac_use_included_regex) if test "$jm_with_regex" = yes; then - AC_SUBST(LIBOBJS) - LIBOBJS="$LIBOBJS regex.$ac_objext" + AC_LIBOBJ(regex) fi ], )