diff options
| author | Tom Tromey <tromey@redhat.com> | 1996-12-04 08:28:28 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 1996-12-04 08:28:28 +0000 |
| commit | b11d19e5c751a844cdf87ebc8e1d6cb489c158cc (patch) | |
| tree | ff70744fafd8511bb24b9fb68ce6a9fd50646e30 | |
| parent | 7ae775a8dd09d45c280bd491ea3716be219ffe30 (diff) | |
| download | automake-b11d19e5c751a844cdf87ebc8e1d6cb489c158cc.tar.gz | |
fix to AM_WITH_REGEX
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | m4/regex.m4 | 7 |
2 files changed, 14 insertions, 1 deletions
@@ -1,5 +1,13 @@ Wed Dec 4 00:41:23 1996 Tom Tromey <tromey@cygnus.com> + * m4/regex.m4 (AM_WITH_REGEX): Check for GNU regex in libc. From + Andreas Schwab. + + * automake.in (parse_arguments): Removed --strictness. + (handle_dist_worker): Don't use --strictness. + (handle_configure): Ditto. + (initialize_global_constants): Don't mention --strictness. + * automake.in (handle_merge_targets): Use all-recursive-am instead of all-recursive-hack. The latter is ugly, according to Joel Weber. diff --git a/m4/regex.m4 b/m4/regex.m4 index 3d15c75fd..007b16636 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -23,7 +23,12 @@ AC_ARG_WITH(regex, if test -n "$am_with_regex"; then AC_MSG_RESULT(regex) AC_DEFINE(WITH_REGEX) - LIBOBJS="$LIBOBJS regex.o" + 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, am_cv_gnu_regex=no)) + if test $am_cv_gnu_regex = no; then + LIBOBJS="$LIBOBJS regex.o" + fi else AC_MSG_RESULT(rx) AC_CHECK_FUNC(re_rx_search, , [LIBOBJS="$LIBOBJS rx.o"]) |