1
0
mirror of https://github.com/nmap/nmap.git synced 2026-01-03 05:09:14 +00:00

better detection and support for systems which use pcre/pcre.h rather than just pcre.h. Bug reported by Lionel Cons

This commit is contained in:
fyodor
2007-11-27 19:32:49 +00:00
parent 4ed4ffa219
commit 7c7cec7c1d
3 changed files with 3978 additions and 4169 deletions

View File

@@ -147,6 +147,8 @@
#undef HAVE_TERMIOS_H
#undef HAVE_PCRE_H
#undef HAVE_PCRE_PCRE_H
#undef BSD_NETWORKING

8141
configure vendored

File diff suppressed because it is too large Load Diff

View File

@@ -382,7 +382,7 @@ AC_HELP_STRING([--with-libpcre=included], [Always use the version included with
if test $have_pcre != yes -a $requested_included_pcre != yes ; then
AC_CHECK_HEADER(pcre.h,
AC_CHECK_LIB(pcre, pcre_version, [have_pcre=yes ]),
[AC_CHECK_HEADERS(pcre/pcre.h,
[AC_CHECK_HEADER(pcre/pcre.h,
[AC_CHECK_LIB(pcre, pcre_version, [have_pcre=yes])]
)]
)
@@ -398,6 +398,8 @@ if test $have_pcre != yes ; then
PCRE_CLEAN="pcre_clean"
PCRE_DIST_CLEAN="pcre_dist_clean"
else
# We only need to check for and use this if we are NOT using included pcre
AC_CHECK_HEADERS(pcre/pcre.h)
LIBPCRE_LIBS="-lpcre"
PCRE_DEPENDS=""
PCRE_BUILD=""