diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-05-06 13:26:11 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-05-06 13:26:11 +0000 |
| commit | 7a1b9836bb2fb7551e05f9346668350e9db8c71d (patch) | |
| tree | 6ce8385896bf676c3f9da23ec083b1d1f5ca6847 /security/nmap/files/patch-configure | |
| parent | Both patch files should be optional. Fix my mistake. (diff) | |
- Update to 4.62
PR: 123401
Submitted by: Daniel Roethlisberger <daniel@roe.ch> (maintainer)
Notes
Notes:
svn path=/head/; revision=212738
Diffstat (limited to 'security/nmap/files/patch-configure')
| -rw-r--r-- | security/nmap/files/patch-configure | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/security/nmap/files/patch-configure b/security/nmap/files/patch-configure index b02fbbfd281c..9a56d3386831 100644 --- a/security/nmap/files/patch-configure +++ b/security/nmap/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2008-03-15 02:21:22.000000000 +0100 -+++ configure 2008-04-13 17:16:35.000000000 +0200 -@@ -1929,7 +1929,7 @@ +--- configure.orig 2008-04-28 19:53:32.000000000 +0200 ++++ configure 2008-05-04 20:25:47.000000000 +0200 +@@ -1930,7 +1930,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. @@ -9,16 +9,25 @@ { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then -@@ -7174,9 +7174,10 @@ +@@ -7179,9 +7179,9 @@ no_lua="yes" ;; *) -- CXXFLAGS="-I$with_liblua/include $CXXFLAGS" +- CPPFLAGS="-I$with_liblua/include $CPPFLAGS" - LDFLAGS="-L$with_liblua/lib $LDFLAGS" -+ CXXFLAGS="-I${LUA_INCDIR} $CXXFLAGS" +- have_lua=yes ++ CPPFLAGS="-I${LUA_INCDIR} $CPPFLAGS" + LDFLAGS="-L${LUA_LIBDIR} $LDFLAGS" - have_lua=yes -+ LIBLUA_LIBS="-llua" ++ #have_lua=yes ;; esac +@@ -7189,7 +7189,7 @@ + + + # They don't want lua +-if test $no_lua == yes; then ++if test $no_lua = yes; then + CXXFLAGS="-DNOLUA $CXXFLAGS" + LIBLUA_LIBS="" + LUA_DEPENDS="" |