CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-08-04 06:40:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed a bug related to users providing a custom location for libpcre

Browse source 
(reported by Daniel Johnson)
This commit is contained in:
stoiko 2007-08-30 18:53:38 +00:00
parent 91e7ed8aa6
commit b1292777f2
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
nselib/configure vendored
View file

@ -18539,19 +18539,21 @@ if test "${with_libpcre+set}" = set; then
yes)
;;
included)
PCREDIR="../libpcre"
PCRE_INCLUDE_DIR="../libpcre"
PCRE_LD_DIR="../libpcre"
;;
*)
PCREDIR="$with_libpcre"
PCRE_INCLUDE_DIR="$with_libpcre/include"
PCRE_LD_DIR="$with_libpcre/lib"
;;
esac
else
PCREDIR="../libpcre"
PCRE_INCLUDE_DIR="../libpcre";PCRE_LD_DIR="../libpcre"
fi
PCRE_INCLUDE="-I$PCREDIR"
PCRE_LD="-L$PCREDIR"
PCRE_INCLUDE="-I$PCRE_INCLUDE_DIR"
PCRE_LD="-L$PCRE_LD_DIR"
PCRE_LIBS="-lpcre"
# AC_SUBST(PCREDIR)

12
nselib/configure.ac
View file

@ -29,16 +29,18 @@ AC_HELP_STRING([--with-libpcre=included], [Always use the version included with
yes)
;;
included)
PCREDIR="../libpcre"
PCRE_INCLUDE_DIR="../libpcre"
PCRE_LD_DIR="../libpcre"
;;
*)
PCREDIR="$with_libpcre"
PCRE_INCLUDE_DIR="$with_libpcre/include"
PCRE_LD_DIR="$with_libpcre/lib"
;;
esac],
PCREDIR="../libpcre"
[PCRE_INCLUDE_DIR="../libpcre";PCRE_LD_DIR="../libpcre"]
)
PCRE_INCLUDE="-I$PCREDIR"
PCRE_LD="-L$PCREDIR"
PCRE_INCLUDE="-I$PCRE_INCLUDE_DIR"
PCRE_LD="-L$PCRE_LD_DIR"
PCRE_LIBS="-lpcre"
# AC_SUBST(PCREDIR)