PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-01-22 14:19:02 +00:00
Code Issues Projects Releases Wiki Activity

Remove a test for the existence of $CXX in configure.ac. This was already done

Browse Source 
better by AC_PROG_CXX and caused a failure when configured with ccache:

CXX="ccache /usr/bin/g++-4.0" ./configure
checking build system type... i386-apple-darwin9.2.2 
checking host system type... i386-apple-darwin9.2.2 
checking for gcc... ccache /usr/bin/gcc-4.0 
checking for C compiler default output file name... a.out 
checking whether the C compiler works... yes 
checking whether we are cross compiling... no 
checking for suffix of executables... 
checking for suffix of object files... o 
checking whether we are using the GNU C compiler... yes 
checking whether ccache /usr/bin/gcc-4.0 accepts -g... yes 
checking for ccache /usr/bin/gcc-4.0 option to accept ISO C89... none needed 
checking for inline... inline 
checking for gcc... (cached) ccache /usr/bin/gcc-4.0 
checking whether we are using the GNU C compiler... (cached) yes 
checking whether ccache /usr/bin/gcc-4.0 accepts -g... (cached) yes 
checking for ccache /usr/bin/gcc-4.0 option to accept ISO C89... 
(cached) none needed 
checking whether we are using the GNU C++ compiler... yes 
checking whether ccache /usr/bin/g++-4.0 accepts -g... yes 
checking for ccache /usr/bin/g++-4.0... MISSING 
configure: error: Could not locate a C++ compiler. If it exists, add it 
to your PATH or give configure the CXX=path_to_compiler argument. 
Otherwise, install a C++ compiler such as g++ or install a binary 
package of Nmap (see http://nmap.org/download.html ))
This commit is contained in:
david
2008-05-20 05:31:53 +00:00
parent 7d38c4dc6e
commit fac8d52c1c
3 changed files with 6 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@@ -1,5 +1,9 @@
# Nmap Changelog ($Id$); -*-text-*-
o Removed a superfluous test for the existence of the C++ compiler in the
configure script. The test was not robust when configured with
CXX="ccache g++". Thanks to Rainer Müller for the report.
o Fixed a bug in nmap_dns.cc where the endian of the platform that nmap
ran on might negitivly effect how efficiently nmap stores cache values
in a hash table. [Michael]

50
configure vendored
View File

@@ -670,7 +670,6 @@ OBJEXT
CXX
CXXFLAGS
ac_ct_CXX
CXXPROG
COMPAT_OBJS
COMPAT_SRCS
STRIP
@@ -3957,50 +3956,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$GXX"; then
CXXFLAGS="$CXXFLAGS -Wall "
fi
# Extract the first word of ""$CXX"", so it can be a program name with args.
set dummy "$CXX"; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_CXXPROG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$CXXPROG"; then
ac_cv_prog_CXXPROG="$CXXPROG" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
as_dummy=""$PATH":/"
for as_dir in $as_dummy
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CXXPROG=""AVAILABLE""
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
test -z "$ac_cv_prog_CXXPROG" && ac_cv_prog_CXXPROG=""MISSING""
fi
fi
CXXPROG=$ac_cv_prog_CXXPROG
if test -n "$CXXPROG"; then
{ echo "$as_me:$LINENO: result: $CXXPROG" >&5
echo "${ECHO_T}$CXXPROG" >&6; }
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
if test $CXXPROG = "MISSING"; then
{ { echo "$as_me:$LINENO: error: Could not locate a C++ compiler. If it exists, add it to your PATH or give configure the CXX=path_to_compiler argument. Otherwise, install a C++ compiler such as g++ or install a binary package of Nmap (see http://nmap.org/download.html ))" >&5
echo "$as_me: error: Could not locate a C++ compiler. If it exists, add it to your PATH or give configure the CXX=path_to_compiler argument. Otherwise, install a C++ compiler such as g++ or install a binary package of Nmap (see http://nmap.org/download.html ))" >&2;}
{ (exit 1); exit 1; }; }
fi
{ echo "$as_me:$LINENO: checking whether the compiler is gcc 4 or greater" >&5
echo $ECHO_N "checking whether the compiler is gcc 4 or greater... $ECHO_C" >&6; }
@@ -9164,7 +9119,6 @@ OBJEXT!$OBJEXT$ac_delim
CXX!$CXX$ac_delim
CXXFLAGS!$CXXFLAGS$ac_delim
ac_ct_CXX!$ac_ct_CXX$ac_delim
CXXPROG!$CXXPROG$ac_delim
COMPAT_OBJS!$COMPAT_OBJS$ac_delim
COMPAT_SRCS!$COMPAT_SRCS$ac_delim
STRIP!$STRIP$ac_delim
@@ -9204,6 +9158,7 @@ LIBDNETDIR!$LIBDNETDIR$ac_delim
DNET_DEPENDS!$DNET_DEPENDS$ac_delim
DNET_BUILD!$DNET_BUILD$ac_delim
DNET_CLEAN!$DNET_CLEAN$ac_delim
DNET_DIST_CLEAN!$DNET_DIST_CLEAN$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -9245,7 +9200,6 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
DNET_DIST_CLEAN!$DNET_DIST_CLEAN$ac_delim
LIBLUA_LIBS!$LIBLUA_LIBS$ac_delim
LIBLUADIR!$LIBLUADIR$ac_delim
LUA_DEPENDS!$LUA_DEPENDS$ac_delim
@@ -9265,7 +9219,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 18; then
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

4
configure.ac
View File

@@ -46,10 +46,6 @@ AC_PROG_CXX
if test -n "$GXX"; then
CXXFLAGS="$CXXFLAGS -Wall "
fi
AC_CHECK_PROG(CXXPROG, "$CXX", "AVAILABLE", "MISSING", "$PATH":/)
if test $CXXPROG = "MISSING"; then
AC_MSG_ERROR([Could not locate a C++ compiler. If it exists, add it to your PATH or give configure the CXX=path_to_compiler argument. Otherwise, install a C++ compiler such as g++ or install a binary package of Nmap (see http://nmap.org/download.html ))])
fi
AC_MSG_CHECKING([whether the compiler is gcc 4 or greater])
if test x"$GXX" = xno; then