mirror of
https://github.com/nmap/nmap.git
synced 2026-10-23 12:21:59 +00:00
Remove C++ checks from Ncat
This commit is contained in:
dmiller
parent
b403ddee1e
commit
5c6ed3121e
2 changed files with 5 additions and 707 deletions
699
ncat/configure
vendored
699
ncat/configure
vendored
|
|
@ -650,9 +650,6 @@ ac_func_c_list=
|
|||
ac_subst_vars='LTLIBOBJS
|
||||
LIBOBJS
|
||||
ENABLE_FUZZING
|
||||
ac_ct_CXX
|
||||
CXXFLAGS
|
||||
CXX
|
||||
LUA_DIST_CLEAN
|
||||
LUA_CLEAN
|
||||
LUA_BUILD
|
||||
|
|
@ -746,10 +743,7 @@ CFLAGS
|
|||
LDFLAGS
|
||||
LIBS
|
||||
CPPFLAGS
|
||||
CPP
|
||||
CXX
|
||||
CXXFLAGS
|
||||
CCC'
|
||||
CPP'
|
||||
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -1393,8 +1387,6 @@ Some influential environment variables:
|
|||
CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
|
||||
you have headers in a nonstandard directory <include dir>
|
||||
CPP C preprocessor
|
||||
CXX C++ compiler command
|
||||
CXXFLAGS C++ compiler flags
|
||||
|
||||
Use these variables to override the choices made by `configure' or to help
|
||||
it to find libraries and programs with nonstandard names/locations.
|
||||
|
|
@ -1847,45 +1839,6 @@ fi
|
|||
as_fn_set_status $ac_retval
|
||||
|
||||
} # ac_fn_c_try_cpp
|
||||
|
||||
# ac_fn_cxx_try_compile LINENO
|
||||
# ----------------------------
|
||||
# Try to compile conftest.$ac_ext, and return whether this succeeded.
|
||||
ac_fn_cxx_try_compile ()
|
||||
{
|
||||
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||||
rm -f conftest.$ac_objext conftest.beam
|
||||
if { { ac_try="$ac_compile"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
||||
printf "%s\n" "$ac_try_echo"; } >&5
|
||||
(eval "$ac_compile") 2>conftest.err
|
||||
ac_status=$?
|
||||
if test -s conftest.err; then
|
||||
grep -v '^ *+' conftest.err >conftest.er1
|
||||
cat conftest.er1 >&5
|
||||
mv -f conftest.er1 conftest.err
|
||||
fi
|
||||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; } && {
|
||||
test -z "$ac_cxx_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest.$ac_objext
|
||||
then :
|
||||
ac_retval=0
|
||||
else $as_nop
|
||||
printf "%s\n" "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_retval=1
|
||||
fi
|
||||
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
||||
as_fn_set_status $ac_retval
|
||||
|
||||
} # ac_fn_cxx_try_compile
|
||||
ac_configure_args_raw=
|
||||
for ac_arg
|
||||
do
|
||||
|
|
@ -2505,222 +2458,6 @@ as_fn_append ac_func_c_list " vfork HAVE_VFORK"
|
|||
as_fn_append ac_header_c_list " sys/select.h sys_select_h HAVE_SYS_SELECT_H"
|
||||
as_fn_append ac_header_c_list " sys/socket.h sys_socket_h HAVE_SYS_SOCKET_H"
|
||||
as_fn_append ac_func_c_list " vprintf HAVE_VPRINTF"
|
||||
# Test code for whether the C++ compiler supports C++98 (global declarations)
|
||||
ac_cxx_conftest_cxx98_globals='
|
||||
// Does the compiler advertise C++98 conformance?
|
||||
#if !defined __cplusplus || __cplusplus < 199711L
|
||||
# error "Compiler does not advertise C++98 conformance"
|
||||
#endif
|
||||
|
||||
// These inclusions are to reject old compilers that
|
||||
// lack the unsuffixed header files.
|
||||
#include <cstdlib>
|
||||
#include <exception>
|
||||
|
||||
// <cassert> and <cstring> are *not* freestanding headers in C++98.
|
||||
extern void assert (int);
|
||||
namespace std {
|
||||
extern int strcmp (const char *, const char *);
|
||||
}
|
||||
|
||||
// Namespaces, exceptions, and templates were all added after "C++ 2.0".
|
||||
using std::exception;
|
||||
using std::strcmp;
|
||||
|
||||
namespace {
|
||||
|
||||
void test_exception_syntax()
|
||||
{
|
||||
try {
|
||||
throw "test";
|
||||
} catch (const char *s) {
|
||||
// Extra parentheses suppress a warning when building autoconf itself,
|
||||
// due to lint rules shared with more typical C programs.
|
||||
assert (!(strcmp) (s, "test"));
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T> struct test_template
|
||||
{
|
||||
T const val;
|
||||
explicit test_template(T t) : val(t) {}
|
||||
template <typename U> T add(U u) { return static_cast<T>(u) + val; }
|
||||
};
|
||||
|
||||
} // anonymous namespace
|
||||
'
|
||||
|
||||
# Test code for whether the C++ compiler supports C++98 (body of main)
|
||||
ac_cxx_conftest_cxx98_main='
|
||||
assert (argc);
|
||||
assert (! argv[0]);
|
||||
{
|
||||
test_exception_syntax ();
|
||||
test_template<double> tt (2.0);
|
||||
assert (tt.add (4) == 6.0);
|
||||
assert (true && !false);
|
||||
}
|
||||
'
|
||||
|
||||
# Test code for whether the C++ compiler supports C++11 (global declarations)
|
||||
ac_cxx_conftest_cxx11_globals='
|
||||
// Does the compiler advertise C++ 2011 conformance?
|
||||
#if !defined __cplusplus || __cplusplus < 201103L
|
||||
# error "Compiler does not advertise C++11 conformance"
|
||||
#endif
|
||||
|
||||
namespace cxx11test
|
||||
{
|
||||
constexpr int get_val() { return 20; }
|
||||
|
||||
struct testinit
|
||||
{
|
||||
int i;
|
||||
double d;
|
||||
};
|
||||
|
||||
class delegate
|
||||
{
|
||||
public:
|
||||
delegate(int n) : n(n) {}
|
||||
delegate(): delegate(2354) {}
|
||||
|
||||
virtual int getval() { return this->n; };
|
||||
protected:
|
||||
int n;
|
||||
};
|
||||
|
||||
class overridden : public delegate
|
||||
{
|
||||
public:
|
||||
overridden(int n): delegate(n) {}
|
||||
virtual int getval() override final { return this->n * 2; }
|
||||
};
|
||||
|
||||
class nocopy
|
||||
{
|
||||
public:
|
||||
nocopy(int i): i(i) {}
|
||||
nocopy() = default;
|
||||
nocopy(const nocopy&) = delete;
|
||||
nocopy & operator=(const nocopy&) = delete;
|
||||
private:
|
||||
int i;
|
||||
};
|
||||
|
||||
// for testing lambda expressions
|
||||
template <typename Ret, typename Fn> Ret eval(Fn f, Ret v)
|
||||
{
|
||||
return f(v);
|
||||
}
|
||||
|
||||
// for testing variadic templates and trailing return types
|
||||
template <typename V> auto sum(V first) -> V
|
||||
{
|
||||
return first;
|
||||
}
|
||||
template <typename V, typename... Args> auto sum(V first, Args... rest) -> V
|
||||
{
|
||||
return first + sum(rest...);
|
||||
}
|
||||
}
|
||||
'
|
||||
|
||||
# Test code for whether the C++ compiler supports C++11 (body of main)
|
||||
ac_cxx_conftest_cxx11_main='
|
||||
{
|
||||
// Test auto and decltype
|
||||
auto a1 = 6538;
|
||||
auto a2 = 48573953.4;
|
||||
auto a3 = "String literal";
|
||||
|
||||
int total = 0;
|
||||
for (auto i = a3; *i; ++i) { total += *i; }
|
||||
|
||||
decltype(a2) a4 = 34895.034;
|
||||
}
|
||||
{
|
||||
// Test constexpr
|
||||
short sa[cxx11test::get_val()] = { 0 };
|
||||
}
|
||||
{
|
||||
// Test initializer lists
|
||||
cxx11test::testinit il = { 4323, 435234.23544 };
|
||||
}
|
||||
{
|
||||
// Test range-based for
|
||||
int array[] = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3,
|
||||
14, 19, 17, 8, 6, 20, 16, 2, 11, 1};
|
||||
for (auto &x : array) { x += 23; }
|
||||
}
|
||||
{
|
||||
// Test lambda expressions
|
||||
using cxx11test::eval;
|
||||
assert (eval ([](int x) { return x*2; }, 21) == 42);
|
||||
double d = 2.0;
|
||||
assert (eval ([&](double x) { return d += x; }, 3.0) == 5.0);
|
||||
assert (d == 5.0);
|
||||
assert (eval ([=](double x) mutable { return d += x; }, 4.0) == 9.0);
|
||||
assert (d == 5.0);
|
||||
}
|
||||
{
|
||||
// Test use of variadic templates
|
||||
using cxx11test::sum;
|
||||
auto a = sum(1);
|
||||
auto b = sum(1, 2);
|
||||
auto c = sum(1.0, 2.0, 3.0);
|
||||
}
|
||||
{
|
||||
// Test constructor delegation
|
||||
cxx11test::delegate d1;
|
||||
cxx11test::delegate d2();
|
||||
cxx11test::delegate d3(45);
|
||||
}
|
||||
{
|
||||
// Test override and final
|
||||
cxx11test::overridden o1(55464);
|
||||
}
|
||||
{
|
||||
// Test nullptr
|
||||
char *c = nullptr;
|
||||
}
|
||||
{
|
||||
// Test template brackets
|
||||
test_template<::test_template<int>> v(test_template<int>(12));
|
||||
}
|
||||
{
|
||||
// Unicode literals
|
||||
char const *utf8 = u8"UTF-8 string \u2500";
|
||||
char16_t const *utf16 = u"UTF-8 string \u2500";
|
||||
char32_t const *utf32 = U"UTF-32 string \u2500";
|
||||
}
|
||||
'
|
||||
|
||||
# Test code for whether the C compiler supports C++11 (complete).
|
||||
ac_cxx_conftest_cxx11_program="${ac_cxx_conftest_cxx98_globals}
|
||||
${ac_cxx_conftest_cxx11_globals}
|
||||
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
int ok = 0;
|
||||
${ac_cxx_conftest_cxx98_main}
|
||||
${ac_cxx_conftest_cxx11_main}
|
||||
return ok;
|
||||
}
|
||||
"
|
||||
|
||||
# Test code for whether the C compiler supports C++98 (complete).
|
||||
ac_cxx_conftest_cxx98_program="${ac_cxx_conftest_cxx98_globals}
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
int ok = 0;
|
||||
${ac_cxx_conftest_cxx98_main}
|
||||
return ok;
|
||||
}
|
||||
"
|
||||
|
||||
|
||||
# Auxiliary files required by this configure script.
|
||||
ac_aux_files="install-sh config.guess config.sub"
|
||||
|
|
@ -5572,7 +5309,7 @@ fi
|
|||
have_libpcap=no
|
||||
;;
|
||||
*)
|
||||
_cppflags=$CXXFLAGS
|
||||
_cppflags=$CPPFLAGS
|
||||
_ldflags=$LDFLAGS
|
||||
|
||||
CPPFLAGS="-I$with_libpcap/include $CPPFLAGS"
|
||||
|
|
@ -5628,7 +5365,7 @@ fi
|
|||
|
||||
|
||||
LDFLAGS=$_ldflags
|
||||
CXXFLAGS=$_cppflags
|
||||
CPPFLAGS=$_cppflags
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
@ -5637,9 +5374,6 @@ fi
|
|||
|
||||
if test $have_libpcap = yes; then
|
||||
if test "${LIBPCAP_INC+set}" = "set"; then
|
||||
_cflags=$CXXFLAGS
|
||||
_ldflags=$LDFLAGS
|
||||
|
||||
CPPFLAGS="-I$LIBPCAP_INC $CPPFLAGS"
|
||||
LDFLAGS="-L$LIBPCAP_LIB $LDFLAGS"
|
||||
fi
|
||||
|
|
@ -6377,382 +6111,6 @@ else $as_nop
|
|||
enable_fuzzing=no
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
ac_ext=cpp
|
||||
ac_cpp='$CXXCPP $CPPFLAGS'
|
||||
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
|
||||
if test -z "$CXX"; then
|
||||
if test -n "$CCC"; then
|
||||
CXX=$CCC
|
||||
else
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++
|
||||
do
|
||||
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
printf %s "checking for $ac_word... " >&6; }
|
||||
if test ${ac_cv_prog_CXX+y}
|
||||
then :
|
||||
printf %s "(cached) " >&6
|
||||
else $as_nop
|
||||
if test -n "$CXX"; then
|
||||
ac_cv_prog_CXX="$CXX" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
case $as_dir in #(((
|
||||
'') as_dir=./ ;;
|
||||
*/) ;;
|
||||
*) as_dir=$as_dir/ ;;
|
||||
esac
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
|
||||
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
|
||||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
fi
|
||||
fi
|
||||
CXX=$ac_cv_prog_CXX
|
||||
if test -n "$CXX"; then
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
|
||||
printf "%s\n" "$CXX" >&6; }
|
||||
else
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
printf "%s\n" "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
test -n "$CXX" && break
|
||||
done
|
||||
fi
|
||||
if test -z "$CXX"; then
|
||||
ac_ct_CXX=$CXX
|
||||
for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
printf %s "checking for $ac_word... " >&6; }
|
||||
if test ${ac_cv_prog_ac_ct_CXX+y}
|
||||
then :
|
||||
printf %s "(cached) " >&6
|
||||
else $as_nop
|
||||
if test -n "$ac_ct_CXX"; then
|
||||
ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
case $as_dir in #(((
|
||||
'') as_dir=./ ;;
|
||||
*/) ;;
|
||||
*) as_dir=$as_dir/ ;;
|
||||
esac
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
|
||||
ac_cv_prog_ac_ct_CXX="$ac_prog"
|
||||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
fi
|
||||
fi
|
||||
ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
|
||||
if test -n "$ac_ct_CXX"; then
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
|
||||
printf "%s\n" "$ac_ct_CXX" >&6; }
|
||||
else
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
printf "%s\n" "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
test -n "$ac_ct_CXX" && break
|
||||
done
|
||||
|
||||
if test "x$ac_ct_CXX" = x; then
|
||||
CXX="g++"
|
||||
else
|
||||
case $cross_compiling:$ac_tool_warned in
|
||||
yes:)
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
||||
printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
||||
ac_tool_warned=yes ;;
|
||||
esac
|
||||
CXX=$ac_ct_CXX
|
||||
fi
|
||||
fi
|
||||
|
||||
fi
|
||||
fi
|
||||
# Provide some information about the compiler.
|
||||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
|
||||
set X $ac_compile
|
||||
ac_compiler=$2
|
||||
for ac_option in --version -v -V -qversion; do
|
||||
{ { ac_try="$ac_compiler $ac_option >&5"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
||||
printf "%s\n" "$ac_try_echo"; } >&5
|
||||
(eval "$ac_compiler $ac_option >&5") 2>conftest.err
|
||||
ac_status=$?
|
||||
if test -s conftest.err; then
|
||||
sed '10a\
|
||||
... rest of stderr output deleted ...
|
||||
10q' conftest.err >conftest.er1
|
||||
cat conftest.er1 >&5
|
||||
fi
|
||||
rm -f conftest.er1 conftest.err
|
||||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }
|
||||
done
|
||||
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5
|
||||
printf %s "checking whether the compiler supports GNU C++... " >&6; }
|
||||
if test ${ac_cv_cxx_compiler_gnu+y}
|
||||
then :
|
||||
printf %s "(cached) " >&6
|
||||
else $as_nop
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
#ifndef __GNUC__
|
||||
choke me
|
||||
#endif
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_cxx_try_compile "$LINENO"
|
||||
then :
|
||||
ac_compiler_gnu=yes
|
||||
else $as_nop
|
||||
ac_compiler_gnu=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
|
||||
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
|
||||
|
||||
fi
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
|
||||
printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; }
|
||||
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
|
||||
|
||||
if test $ac_compiler_gnu = yes; then
|
||||
GXX=yes
|
||||
else
|
||||
GXX=
|
||||
fi
|
||||
ac_test_CXXFLAGS=${CXXFLAGS+y}
|
||||
ac_save_CXXFLAGS=$CXXFLAGS
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
|
||||
printf %s "checking whether $CXX accepts -g... " >&6; }
|
||||
if test ${ac_cv_prog_cxx_g+y}
|
||||
then :
|
||||
printf %s "(cached) " >&6
|
||||
else $as_nop
|
||||
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
|
||||
ac_cxx_werror_flag=yes
|
||||
ac_cv_prog_cxx_g=no
|
||||
CXXFLAGS="-g"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_cxx_try_compile "$LINENO"
|
||||
then :
|
||||
ac_cv_prog_cxx_g=yes
|
||||
else $as_nop
|
||||
CXXFLAGS=""
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_cxx_try_compile "$LINENO"
|
||||
then :
|
||||
|
||||
else $as_nop
|
||||
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
|
||||
CXXFLAGS="-g"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_cxx_try_compile "$LINENO"
|
||||
then :
|
||||
ac_cv_prog_cxx_g=yes
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
|
||||
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
|
||||
fi
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
|
||||
printf "%s\n" "$ac_cv_prog_cxx_g" >&6; }
|
||||
if test $ac_test_CXXFLAGS; then
|
||||
CXXFLAGS=$ac_save_CXXFLAGS
|
||||
elif test $ac_cv_prog_cxx_g = yes; then
|
||||
if test "$GXX" = yes; then
|
||||
CXXFLAGS="-g -O2"
|
||||
else
|
||||
CXXFLAGS="-g"
|
||||
fi
|
||||
else
|
||||
if test "$GXX" = yes; then
|
||||
CXXFLAGS="-O2"
|
||||
else
|
||||
CXXFLAGS=
|
||||
fi
|
||||
fi
|
||||
ac_prog_cxx_stdcxx=no
|
||||
if test x$ac_prog_cxx_stdcxx = xno
|
||||
then :
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
|
||||
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
|
||||
if test ${ac_cv_prog_cxx_11+y}
|
||||
then :
|
||||
printf %s "(cached) " >&6
|
||||
else $as_nop
|
||||
ac_cv_prog_cxx_11=no
|
||||
ac_save_CXX=$CXX
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
$ac_cxx_conftest_cxx11_program
|
||||
_ACEOF
|
||||
for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA
|
||||
do
|
||||
CXX="$ac_save_CXX $ac_arg"
|
||||
if ac_fn_cxx_try_compile "$LINENO"
|
||||
then :
|
||||
ac_cv_prog_cxx_cxx11=$ac_arg
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.beam
|
||||
test "x$ac_cv_prog_cxx_cxx11" != "xno" && break
|
||||
done
|
||||
rm -f conftest.$ac_ext
|
||||
CXX=$ac_save_CXX
|
||||
fi
|
||||
|
||||
if test "x$ac_cv_prog_cxx_cxx11" = xno
|
||||
then :
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
|
||||
printf "%s\n" "unsupported" >&6; }
|
||||
else $as_nop
|
||||
if test "x$ac_cv_prog_cxx_cxx11" = x
|
||||
then :
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
|
||||
printf "%s\n" "none needed" >&6; }
|
||||
else $as_nop
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5
|
||||
printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; }
|
||||
CXX="$CXX $ac_cv_prog_cxx_cxx11"
|
||||
fi
|
||||
ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11
|
||||
ac_prog_cxx_stdcxx=cxx11
|
||||
fi
|
||||
fi
|
||||
if test x$ac_prog_cxx_stdcxx = xno
|
||||
then :
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
|
||||
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
|
||||
if test ${ac_cv_prog_cxx_98+y}
|
||||
then :
|
||||
printf %s "(cached) " >&6
|
||||
else $as_nop
|
||||
ac_cv_prog_cxx_98=no
|
||||
ac_save_CXX=$CXX
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
$ac_cxx_conftest_cxx98_program
|
||||
_ACEOF
|
||||
for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA
|
||||
do
|
||||
CXX="$ac_save_CXX $ac_arg"
|
||||
if ac_fn_cxx_try_compile "$LINENO"
|
||||
then :
|
||||
ac_cv_prog_cxx_cxx98=$ac_arg
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.beam
|
||||
test "x$ac_cv_prog_cxx_cxx98" != "xno" && break
|
||||
done
|
||||
rm -f conftest.$ac_ext
|
||||
CXX=$ac_save_CXX
|
||||
fi
|
||||
|
||||
if test "x$ac_cv_prog_cxx_cxx98" = xno
|
||||
then :
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
|
||||
printf "%s\n" "unsupported" >&6; }
|
||||
else $as_nop
|
||||
if test "x$ac_cv_prog_cxx_cxx98" = x
|
||||
then :
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
|
||||
printf "%s\n" "none needed" >&6; }
|
||||
else $as_nop
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5
|
||||
printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; }
|
||||
CXX="$CXX $ac_cv_prog_cxx_cxx98"
|
||||
fi
|
||||
ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98
|
||||
ac_prog_cxx_stdcxx=cxx98
|
||||
fi
|
||||
fi
|
||||
|
||||
ac_ext=cpp
|
||||
ac_cpp='$CXXCPP $CPPFLAGS'
|
||||
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
|
||||
|
||||
|
||||
if test "x$enable_fuzzing" = "xyes"
|
||||
then :
|
||||
|
||||
|
|
@ -6807,57 +6165,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
|
||||
ac_ext=cpp
|
||||
ac_cpp='$CXXCPP $CPPFLAGS'
|
||||
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
|
||||
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts -fsanitize=fuzzer-no-link,address,undefined -fno-omit-frame-pointer" >&5
|
||||
printf %s "checking whether C++ compiler accepts -fsanitize=fuzzer-no-link,address,undefined -fno-omit-frame-pointer... " >&6; }
|
||||
if test ${ax_cv_check_cxxflags__FUZZ_FLAGS+y}
|
||||
then :
|
||||
printf %s "(cached) " >&6
|
||||
else $as_nop
|
||||
|
||||
ax_check_save_flags=$CXXFLAGS
|
||||
CXXFLAGS="$CXXFLAGS -fsanitize=fuzzer-no-link,address,undefined -fno-omit-frame-pointer"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_cxx_try_compile "$LINENO"
|
||||
then :
|
||||
ax_cv_check_cxxflags__FUZZ_FLAGS=yes
|
||||
else $as_nop
|
||||
ax_cv_check_cxxflags__FUZZ_FLAGS=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
|
||||
CXXFLAGS=$ax_check_save_flags
|
||||
fi
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cxxflags__FUZZ_FLAGS" >&5
|
||||
printf "%s\n" "$ax_cv_check_cxxflags__FUZZ_FLAGS" >&6; }
|
||||
if test "x$ax_cv_check_cxxflags__FUZZ_FLAGS" = xyes
|
||||
then :
|
||||
CXXFLAGS="$CXXFLAGS -fsanitize=fuzzer-no-link,address,undefined -fno-omit-frame-pointer"
|
||||
else $as_nop
|
||||
as_fn_error $? "$CXX does not support fuzzing" "$LINENO" 5
|
||||
fi
|
||||
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
LDFLAGS="$LDFLAGS -fsanitize=address,undefined -fno-omit-frame-pointer"
|
||||
|
||||
printf "%s\n" "#define ENABLE_FUZZING 1" >>confdefs.h
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ AC_HELP_STRING([--with-libpcap=included], [Always use version included with Nmap
|
|||
have_libpcap=no
|
||||
;;
|
||||
*)
|
||||
_cppflags=$CXXFLAGS
|
||||
_cppflags=$CPPFLAGS
|
||||
_ldflags=$LDFLAGS
|
||||
|
||||
CPPFLAGS="-I$with_libpcap/include $CPPFLAGS"
|
||||
|
|
@ -151,16 +151,13 @@ AC_HELP_STRING([--with-libpcap=included], [Always use version included with Nmap
|
|||
LIBPCAP_LIB=$with_libpcap/lib])])
|
||||
|
||||
LDFLAGS=$_ldflags
|
||||
CXXFLAGS=$_cppflags
|
||||
CPPFLAGS=$_cppflags
|
||||
;;
|
||||
esac]
|
||||
)
|
||||
|
||||
if test $have_libpcap = yes; then
|
||||
if test "${LIBPCAP_INC+set}" = "set"; then
|
||||
_cflags=$CXXFLAGS
|
||||
_ldflags=$LDFLAGS
|
||||
|
||||
CPPFLAGS="-I$LIBPCAP_INC $CPPFLAGS"
|
||||
LDFLAGS="-L$LIBPCAP_LIB $LDFLAGS"
|
||||
fi
|
||||
|
|
@ -331,12 +328,6 @@ AS_IF([test "x$enable_fuzzing" = "xyes"], [
|
|||
[CFLAGS="$CFLAGS FUZZ_FLAGS"],
|
||||
[AC_MSG_ERROR([$CC does not support fuzzing])])
|
||||
AC_LANG_POP([C])
|
||||
|
||||
AC_LANG_PUSH([C++])
|
||||
AX_CHECK_COMPILE_FLAG([FUZZ_FLAGS],
|
||||
[CXXFLAGS="$CXXFLAGS FUZZ_FLAGS"],
|
||||
[AC_MSG_ERROR([$CXX does not support fuzzing])])
|
||||
AC_LANG_POP([C++])
|
||||
LDFLAGS="$LDFLAGS -fsanitize=address,undefined -fno-omit-frame-pointer"
|
||||
AC_DEFINE([ENABLE_FUZZING], [1], [Fuzzing harness enabled])
|
||||
])
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue