security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

* configure.ac: Add --disable-regex in case some platform just can't

Browse Source 
handle the regex stuff.  This means they can't fully handle trust sigs
with an attached regex either.
This commit is contained in:
David Shaw 2002-10-29 22:44:07 +00:00
parent 809b8b031a
commit de9c6b3169
2 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2002-10-19 David Shaw <dshaw@jabberwocky.com>
* configure.ac: Regex tests adapted from mutt to decide whether to * configure.ac: Regex tests adapted from mutt to decide whether to

50
configure.ac
View File

@ -769,35 +769,47 @@ AC_SUBST(MPI_SFLAGS)
# Sanity check regex. Tests adapted from mutt. # Sanity check regex. Tests adapted from mutt.
AC_MSG_CHECKING([whether the included regex lib is requested]) AC_MSG_CHECKING([whether regular expression support is requested])
AC_ARG_WITH(included-regex, AC_ARG_ENABLE(regex,
[ --with-included-regex use the included GNU regex library], [ --disable-regex do not handle regular expressions in trust sigs],
[gnupg_cv_regex=yes],[gnupg_cv_regex=no]) use_regex=$enableval, use_regex=yes)
AC_MSG_RESULT($gnupg_cv_regex) AC_MSG_RESULT($use_regex)
if test $gnupg_cv_regex = no ; then if test "$use_regex" = yes ; then
# Does the system have regex functions at all? AC_MSG_CHECKING([whether the included regex lib is requested])
AC_CHECK_FUNC(regcomp,gnupg_cv_regex=no,gnupg_cv_regex=yes) AC_ARG_WITH(included-regex,
fi [ --with-included-regex use the included GNU regex library],
[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
AC_CACHE_CHECK([whether your system's regexp library is broken], # Does the system have regex functions at all?
[gnupg_cv_regex_broken], AC_CHECK_FUNC(regcomp,gnupg_cv_included_regex=no,
AC_TRY_RUN([ gnupg_cv_included_regex=yes)
fi
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([
#include <unistd.h> #include <unistd.h>
#include <regex.h> #include <regex.h>
main() { regex_t blah ; regmatch_t p; p.rm_eo = p.rm_eo; return regcomp(&blah, "foo.*bar", REG_NOSUB) || regexec (&blah, "foobar", 0, NULL, 0); }], main() { regex_t blah ; regmatch_t p; p.rm_eo = p.rm_eo; return regcomp(&blah, "foo.*bar", REG_NOSUB) || regexec (&blah, "foobar", 0, NULL, 0); }],
gnupg_cv_regex_broken=no, gnupg_cv_regex_broken=yes, gnupg_cv_regex_broken=yes)) gnupg_cv_regex_broken=no, gnupg_cv_regex_broken=yes, gnupg_cv_regex_broken=yes))
if test $gnupg_cv_regex_broken = yes ; then if test $gnupg_cv_regex_broken = yes ; then
AC_MSG_WARN(your regex is broken - using the included GNU regex instead.) 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 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_DEFINE(USE_GNU_REGEX,1,[ Define if you want to use the included regex lib ])
AC_SUBST(REGEX_O,regex.o) AC_SUBST(REGEX_O,regex.o)
fi
else
AC_DEFINE(DISABLE_REGEX,1,[ Define to disable regular expression support ])
fi fi
dnl Do we have zlib? Must do it here because Solaris failed dnl Do we have zlib? Must do it here because Solaris failed