mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-03 12:11:33 +01:00
* configure.ac: Add --disable-regex in case some platform just can't
handle the regex stuff. This means they can't fully handle trust sigs with an attached regex either.
This commit is contained in:
parent
809b8b031a
commit
de9c6b3169
@ -1,3 +1,9 @@
|
||||
2002-10-29 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* configure.ac: Add --disable-regex in case some platform just
|
||||
can't handle the regex stuff. This means they can't fully handle
|
||||
trust sigs with an attached regex either.
|
||||
|
||||
2002-10-19 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* configure.ac: Regex tests adapted from mutt to decide whether to
|
||||
|
34
configure.ac
34
configure.ac
@ -769,18 +769,26 @@ AC_SUBST(MPI_SFLAGS)
|
||||
|
||||
# Sanity check regex. Tests adapted from mutt.
|
||||
|
||||
AC_MSG_CHECKING([whether the included regex lib is requested])
|
||||
AC_ARG_WITH(included-regex,
|
||||
AC_MSG_CHECKING([whether regular expression support is requested])
|
||||
AC_ARG_ENABLE(regex,
|
||||
[ --disable-regex do not handle regular expressions in trust sigs],
|
||||
use_regex=$enableval, use_regex=yes)
|
||||
AC_MSG_RESULT($use_regex)
|
||||
|
||||
if test "$use_regex" = yes ; then
|
||||
AC_MSG_CHECKING([whether the included regex lib is requested])
|
||||
AC_ARG_WITH(included-regex,
|
||||
[ --with-included-regex use the included GNU regex library],
|
||||
[gnupg_cv_regex=yes],[gnupg_cv_regex=no])
|
||||
AC_MSG_RESULT($gnupg_cv_regex)
|
||||
[gnupg_cv_included_regex=yes],[gnupg_cv_included_regex=no])
|
||||
AC_MSG_RESULT($gnupg_cv_included_regex)
|
||||
|
||||
if test $gnupg_cv_regex = no ; then
|
||||
if test $gnupg_cv_included_regex = no ; then
|
||||
# Does the system have regex functions at all?
|
||||
AC_CHECK_FUNC(regcomp,gnupg_cv_regex=no,gnupg_cv_regex=yes)
|
||||
fi
|
||||
AC_CHECK_FUNC(regcomp,gnupg_cv_included_regex=no,
|
||||
gnupg_cv_included_regex=yes)
|
||||
fi
|
||||
|
||||
if test $gnupg_cv_regex = no ; then
|
||||
if test $gnupg_cv_included_regex = no ; then
|
||||
AC_CACHE_CHECK([whether your system's regexp library is broken],
|
||||
[gnupg_cv_regex_broken],
|
||||
AC_TRY_RUN([
|
||||
@ -791,13 +799,17 @@ main() { regex_t blah ; regmatch_t p; p.rm_eo = p.rm_eo; return regcomp(&blah, "
|
||||
|
||||
if test $gnupg_cv_regex_broken = yes ; then
|
||||
AC_MSG_WARN(your regex is broken - using the included GNU regex instead.)
|
||||
gnupg_cv_regex=yes
|
||||
gnupg_cv_included_regex=yes
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if test $gnupg_cv_regex = yes; then
|
||||
if test $gnupg_cv_included_regex = yes; then
|
||||
AC_DEFINE(USE_GNU_REGEX,1,[ Define if you want to use the included regex lib ])
|
||||
AC_SUBST(REGEX_O,regex.o)
|
||||
fi
|
||||
else
|
||||
|
||||
AC_DEFINE(DISABLE_REGEX,1,[ Define to disable regular expression support ])
|
||||
fi
|
||||
|
||||
dnl Do we have zlib? Must do it here because Solaris failed
|
||||
|
Loading…
x
Reference in New Issue
Block a user