diff -upNr nessus-core.orig/acinclude.m4 nessus-core/acinclude.m4 --- nessus-core.orig/acinclude.m4 1970-01-01 01:00:00.000000000 +0100 +++ nessus-core/acinclude.m4 2003-09-03 10:42:06.000000000 +0200 @@ -0,0 +1,194 @@ +dnl @synopsis AC_PATH_GENERIC(LIBRARY [, MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl +dnl Runs a LIBRARY-config script and defines LIBRARY_CFLAGS and LIBRARY_LIBS +dnl +dnl The script must support `--cflags' and `--libs' args. +dnl If MINIMUM-VERSION is specified, the script must also support the +dnl `--version' arg. +dnl If the `--with-library-[exec-]prefix' arguments to ./configure are given, +dnl it must also support `--prefix' and `--exec-prefix'. +dnl (In other words, it must be like gtk-config.) +dnl +dnl For example: +dnl +dnl AC_PATH_GENERIC(Foo, 1.0.0) +dnl +dnl would run `foo-config --version' and check that it is at least 1.0.0 +dnl +dnl If so, the following would then be defined: +dnl +dnl FOO_CFLAGS to `foo-config --cflags` +dnl FOO_LIBS to `foo-config --libs` +dnl +dnl (shamelessly stolen from gtk.m4 and then hacked around a fair amount) +dnl +dnl @author Angus Lees +dnl @version $Id: acinclude.m4,v 1.2.4.3 2003/05/11 01:47:45 yoann Exp $ + +AC_DEFUN(AC_REAL_PATH_GENERIC, +[ +dnl +dnl we're going to need uppercase, lowercase and user-friendly versions of the +dnl string `LIBRARY' +pushdef([UP], translit([$1], [a-z], [A-Z]))dnl +pushdef([DOWN], translit([$1], [A-Z], [a-z]))dnl + +dnl +dnl Get the cflags and libraries from the LIBRARY-config script +dnl +AC_ARG_WITH(DOWN-prefix,[ --with-]DOWN[-prefix=PFX Prefix where $1 is installed (optional)], + DOWN[]_config_prefix="$withval", DOWN[]_config_prefix="") + +AC_ARG_WITH(DOWN-exec-prefix,[ --with-]DOWN[-exec-prefix=PFX Exec prefix where $1 is installed (optional)], + DOWN[]_config_exec_prefix="$withval", DOWN[]_config_exec_prefix="") + + custom_path="" + + + if test x$DOWN[]_config_exec_prefix != x ; then + + if test x$3 != x; then + DOWN[]_config_args="$DOWN[]_config_args --exec-prefix=$DOWN[]_config_exec_prefix" + fi + + if test x${UP[]_CONFIG+set} != xset ; then + custom_path=$DOWN[]_config_prefix/bin: + dnl UP[]_CONFIG=$DOWN[]_config_exec_prefix/bin/DOWN-config + fi + fi + + if test x$DOWN[]_config_prefix != x ; then + + if test x$3 != x; then + DOWN[]_config_args="$DOWN[]_config_args --prefix=$DOWN[]_config_prefix" + fi + + if test x${UP[]_CONFIG+set} != xset ; then + custom_path=$DOWN[]_config_prefix/bin: + dnl UP[]_CONFIG=$DOWN[]_config_prefix/bin/DOWN-config + fi + fi + + AC_PATH_PROG(UP[]_CONFIG, $2, no, $custom_path$PATH) + + ifelse([$6], , + AC_MSG_CHECKING(for $1), + AC_MSG_CHECKING(for $1 - version >= $6) + ) + no_[]DOWN="" + if test "$UP[]_CONFIG" = "no" ; then + no_[]DOWN=yes + else + UP[]_CFLAGS="`$UP[]_CONFIG $DOWN[]_config_args --$4`" + UP[]_LIBS="`$UP[]_CONFIG $DOWN[]_config_args --$5`" + + ifelse([$6], , ,[ + DOWN[]_config_major_version=`$UP[]_CONFIG $DOWN[]_config_args \ + --version | sed 's/[[^0-9]]*\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + DOWN[]_config_minor_version=`$UP[]_CONFIG $DOWN[]_config_args \ + --version | sed 's/[[^0-9]]*\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + DOWN[]_config_micro_version=`$UP[]_CONFIG $DOWN[]_config_args \ + --version | sed 's/[[^0-9]]*\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + DOWN[]_wanted_major_version="regexp($6, [\<\([0-9]*\)], [\1])" + DOWN[]_wanted_minor_version="regexp($6, [\<\([0-9]*\)\.\([0-9]*\)], [\2])" + DOWN[]_wanted_micro_version="regexp($6, [\<\([0-9]*\).\([0-9]*\).\([0-9]*\)], [\3])" + + # Compare wanted version to what config script returned. + # If I knew what library was being run, i'd probably also compile + # a test program at this point (which also extracted and tested + # the version in some library-specific way) + if test "$DOWN[]_config_major_version" -lt \ + "$DOWN[]_wanted_major_version" \ + -o \( "$DOWN[]_config_major_version" -eq \ + "$DOWN[]_wanted_major_version" \ + -a "$DOWN[]_config_minor_version" -lt \ + "$DOWN[]_wanted_minor_version" \) \ + -o \( "$DOWN[]_config_major_version" -eq \ + "$DOWN[]_wanted_major_version" \ + -a "$DOWN[]_config_minor_version" -eq \ + "$DOWN[]_wanted_minor_version" \ + -a "$DOWN[]_config_micro_version" -lt \ + "$DOWN[]_wanted_micro_version" \) ; then + # older version found + no_[]DOWN=yes + echo -n "*** An old version of $1 " + echo -n "($DOWN[]_config_major_version" + echo -n ".$DOWN[]_config_minor_version" + echo ".$DOWN[]_config_micro_version) was found." + echo -n "*** You need a version of $1 newer than " + echo -n "$DOWN[]_wanted_major_version" + echo -n ".$DOWN[]_wanted_minor_version" + echo ".$DOWN[]_wanted_micro_version." + echo "***" + echo "*** If you have already installed a sufficiently new version, this error" + echo "*** probably means that the wrong copy of the $2 shell script is" + echo "*** being found. The easiest way to fix this is to remove the old version" + echo "*** of $1, but you can also set the UP[]_CONFIG environment to point to the" + echo "*** correct copy of $2. (In this case, you will have to" + echo "*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf" + echo "*** so that the correct libraries are found at run-time)" + fi + ]) + fi + if test "x$no_[]DOWN" = x ; then + AC_MSG_RESULT(yes) + ifelse([$7], , :, [$7]) + else + AC_MSG_RESULT(no) + if test "$UP[]_CONFIG" = "no" ; then + echo "*** The $2 script installed by $1 could not be found" + echo "*** If $1 was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the UP[]_CONFIG environment variable to the" + echo "*** full path to $2." + fi + UP[]_CFLAGS="" + UP[]_LIBS="" + ifelse([$8], , :, [$8]) + fi + AC_SUBST(UP[]_CFLAGS) + AC_SUBST(UP[]_LIBS) + + popdef([UP]) + popdef([DOWN]) + +]) + + + +AC_DEFUN(AC_PATH_GENERIC, +[ + pushdef([DOWN], translit([$1], [A-Z], [a-z])) + AC_REAL_PATH_GENERIC($1, DOWN-config, prefix_supported, cflags, libs, $2, $3, $4) +]) + + +# +# Check for the given datatype +# +# AC_DATATYPE_GENERIC(headers, type, replacements) + +AC_DEFUN([AC_DATATYPE_GENERIC], +[ + +AC_CHECK_TYPE([$2], , [ + + AC_MSG_CHECKING([for $2 equivalent]) + s_replacement="" + + for t in $3; do + AC_TRY_COMPILE([$1], [$t type;], s_replacement="$t" break) + done + + if test "x$s_replacement" = x; then + AC_MSG_ERROR([Cannot find a type to use in place of $2]) + fi + + AC_MSG_RESULT($s_replacement) + + AC_DEFINE_UNQUOTED($2, [$s_replacement], + [type to use in place of $2 if not defined]) + +], [$1]) +]) + + diff -upNr nessus-core.orig/aclocal.m4 nessus-core/aclocal.m4 --- nessus-core.orig/aclocal.m4 2002-05-27 17:56:32.000000000 +0200 +++ nessus-core/aclocal.m4 2003-09-03 10:42:41.000000000 +0200 @@ -1,511 +1,208 @@ -dnl aclocal.m4 generated automatically by aclocal 1.2f +# generated automatically by aclocal 1.7.6 -*- Autoconf -*- -dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -dnl This Makefile.in is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A -dnl PARTICULAR PURPOSE. - -# Do all the work for Automake. This macro actually does too much -- -# some checks are only needed if your package does certain things. -# But this isn't really a big deal. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. -# serial 1 +dnl @synopsis AC_PATH_GENERIC(LIBRARY [, MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl +dnl Runs a LIBRARY-config script and defines LIBRARY_CFLAGS and LIBRARY_LIBS +dnl +dnl The script must support `--cflags' and `--libs' args. +dnl If MINIMUM-VERSION is specified, the script must also support the +dnl `--version' arg. +dnl If the `--with-library-[exec-]prefix' arguments to ./configure are given, +dnl it must also support `--prefix' and `--exec-prefix'. +dnl (In other words, it must be like gtk-config.) +dnl +dnl For example: +dnl +dnl AC_PATH_GENERIC(Foo, 1.0.0) +dnl +dnl would run `foo-config --version' and check that it is at least 1.0.0 +dnl +dnl If so, the following would then be defined: +dnl +dnl FOO_CFLAGS to `foo-config --cflags` +dnl FOO_LIBS to `foo-config --libs` +dnl +dnl (shamelessly stolen from gtk.m4 and then hacked around a fair amount) +dnl +dnl @author Angus Lees +dnl @version $Id: acinclude.m4,v 1.2.4.3 2003/05/11 01:47:45 yoann Exp $ -# -# Check to make sure that the build environment is sane. -# +AC_DEFUN(AC_REAL_PATH_GENERIC, +[ +dnl +dnl we're going to need uppercase, lowercase and user-friendly versions of the +dnl string `LIBRARY' +pushdef([UP], translit([$1], [a-z], [A-Z]))dnl +pushdef([DOWN], translit([$1], [A-Z], [a-z]))dnl -AC_DEFUN(AM_SANITY_CHECK, -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftestfile -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` - if test "[$]*" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftestfile` - fi - if test "[$]*" != "X $srcdir/configure conftestfile" \ - && test "[$]*" != "X conftestfile $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - - test "[$]2" = conftestfile - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -rm -f conftest* -AC_MSG_RESULT(yes)]) - -dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) -dnl The program must properly implement --version. -AC_DEFUN(AM_MISSING_PROG, -[AC_MSG_CHECKING(for working $2) -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if ($2 --version) < /dev/null > /dev/null 2>&1; then - $1=$2 - AC_MSG_RESULT(found) -else - $1="$3/missing $2" - AC_MSG_RESULT(missing) -fi -AC_SUBST($1)]) - -# Like AC_CONFIG_HEADER, but automatically create stamp file. - -AC_DEFUN(AM_CONFIG_HEADER, -[AC_PREREQ([2.12]) -AC_CONFIG_HEADER([$1]) -dnl When config.status generates a header, we must update the stamp-h file. -dnl This file resides in the same directory as the config header -dnl that is generated. We must strip everything past the first ":", -dnl and everything past the last "/". -AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl -ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>, -<>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>, -<>; do - case " <<$>>CONFIG_HEADERS " in - *" <<$>>am_file "*<<)>> - echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx - ;; - esac - am_indx=`expr "<<$>>am_indx" + 1` -done<<>>dnl>>) -changequote([,]))]) - - -# serial 24 AM_PROG_LIBTOOL -AC_DEFUN(AM_PROG_LIBTOOL, -[AC_REQUIRE([AM_ENABLE_SHARED])dnl -AC_REQUIRE([AM_ENABLE_STATIC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_PROG_RANLIB])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AM_PROG_LD])dnl -AC_REQUIRE([AM_PROG_NM])dnl -AC_REQUIRE([AC_PROG_LN_S])dnl -dnl -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl - -# Check for any special flags to pass to ltconfig. -libtool_flags= -test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" -test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" -test "$silent" = yes && libtool_flags="$libtool_flags --silent" -test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc" -test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld" - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case "$host" in -*-*-irix6*) - # Find out which ABI we are using. - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case "`/usr/bin/file conftest.o`" in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - rm -rf conftest* - ;; +dnl +dnl Get the cflags and libraries from the LIBRARY-config script +dnl +AC_ARG_WITH(DOWN-prefix,[ --with-]DOWN[-prefix=PFX Prefix where $1 is installed (optional)], + DOWN[]_config_prefix="$withval", DOWN[]_config_prefix="") -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - CFLAGS="$CFLAGS -belf" - ;; -esac - -# Actually configure libtool. ac_aux_dir is where install-sh is found. -CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ -LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ -${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ -$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ -|| AC_MSG_ERROR([libtool configure failed]) -]) +AC_ARG_WITH(DOWN-exec-prefix,[ --with-]DOWN[-exec-prefix=PFX Exec prefix where $1 is installed (optional)], + DOWN[]_config_exec_prefix="$withval", DOWN[]_config_exec_prefix="") -# AM_ENABLE_SHARED - implement the --enable-shared flag -# Usage: AM_ENABLE_SHARED[(DEFAULT)] -# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to -# `yes'. -AC_DEFUN(AM_ENABLE_SHARED, -[define([AM_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE(shared, -changequote(<<, >>)dnl -<< --enable-shared build shared libraries [default=>>AM_ENABLE_SHARED_DEFAULT] -changequote([, ])dnl -[ --enable-shared=PKGS only build shared libraries if the current package - appears as an element in the PKGS list], -[p=${PACKAGE-default} -case "$enableval" in -yes) enable_shared=yes ;; -no) enable_shared=no ;; -*) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac], -enable_shared=AM_ENABLE_SHARED_DEFAULT)dnl -]) + custom_path="" -# AM_DISABLE_SHARED - set the default shared flag to --disable-shared -AC_DEFUN(AM_DISABLE_SHARED, -[AM_ENABLE_SHARED(no)]) - -# AM_DISABLE_STATIC - set the default static flag to --disable-static -AC_DEFUN(AM_DISABLE_STATIC, -[AM_ENABLE_STATIC(no)]) - -# AM_ENABLE_STATIC - implement the --enable-static flag -# Usage: AM_ENABLE_STATIC[(DEFAULT)] -# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to -# `yes'. -AC_DEFUN(AM_ENABLE_STATIC, -[define([AM_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE(static, -changequote(<<, >>)dnl -<< --enable-static build static libraries [default=>>AM_ENABLE_STATIC_DEFAULT] -changequote([, ])dnl -[ --enable-static=PKGS only build shared libraries if the current package - appears as an element in the PKGS list], -[p=${PACKAGE-default} -case "$enableval" in -yes) enable_static=yes ;; -no) enable_static=no ;; -*) - enable_static=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac], -enable_static=AM_ENABLE_STATIC_DEFAULT)dnl -]) + if test x$DOWN[]_config_exec_prefix != x ; then -# AM_PROG_LD - find the path to the GNU or non-GNU linker -AC_DEFUN(AM_PROG_LD, -[AC_ARG_WITH(gnu-ld, -[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], -test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) -AC_REQUIRE([AC_PROG_CC]) -ac_prog=ld -if test "$ac_cv_prog_gcc" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by GCC]) - ac_prog=`($CC -print-prog-name=ld) 2>&5` - case "$ac_prog" in - # Accept absolute paths. - /* | [A-Za-z]:\\*) - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(ac_cv_path_LD, -[if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog"; then - ac_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then - test "$with_gnu_ld" != no && break - else - test "$with_gnu_ld" != yes && break - fi - fi - done - IFS="$ac_save_ifs" -else - ac_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -LD="$ac_cv_path_LD" -if test -n "$LD"; then - AC_MSG_RESULT($LD) -else - AC_MSG_RESULT(no) -fi -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -AC_SUBST(LD) -AM_PROG_LD_GNU -]) + if test x$3 != x; then + DOWN[]_config_args="$DOWN[]_config_args --exec-prefix=$DOWN[]_config_exec_prefix" + fi -AC_DEFUN(AM_PROG_LD_GNU, -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. -if $LD -v 2>&1 &5; then - ac_cv_prog_gnu_ld=yes -else - ac_cv_prog_gnu_ld=no -fi]) -]) + if test x${UP[]_CONFIG+set} != xset ; then + custom_path=$DOWN[]_config_prefix/bin: + dnl UP[]_CONFIG=$DOWN[]_config_exec_prefix/bin/DOWN-config + fi + fi -# AM_PROG_NM - find the path to a BSD-compatible name lister -AC_DEFUN(AM_PROG_NM, -[AC_MSG_CHECKING([for BSD-compatible nm]) -AC_CACHE_VAL(ac_cv_path_NM, -[case "$NM" in -/* | [A-Za-z]:\\*) - ac_cv_path_NM="$NM" # Let the user override the test with a path. - ;; -*) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/nm; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - ac_cv_path_NM="$ac_dir/nm -B" - elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - ac_cv_path_NM="$ac_dir/nm -p" - else - ac_cv_path_NM="$ac_dir/nm" - fi - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm - ;; -esac]) -NM="$ac_cv_path_NM" -AC_MSG_RESULT([$NM]) -AC_SUBST(NM) -]) + if test x$DOWN[]_config_prefix != x ; then -# Add --enable-maintainer-mode option to configure. -# From Jim Meyering + if test x$3 != x; then + DOWN[]_config_args="$DOWN[]_config_args --prefix=$DOWN[]_config_prefix" + fi + + if test x${UP[]_CONFIG+set} != xset ; then + custom_path=$DOWN[]_config_prefix/bin: + dnl UP[]_CONFIG=$DOWN[]_config_prefix/bin/DOWN-config + fi + fi -# serial 1 + AC_PATH_PROG(UP[]_CONFIG, $2, no, $custom_path$PATH) -AC_DEFUN(AM_MAINTAINER_MODE, -[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode is disabled by default - AC_ARG_ENABLE(maintainer-mode, -[ --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - USE_MAINTAINER_MODE=$enableval, - USE_MAINTAINER_MODE=no) - AC_MSG_RESULT($USE_MAINTAINER_MODE) - if test $USE_MAINTAINER_MODE = yes; then - MAINT= - else - MAINT='#M#' - fi - AC_SUBST(MAINT)dnl -] -) - -# Configure paths for GTK+ -# Owen Taylor 97-11-3 - -dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS -dnl -AC_DEFUN(AM_PATH_GTK, -[dnl -dnl Get the cflags and libraries from the gtk-config script -dnl - AC_PATH_PROG(GTK_CONFIG, gtk-config, no) - min_gtk_version=ifelse([$1], ,0.99.7,$1) - AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) - no_gtk="" - if test "$GTK_CONFIG" != "no" ; then - GTK_CFLAGS=`$GTK_CONFIG --cflags` - GTK_LIBS=`$GTK_CONFIG --libs` - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" -dnl -dnl Now check if the installed GTK is sufficiently new. (Also sanity -dnl checks the results of gtk-config to some extent -dnl - AC_TRY_RUN([ -#include -#include - -int -main () -{ - int major, minor, micro; - - if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - return !((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))); -} -],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" + ifelse([$6], , + AC_MSG_CHECKING(for $1), + AC_MSG_CHECKING(for $1 - version >= $6) + ) + no_[]DOWN="" + if test "$UP[]_CONFIG" = "no" ; then + no_[]DOWN=yes else - no_gtk=yes + UP[]_CFLAGS="`$UP[]_CONFIG $DOWN[]_config_args --$4`" + UP[]_LIBS="`$UP[]_CONFIG $DOWN[]_config_args --$5`" + + ifelse([$6], , ,[ + DOWN[]_config_major_version=`$UP[]_CONFIG $DOWN[]_config_args \ + --version | sed 's/[[^0-9]]*\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + DOWN[]_config_minor_version=`$UP[]_CONFIG $DOWN[]_config_args \ + --version | sed 's/[[^0-9]]*\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + DOWN[]_config_micro_version=`$UP[]_CONFIG $DOWN[]_config_args \ + --version | sed 's/[[^0-9]]*\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + DOWN[]_wanted_major_version="regexp($6, [\<\([0-9]*\)], [\1])" + DOWN[]_wanted_minor_version="regexp($6, [\<\([0-9]*\)\.\([0-9]*\)], [\2])" + DOWN[]_wanted_micro_version="regexp($6, [\<\([0-9]*\).\([0-9]*\).\([0-9]*\)], [\3])" + + # Compare wanted version to what config script returned. + # If I knew what library was being run, i'd probably also compile + # a test program at this point (which also extracted and tested + # the version in some library-specific way) + if test "$DOWN[]_config_major_version" -lt \ + "$DOWN[]_wanted_major_version" \ + -o \( "$DOWN[]_config_major_version" -eq \ + "$DOWN[]_wanted_major_version" \ + -a "$DOWN[]_config_minor_version" -lt \ + "$DOWN[]_wanted_minor_version" \) \ + -o \( "$DOWN[]_config_major_version" -eq \ + "$DOWN[]_wanted_major_version" \ + -a "$DOWN[]_config_minor_version" -eq \ + "$DOWN[]_wanted_minor_version" \ + -a "$DOWN[]_config_micro_version" -lt \ + "$DOWN[]_wanted_micro_version" \) ; then + # older version found + no_[]DOWN=yes + echo -n "*** An old version of $1 " + echo -n "($DOWN[]_config_major_version" + echo -n ".$DOWN[]_config_minor_version" + echo ".$DOWN[]_config_micro_version) was found." + echo -n "*** You need a version of $1 newer than " + echo -n "$DOWN[]_wanted_major_version" + echo -n ".$DOWN[]_wanted_minor_version" + echo ".$DOWN[]_wanted_micro_version." + echo "***" + echo "*** If you have already installed a sufficiently new version, this error" + echo "*** probably means that the wrong copy of the $2 shell script is" + echo "*** being found. The easiest way to fix this is to remove the old version" + echo "*** of $1, but you can also set the UP[]_CONFIG environment to point to the" + echo "*** correct copy of $2. (In this case, you will have to" + echo "*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf" + echo "*** so that the correct libraries are found at run-time)" + fi + ]) fi - if test "x$no_gtk" = x ; then + if test "x$no_[]DOWN" = x ; then AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) + ifelse([$7], , :, [$7]) else AC_MSG_RESULT(no) - GTK_CFLAGS="" - GTK_LIBS="" - ifelse([$3], , :, [$3]) + if test "$UP[]_CONFIG" = "no" ; then + echo "*** The $2 script installed by $1 could not be found" + echo "*** If $1 was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the UP[]_CONFIG environment variable to the" + echo "*** full path to $2." + fi + UP[]_CFLAGS="" + UP[]_LIBS="" + ifelse([$8], , :, [$8]) fi - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) + AC_SUBST(UP[]_CFLAGS) + AC_SUBST(UP[]_LIBS) + + popdef([UP]) + popdef([DOWN]) + ]) -# serial 1 -# @defmac AC_PROG_CC_STDC -# @maindex PROG_CC_STDC -# @ovindex CC -# If the C compiler in not in ANSI C mode by default, try to add an option -# to output variable @code{CC} to make it so. This macro tries various -# options that select ANSI C on some system or another. It considers the -# compiler to be in ANSI C mode if it handles function prototypes correctly. -# -# If you use this macro, you should check after calling it whether the C -# compiler has been set to accept ANSI C; if not, the shell variable -# @code{am_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source -# code in ANSI C, you can make an un-ANSIfied copy of it by using the -# program @code{ansi2knr}, which comes with Ghostscript. -# @end defmac - -AC_DEFUN(AM_PROG_CC_STDC, -[AC_REQUIRE([AC_PROG_CC]) -AC_BEFORE([$0], [AC_C_INLINE]) -AC_BEFORE([$0], [AC_C_CONST]) -dnl Force this before AC_PROG_CPP. Some cpp's, eg on HPUX, require -dnl a magic option to avoid problems with ANSI preprocessor commands -dnl like #elif. -dnl FIXME: can't do this because then AC_AIX won't work due to a -dnl circular dependency. -dnl AC_BEFORE([$0], [AC_PROG_CPP]) -AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C) -AC_CACHE_VAL(am_cv_prog_cc_stdc, -[am_cv_prog_cc_stdc=no -ac_save_CC="$CC" -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - AC_TRY_COMPILE( -[#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -], [ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; -], -[am_cv_prog_cc_stdc="$ac_arg"; break]) -done -CC="$ac_save_CC" +AC_DEFUN(AC_PATH_GENERIC, +[ + pushdef([DOWN], translit([$1], [A-Z], [a-z])) + AC_REAL_PATH_GENERIC($1, DOWN-config, prefix_supported, cflags, libs, $2, $3, $4) ]) -if test -z "$am_cv_prog_cc_stdc"; then - AC_MSG_RESULT([none needed]) -else - AC_MSG_RESULT($am_cv_prog_cc_stdc) -fi -case "x$am_cv_prog_cc_stdc" in - x|xno) ;; - *) CC="$CC $am_cv_prog_cc_stdc" ;; -esac + + +# +# Check for the given datatype +# +# AC_DATATYPE_GENERIC(headers, type, replacements) + +AC_DEFUN([AC_DATATYPE_GENERIC], +[ + +AC_CHECK_TYPE([$2], , [ + + AC_MSG_CHECKING([for $2 equivalent]) + s_replacement="" + + for t in $3; do + AC_TRY_COMPILE([$1], [$t type;], s_replacement="$t" break) + done + + if test "x$s_replacement" = x; then + AC_MSG_ERROR([Cannot find a type to use in place of $2]) + fi + + AC_MSG_RESULT($s_replacement) + + AC_DEFINE_UNQUOTED($2, [$s_replacement], + [type to use in place of $2 if not defined]) + +], [$1]) ]) + + diff -upNr nessus-core.orig/configure nessus-core/configure --- nessus-core.orig/configure 2003-06-10 16:23:15.000000000 +0200 +++ nessus-core/configure 2003-09-03 10:52:59.000000000 +0200 @@ -11,6 +11,10 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: +ac_help="$ac_help + --with-libprelude-prefix=PFX Prefix where libprelude is installed (optional)" +ac_help="$ac_help + --with-libprelude-exec-prefix=PFX Exec prefix where libprelude is installed (optional)" ac_default_prefix="/usr/local" ac_help="$ac_help --enable-release set the compiler flags to -O6" @@ -50,7 +54,6 @@ program_suffix=NONE program_transform_name=s,x,x, silent= site= -sitefile= srcdir= target=NONE verbose= @@ -165,7 +168,6 @@ Configuration: --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages - --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -336,11 +338,6 @@ EOF -site=* | --site=* | --sit=*) site="$ac_optarg" ;; - -site-file | --site-file | --site-fil | --site-fi | --site-f) - ac_prev=sitefile ;; - -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) - sitefile="$ac_optarg" ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -506,16 +503,12 @@ fi srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -if test -z "$sitefile"; then - if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -else - CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -554,7 +547,178 @@ else fi -# From configure.in Revision: 1.116 +# From configure.in Revision: 1.117 + + + + + +# Check whether --with-libprelude-prefix or --without-libprelude-prefix was given. +if test "${with_libprelude_prefix+set}" = set; then + withval="$with_libprelude_prefix" + libprelude_config_prefix="$withval" +else + libprelude_config_prefix="" +fi + + +# Check whether --with-libprelude-exec-prefix or --without-libprelude-exec-prefix was given. +if test "${with_libprelude_exec_prefix+set}" = set; then + withval="$with_libprelude_exec_prefix" + libprelude_config_exec_prefix="$withval" +else + libprelude_config_exec_prefix="" +fi + + + custom_path="" + + + if test x$libprelude_config_exec_prefix != x ; then + + if test xprefix_supported != x; then + libprelude_config_args="$libprelude_config_args --exec-prefix=$libprelude_config_exec_prefix" + fi + + if test x${LIBPRELUDE_CONFIG+set} != xset ; then + custom_path=$libprelude_config_prefix/bin: + fi + fi + + if test x$libprelude_config_prefix != x ; then + + if test xprefix_supported != x; then + libprelude_config_args="$libprelude_config_args --prefix=$libprelude_config_prefix" + fi + + if test x${LIBPRELUDE_CONFIG+set} != xset ; then + custom_path=$libprelude_config_prefix/bin: + fi + fi + + # Extract the first word of "libprelude-config", so it can be a program name with args. +set dummy libprelude-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:603: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_LIBPRELUDE_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$LIBPRELUDE_CONFIG" in + /*) + ac_cv_path_LIBPRELUDE_CONFIG="$LIBPRELUDE_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_LIBPRELUDE_CONFIG="$LIBPRELUDE_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$custom_path$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_LIBPRELUDE_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_LIBPRELUDE_CONFIG" && ac_cv_path_LIBPRELUDE_CONFIG="no" + ;; +esac +fi +LIBPRELUDE_CONFIG="$ac_cv_path_LIBPRELUDE_CONFIG" +if test -n "$LIBPRELUDE_CONFIG"; then + echo "$ac_t""$LIBPRELUDE_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + + echo $ac_n "checking for libprelude - version >= 0.8.6""... $ac_c" 1>&6 +echo "configure:638: checking for libprelude - version >= 0.8.6" >&5 + + no_libprelude="" + if test "$LIBPRELUDE_CONFIG" = "no" ; then + no_libprelude=yes + else + LIBPRELUDE_CFLAGS="`$LIBPRELUDE_CONFIG $libprelude_config_args --cflags`" + LIBPRELUDE_LIBS="`$LIBPRELUDE_CONFIG $libprelude_config_args --libs`" + + + libprelude_config_major_version=`$LIBPRELUDE_CONFIG $libprelude_config_args \ + --version | sed 's/[^0-9]*\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` + libprelude_config_minor_version=`$LIBPRELUDE_CONFIG $libprelude_config_args \ + --version | sed 's/[^0-9]*\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` + libprelude_config_micro_version=`$LIBPRELUDE_CONFIG $libprelude_config_args \ + --version | sed 's/[^0-9]*\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` + libprelude_wanted_major_version="0" + libprelude_wanted_minor_version="8" + libprelude_wanted_micro_version="6" + + # Compare wanted version to what config script returned. + # If I knew what library was being run, i'd probably also compile + # a test program at this point (which also extracted and tested + # the version in some library-specific way) + if test "$libprelude_config_major_version" -lt \ + "$libprelude_wanted_major_version" \ + -o \( "$libprelude_config_major_version" -eq \ + "$libprelude_wanted_major_version" \ + -a "$libprelude_config_minor_version" -lt \ + "$libprelude_wanted_minor_version" \) \ + -o \( "$libprelude_config_major_version" -eq \ + "$libprelude_wanted_major_version" \ + -a "$libprelude_config_minor_version" -eq \ + "$libprelude_wanted_minor_version" \ + -a "$libprelude_config_micro_version" -lt \ + "$libprelude_wanted_micro_version" \) ; then + # older version found + no_libprelude=yes + echo -n "*** An old version of libprelude " + echo -n "($libprelude_config_major_version" + echo -n ".$libprelude_config_minor_version" + echo ".$libprelude_config_micro_version) was found." + echo -n "*** You need a version of libprelude newer than " + echo -n "$libprelude_wanted_major_version" + echo -n ".$libprelude_wanted_minor_version" + echo ".$libprelude_wanted_micro_version." + echo "***" + echo "*** If you have already installed a sufficiently new version, this error" + echo "*** probably means that the wrong copy of the libprelude-config shell script is" + echo "*** being found. The easiest way to fix this is to remove the old version" + echo "*** of libprelude, but you can also set the LIBPRELUDE_CONFIG environment to point to the" + echo "*** correct copy of libprelude-config. (In this case, you will have to" + echo "*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf" + echo "*** so that the correct libraries are found at run-time)" + fi + + fi + if test "x$no_libprelude" = x ; then + echo "$ac_t""yes" 1>&6 + : + else + echo "$ac_t""no" 1>&6 + if test "$LIBPRELUDE_CONFIG" = "no" ; then + echo "*** The libprelude-config script installed by libprelude could not be found" + echo "*** If libprelude was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the LIBPRELUDE_CONFIG environment variable to the" + echo "*** full path to libprelude-config." + fi + LIBPRELUDE_CFLAGS="" + LIBPRELUDE_LIBS="" + { echo "configure: error: Cannot find libprelude: Is libprelude-config in the path?" 1>&2; exit 1; } + fi + + + + + + + + + + + + + save_IFS="${IFS}" IFS=. read NESSUS_MAJOR NESSUS_MINOR NESSUS_PATCH &6 -echo "configure:598: checking host system type" >&5 +echo "configure:762: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -625,7 +789,7 @@ cross_compiling=$ac_cv_prog_cc_cross # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:629: checking for $ac_word" >&5 +echo "configure:793: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -655,7 +819,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:659: checking for $ac_word" >&5 +echo "configure:823: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -706,7 +870,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:710: checking for $ac_word" >&5 +echo "configure:874: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -738,7 +902,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:742: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:906: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -749,12 +913,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 753 "configure" +#line 917 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -780,12 +944,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:784: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:948: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:789: checking whether we are using GNU C" >&5 +echo "configure:953: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -794,7 +958,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:798: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:962: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -813,7 +977,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:817: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:981: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -845,7 +1009,7 @@ else fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:849: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1013: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -883,7 +1047,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:887: checking for a BSD compatible install" >&5 +echo "configure:1051: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1052,7 +1216,7 @@ fi # Extract the first word of "nessus-config", so it can be a program name with args. set dummy nessus-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1056: checking for $ac_word" >&5 +echo "configure:1220: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_NESSUSCONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1094,7 +1258,7 @@ test "x$NESSUSCONFIG" = x && { echo "con # Extract the first word of "nasl-config", so it can be a program name with args. set dummy nasl-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1098: checking for $ac_word" >&5 +echo "configure:1262: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_NASLCONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1165,7 +1329,7 @@ saveCFLAGS="$CFLAGS" CFLAGS="$CFLAGS $NESSCFLAGS $NASLCFLAGS" echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1169: checking how to run the C preprocessor" >&5 +echo "configure:1333: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1180,13 +1344,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1197,13 +1361,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1214,13 +1378,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1245,12 +1409,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1249: checking for ANSI C header files" >&5 +echo "configure:1413: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1258,7 +1422,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1426: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1275,7 +1439,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1293,7 +1457,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1314,7 +1478,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1325,7 +1489,7 @@ if (XOR (islower (i), ISLOWER (i)) || to exit (0); } EOF -if { (eval echo configure:1329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1349,12 +1513,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:1353: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:1517: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1370,7 +1534,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:1374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -1391,12 +1555,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:1395: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:1559: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1405,7 +1569,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -1430,12 +1594,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/di do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:1434: checking for $ac_hdr that defines DIR" >&5 +echo "configure:1598: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -1443,7 +1607,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:1447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -1468,7 +1632,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:1472: checking for opendir in -ldir" >&5 +echo "configure:1636: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1476,7 +1640,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1509,7 +1673,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:1513: checking for opendir in -lx" >&5 +echo "configure:1677: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1517,7 +1681,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1554,17 +1718,17 @@ for ac_hdr in unistd.h getopt.h string.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1558: checking for $ac_hdr" >&5 +echo "configure:1722: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1568: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1732: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1594,17 +1758,17 @@ for ac_hdr in sys/param.h netinet/tcpip. do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1598: checking for $ac_hdr" >&5 +echo "configure:1762: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1772: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1634,17 +1798,17 @@ for ac_hdr in netinet/ip_udp.h netinet/p do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1638: checking for $ac_hdr" >&5 +echo "configure:1802: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1648: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1674,17 +1838,17 @@ for ac_hdr in rpc/rpc.h netinet/udp.h dl do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1678: checking for $ac_hdr" >&5 +echo "configure:1842: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1688: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1714,17 +1878,17 @@ for ac_hdr in sys/types.h stdlib.h stdio do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1718: checking for $ac_hdr" >&5 +echo "configure:1882: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1728: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1754,17 +1918,17 @@ for ac_hdr in assert.h netdb.h netinet/i do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1758: checking for $ac_hdr" >&5 +echo "configure:1922: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1768: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1932: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1794,17 +1958,17 @@ for ac_hdr in poll.h sys/poll.h netinet/ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1798: checking for $ac_hdr" >&5 +echo "configure:1962: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1834,17 +1998,17 @@ for ac_hdr in sys/stat.h stat.h net/if.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1838: checking for $ac_hdr" >&5 +echo "configure:2002: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1848: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1874,17 +2038,17 @@ for ac_hdr in pty.h termio.h termios.h s do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1878: checking for $ac_hdr" >&5 +echo "configure:2042: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1888: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1932,17 +2096,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1936: checking for $ac_hdr" >&5 +echo "configure:2100: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1946: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1975,19 +2139,19 @@ esac # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:1979: checking for working alloca.h" >&5 +echo "configure:2143: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -2008,12 +2172,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:2012: checking for alloca" >&5 +echo "configure:2176: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -2073,12 +2237,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:2077: checking whether alloca needs Cray hooks" >&5 +echo "configure:2241: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2107: checking for $ac_func" >&5 +echo "configure:2271: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2158,7 +2322,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:2162: checking stack direction for C alloca" >&5 +echo "configure:2326: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2166,7 +2330,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -2207,7 +2371,7 @@ EOF fi echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6 -echo "configure:2211: checking for wait3 that fills in rusage" >&5 +echo "configure:2375: checking for wait3 that fills in rusage" >&5 if eval "test \"`echo '$''{'ac_cv_func_wait3_rusage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2215,7 +2379,7 @@ else ac_cv_func_wait3_rusage=no else cat > conftest.$ac_ext < #include @@ -2246,7 +2410,7 @@ main() { } } EOF -if { (eval echo configure:2250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_wait3_rusage=yes else @@ -2271,12 +2435,12 @@ fi for ac_func in waitpid wait4 mmap atexit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2275: checking for $ac_func" >&5 +echo "configure:2439: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2326,12 +2490,12 @@ done for ac_func in lstat memmove gettimeofday gethrtime getrusage rand do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2330: checking for $ac_func" >&5 +echo "configure:2494: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2381,12 +2545,12 @@ done for ac_func in strchr memcpy select poll do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2385: checking for $ac_func" >&5 +echo "configure:2549: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2434,12 +2598,12 @@ fi done echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:2438: checking for vsnprintf" >&5 +echo "configure:2602: checking for vsnprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vsnprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vsnprintf=yes" else @@ -2487,12 +2651,12 @@ fi for ac_func in bzero bcopy setsid rint mkstemp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2491: checking for $ac_func" >&5 +echo "configure:2655: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2542,12 +2706,12 @@ done for ac_func in addr2ascii inet_neta setproctitle _exit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2546: checking for $ac_func" >&5 +echo "configure:2710: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2596,7 +2760,7 @@ done echo $ac_n "checking size of unsigned int""... $ac_c" 1>&6 -echo "configure:2600: checking size of unsigned int" >&5 +echo "configure:2764: checking size of unsigned int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2604,9 +2768,10 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < +#include main() { FILE *f=fopen("conftestval", "w"); @@ -2615,7 +2780,7 @@ main() exit(0); } EOF -if { (eval echo configure:2619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_int=`cat conftestval` else @@ -2635,7 +2800,7 @@ EOF echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6 -echo "configure:2639: checking size of unsigned long" >&5 +echo "configure:2804: checking size of unsigned long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2643,9 +2808,10 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < +#include main() { FILE *f=fopen("conftestval", "w"); @@ -2654,7 +2820,7 @@ main() exit(0); } EOF -if { (eval echo configure:2658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_long=`cat conftestval` else @@ -2674,14 +2840,14 @@ EOF echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:2678: checking whether byte ordering is bigendian" >&5 +echo "configure:2844: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -2692,11 +2858,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:2696: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -2707,7 +2873,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:2711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -2727,7 +2893,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -2764,12 +2930,12 @@ EOF fi echo $ac_n "checking for time_t""... $ac_c" 1>&6 -echo "configure:2768: checking for time_t" >&5 +echo "configure:2934: checking for time_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_time_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2797,12 +2963,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:2801: checking for pid_t" >&5 +echo "configure:2967: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2830,12 +2996,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2834: checking for size_t" >&5 +echo "configure:3000: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2863,12 +3029,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:2867: checking for uid_t in sys/types.h" >&5 +echo "configure:3033: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -2898,9 +3064,9 @@ fi echo $ac_n "checking for struct timeval""... $ac_c" 1>&6 -echo "configure:2902: checking for struct timeval" >&5 +echo "configure:3068: checking for struct timeval" >&5 cat > conftest.$ac_ext < @@ -2916,7 +3082,7 @@ int main() { static struct timeval x; x.tv_sec = x.tv_usec; ; return 0; } EOF -if { (eval echo configure:2920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 HAVE_TIMEVAL=yes @@ -2936,9 +3102,9 @@ rm -f conftest* if test "x$HAVE_TIMEVAL" = xyes; then echo $ac_n "checking whether gettimeofday can't accept two arguments""... $ac_c" 1>&6 -echo "configure:2940: checking whether gettimeofday can't accept two arguments" >&5 +echo "configure:3106: checking whether gettimeofday can't accept two arguments" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -2990,12 +3156,12 @@ test -f /etc/redhat-release && test -z "$BROKEN_REGEXP" && { echo $ac_n "checking for a working regexp implementation""... $ac_c" 1>&6 -echo "configure:2994: checking for a working regexp implementation" >&5 +echo "configure:3160: checking for a working regexp implementation" >&5 if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -3025,7 +3191,7 @@ int main() } EOF -if { (eval echo configure:3029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define HAVE_REGEX_SUPPORT 1 @@ -3043,9 +3209,9 @@ fi } echo $ac_n "checking struct ip contains ip_csum""... $ac_c" 1>&6 -echo "configure:3047: checking struct ip contains ip_csum" >&5 +echo "configure:3213: checking struct ip contains ip_csum" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_STRUCT_IP_CSUM 1 @@ -3078,9 +3244,9 @@ fi rm -f conftest* echo $ac_n "checking struct ip""... $ac_c" 1>&6 -echo "configure:3082: checking struct ip" >&5 +echo "configure:3248: checking struct ip" >&5 cat > conftest.$ac_ext < #include @@ -3090,7 +3256,7 @@ int main() { struct ip ip; ; return 0; } EOF -if { (eval echo configure:3094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3260: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_STRUCT_IP 1 @@ -3105,9 +3271,9 @@ fi rm -f conftest* echo $ac_n "checking struct icmp""... $ac_c" 1>&6 -echo "configure:3109: checking struct icmp" >&5 +echo "configure:3275: checking struct icmp" >&5 cat > conftest.$ac_ext < #include @@ -3118,7 +3284,7 @@ int main() { struct icmp icmp; ; return 0; } EOF -if { (eval echo configure:3122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_STRUCT_ICMP 1 @@ -3133,9 +3299,9 @@ fi rm -f conftest* echo $ac_n "checking struct udphdr""... $ac_c" 1>&6 -echo "configure:3137: checking struct udphdr" >&5 +echo "configure:3303: checking struct udphdr" >&5 cat > conftest.$ac_ext < #include @@ -3146,7 +3312,7 @@ int main() { struct udphdr udp; ; return 0; } EOF -if { (eval echo configure:3150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3316: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_STRUCT_UDPHDR 1 @@ -3161,9 +3327,9 @@ fi rm -f conftest* echo $ac_n "checking BSD struct udphdr""... $ac_c" 1>&6 -echo "configure:3165: checking BSD struct udphdr" >&5 +echo "configure:3331: checking BSD struct udphdr" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_BSD_STRUCT_UDPHDR 1 @@ -3195,9 +3361,9 @@ rm -f conftest* echo $ac_n "checking struct tcphdr""... $ac_c" 1>&6 -echo "configure:3199: checking struct tcphdr" >&5 +echo "configure:3365: checking struct tcphdr" >&5 cat > conftest.$ac_ext < #include @@ -3208,7 +3374,7 @@ int main() { struct tcphdr tcp; ; return 0; } EOF -if { (eval echo configure:3212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_STRUCT_TCPHDR 1 @@ -3223,9 +3389,9 @@ fi rm -f conftest* echo $ac_n "checking struct tcphdr has th_off""... $ac_c" 1>&6 -echo "configure:3227: checking struct tcphdr has th_off" >&5 +echo "configure:3393: checking struct tcphdr has th_off" >&5 cat > conftest.$ac_ext < #ifdef __linux__ @@ -3239,7 +3405,7 @@ int main() { struct tcphdr tcp;tcp.th_off = 0; ; return 0; } EOF -if { (eval echo configure:3243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_TCPHDR_TH_OFF 1 @@ -3254,9 +3420,9 @@ fi rm -f conftest* echo $ac_n "checking struct tcphdr has th_x2_off""... $ac_c" 1>&6 -echo "configure:3258: checking struct tcphdr has th_x2_off" >&5 +echo "configure:3424: checking struct tcphdr has th_x2_off" >&5 cat > conftest.$ac_ext < #ifdef __linux__ @@ -3270,7 +3436,7 @@ int main() { struct tcphdr tcp;tcp.th_x2_off = 0; ; return 0; } EOF -if { (eval echo configure:3274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_TCPHDR_TH_X2_OFF 1 @@ -3291,7 +3457,7 @@ rm -f conftest* # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:3295: checking for X" >&5 +echo "configure:3461: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -3353,12 +3519,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3528: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3427,14 +3593,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -3540,17 +3706,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:3544: checking whether -R must be followed by a space" >&5 +echo "configure:3710: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -3566,14 +3732,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -3605,7 +3771,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:3609: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:3775: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3613,7 +3779,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3646,7 +3812,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:3650: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:3816: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3654,7 +3820,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3694,12 +3860,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:3698: checking for gethostbyname" >&5 +echo "configure:3864: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -3743,7 +3909,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:3747: checking for gethostbyname in -lnsl" >&5 +echo "configure:3913: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3751,7 +3917,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3792,12 +3958,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:3796: checking for connect" >&5 +echo "configure:3962: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -3841,7 +4007,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:3845: checking for connect in -lsocket" >&5 +echo "configure:4011: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3849,7 +4015,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3884,12 +4050,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:3888: checking for remove" >&5 +echo "configure:4054: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -3933,7 +4099,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:3937: checking for remove in -lposix" >&5 +echo "configure:4103: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3941,7 +4107,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3976,12 +4142,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:3980: checking for shmat" >&5 +echo "configure:4146: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -4025,7 +4191,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:4029: checking for shmat in -lipc" >&5 +echo "configure:4195: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4033,7 +4199,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4077,7 +4243,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:4081: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:4247: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4085,7 +4251,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4122,7 +4288,7 @@ fi PWDD=`pwd` echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:4126: checking for long file names" >&5 +echo "configure:4292: checking for long file names" >&5 if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4167,21 +4333,21 @@ fi echo $ac_n "checking for -lrpcsvc""... $ac_c" 1>&6 -echo "configure:4171: checking for -lrpcsvc" >&5 +echo "configure:4337: checking for -lrpcsvc" >&5 if eval "test \"`echo '$''{'ac_cv_lib_rpcsvc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lrpcsvc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_lib_rpcsvc=yes else @@ -4200,7 +4366,7 @@ if test "$ac_cv_lib_rpcsvc" = yes; then fi echo $ac_n "checking for xdr_mon in -lrpcsvc""... $ac_c" 1>&6 -echo "configure:4204: checking for xdr_mon in -lrpcsvc" >&5 +echo "configure:4370: checking for xdr_mon in -lrpcsvc" >&5 ac_lib_var=`echo rpcsvc'_'xdr_mon | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4208,7 +4374,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lrpcsvc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4245,7 +4411,7 @@ fi echo $ac_n "checking for lfind in -lcompat""... $ac_c" 1>&6 -echo "configure:4249: checking for lfind in -lcompat" >&5 +echo "configure:4415: checking for lfind in -lcompat" >&5 ac_lib_var=`echo compat'_'lfind | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4253,7 +4419,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcompat $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4288,7 +4454,7 @@ fi test -n "$resolv_lib" && (echo $ac_n "checking for inet_neta in -lresolv""... $ac_c" 1>&6 -echo "configure:4292: checking for inet_neta in -lresolv" >&5 +echo "configure:4458: checking for inet_neta in -lresolv" >&5 ac_lib_var=`echo resolv'_'inet_neta | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4296,7 +4462,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4334,21 +4500,21 @@ fi test -n "$libwrap" && { echo $ac_n "checking for -lwrap""... $ac_c" 1>&6 -echo "configure:4338: checking for -lwrap" >&5 +echo "configure:4504: checking for -lwrap" >&5 if eval "test \"`echo '$''{'ac_cv_lib_wrap'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lwrap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_lib_wrap=yes else @@ -4375,17 +4541,17 @@ fi ac_safe=`echo "tcpd.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tcpd.h""... $ac_c" 1>&6 -echo "configure:4379: checking for tcpd.h" >&5 +echo "configure:4545: checking for tcpd.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4410,7 +4576,7 @@ fi uselibwrap="-DUSE_LIBWRAP" } echo $ac_n "checking for inet_aton in -lc""... $ac_c" 1>&6 -echo "configure:4414: checking for inet_aton in -lc" >&5 +echo "configure:4580: checking for inet_aton in -lc" >&5 ac_lib_var=`echo c'_'inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4418,7 +4584,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4453,7 +4619,7 @@ else fi echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 -echo "configure:4457: checking for inet_aton in -lresolv" >&5 +echo "configure:4623: checking for inet_aton in -lresolv" >&5 ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4461,7 +4627,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4497,7 +4663,7 @@ fi echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4501: checking for dlopen in -ldl" >&5 +echo "configure:4667: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4505,7 +4671,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4542,12 +4708,12 @@ fi for ac_func in shl_load do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4546: checking for $ac_func" >&5 +echo "configure:4712: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4597,12 +4763,12 @@ done for ac_func in NSCreateObjectFileImageFromFile do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4601: checking for $ac_func" >&5 +echo "configure:4767: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4653,7 +4819,7 @@ done LIBS=`$NESSUSCONFIG --libs` echo $ac_n "checking for nessuslib_pthreads_enabled in -lnessus""... $ac_c" 1>&6 -echo "configure:4657: checking for nessuslib_pthreads_enabled in -lnessus" >&5 +echo "configure:4823: checking for nessuslib_pthreads_enabled in -lnessus" >&5 ac_lib_var=`echo nessus'_'nessuslib_pthreads_enabled | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4661,7 +4827,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnessus $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4698,17 +4864,17 @@ test "$use_pthreads" && { do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4702: checking for $ac_hdr" >&5 +echo "configure:4868: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4712: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4878: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4735,9 +4901,9 @@ fi done echo $ac_n "checking if we have a broken pthread_cleanup_push""... $ac_c" 1>&6 -echo "configure:4739: checking if we have a broken pthread_cleanup_push" >&5 +echo "configure:4905: checking if we have a broken pthread_cleanup_push" >&5 cat > conftest.$ac_ext < @@ -4745,7 +4911,7 @@ int main() { void main(){pthread_cleanup_push(NULL,NULL);} ; return 0; } EOF -if { (eval echo configure:4749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -4761,7 +4927,7 @@ rm -f conftest* echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:4765: checking for pthread_create in -lpthread" >&5 +echo "configure:4931: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4769,7 +4935,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4801,7 +4967,7 @@ else fi echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 -echo "configure:4805: checking for gethostbyname_r in -lc_r" >&5 +echo "configure:4971: checking for gethostbyname_r in -lc_r" >&5 ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4809,7 +4975,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4841,7 +5007,7 @@ else fi echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:4845: checking for pthread_create in -lc_r" >&5 +echo "configure:5011: checking for pthread_create in -lc_r" >&5 ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4849,7 +5015,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4881,7 +5047,7 @@ else fi echo $ac_n "checking for gethostbyname_r in -lc""... $ac_c" 1>&6 -echo "configure:4885: checking for gethostbyname_r in -lc" >&5 +echo "configure:5051: checking for gethostbyname_r in -lc" >&5 ac_lib_var=`echo c'_'gethostbyname_r | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4889,7 +5055,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4924,7 +5090,7 @@ else fi echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 -echo "configure:4928: checking for gethostbyname_r in -lc_r" >&5 +echo "configure:5094: checking for gethostbyname_r in -lc_r" >&5 ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4932,7 +5098,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4967,7 +5133,7 @@ else fi echo $ac_n "checking for gethostbyname_r in -lnsl""... $ac_c" 1>&6 -echo "configure:4971: checking for gethostbyname_r in -lnsl" >&5 +echo "configure:5137: checking for gethostbyname_r in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname_r | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4975,7 +5141,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5010,7 +5176,7 @@ else fi echo $ac_n "checking for pthread_cancel in -lpthread""... $ac_c" 1>&6 -echo "configure:5014: checking for pthread_cancel in -lpthread" >&5 +echo "configure:5180: checking for pthread_cancel in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_cancel | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5018,7 +5184,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5053,7 +5219,7 @@ else fi echo $ac_n "checking for pthread_cancel in -lc_r""... $ac_c" 1>&6 -echo "configure:5057: checking for pthread_cancel in -lc_r" >&5 +echo "configure:5223: checking for pthread_cancel in -lc_r" >&5 ac_lib_var=`echo c_r'_'pthread_cancel | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5061,7 +5227,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5096,9 +5262,9 @@ else fi echo $ac_n "checking whether gethostbyname_r takes 5 args""... $ac_c" 1>&6 -echo "configure:5100: checking whether gethostbyname_r takes 5 args" >&5 +echo "configure:5266: checking whether gethostbyname_r takes 5 args" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* solaris_gethostbyname_r=yes else @@ -5135,9 +5301,9 @@ EOF echo $ac_n "checking whether gethostbyaddr_r takes 5 args""... $ac_c" 1>&6 -echo "configure:5139: checking whether gethostbyaddr_r takes 5 args" >&5 +echo "configure:5305: checking whether gethostbyaddr_r takes 5 args" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* solaris_gethostbyaddr_r=yes else @@ -5187,12 +5353,12 @@ test "$use_pthreads" = "" && unset pthre echo $ac_n "checking if sockaddr{} has sa_len member""... $ac_c" 1>&6 -echo "configure:5191: checking if sockaddr{} has sa_len member" >&5 +echo "configure:5357: checking if sockaddr{} has sa_len member" >&5 if eval "test \"`echo '$''{'ac_cv_sockaddr_has_sa_len'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5201,7 +5367,7 @@ int main() { unsigned int i = sizeof(((struct sockaddr *)0)->sa_len) ; return 0; } EOF -if { (eval echo configure:5205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5371: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sockaddr_has_sa_len=yes else @@ -5375,9 +5541,9 @@ esac echo $ac_n "checking whether struct sigaction has sa_restorer""... $ac_c" 1>&6 -echo "configure:5379: checking whether struct sigaction has sa_restorer" >&5 +echo "configure:5545: checking whether struct sigaction has sa_restorer" >&5 cat > conftest.$ac_ext < @@ -5390,7 +5556,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5394: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* signal_sa_restorer=yes else @@ -5420,7 +5586,7 @@ fi # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5424: checking for $ac_word" >&5 +echo "configure:5590: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTKCONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5456,7 +5622,7 @@ test "x$GTKCONFIG" = x && { # Extract the first word of "gtk12-config", so it can be a program name with args. set dummy gtk12-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5460: checking for $ac_word" >&5 +echo "configure:5626: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTKCONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5491,7 +5657,7 @@ fi test "x$GTKCONFIG" = x && # Extract the first word of "gtk10-config", so it can be a program name with args. set dummy gtk10-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5495: checking for $ac_word" >&5 +echo "configure:5661: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTKCONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5531,7 +5697,7 @@ test "$GTKCONFIG" || { # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5535: checking for $ac_word" >&5 +echo "configure:5701: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKGCONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5576,7 +5742,7 @@ test -n "$GTKCONFIG" -o "$PKGCONFIG" && test -n "$GTKCONFIG" && GTKVERSION=`$GTKCONFIG --version` test -z "$GTKCONFIG" && GTKVERSION=`$PKGCONFIG --modversion gtk+-2.0` echo $ac_n "checking GTK version""... $ac_c" 1>&6 -echo "configure:5580: checking GTK version" >&5 +echo "configure:5746: checking GTK version" >&5 echo "$ac_t""$GTKVERSION" 1>&6 GTK_VERSION=`echo $GTKVERSION | sed 's/\./ /g' | awk {'print $1$2'}` test -n "$GTK_VERSION" && cat >> confdefs.h <&6 -echo "configure:5594: checking for $ac_word" >&5 +echo "configure:5760: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GLIBCONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5626,7 +5792,7 @@ test "x$GLIBCONFIG" = x && { # Extract the first word of "glib12-config", so it can be a program name with args. set dummy glib12-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5630: checking for $ac_word" >&5 +echo "configure:5796: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GLIBCONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5735,7 +5901,7 @@ EOF # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5739: checking for $ac_word" >&5 +echo "configure:5905: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5959,6 +6125,9 @@ s%@includedir@%$includedir%g s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g +s%@LIBPRELUDE_CONFIG@%$LIBPRELUDE_CONFIG%g +s%@LIBPRELUDE_CFLAGS@%$LIBPRELUDE_CFLAGS%g +s%@LIBPRELUDE_LIBS@%$LIBPRELUDE_LIBS%g s%@host@%$host%g s%@host_alias@%$host_alias%g s%@host_cpu@%$host_cpu%g diff -upNr nessus-core.orig/configure.in nessus-core/configure.in --- nessus-core.orig/configure.in 2003-06-10 16:23:15.000000000 +0200 +++ nessus-core/configure.in 2003-09-03 10:50:45.000000000 +0200 @@ -16,6 +16,17 @@ dnl --enable-unix-socket AC_INIT(.root-dir) AC_REVISION($Revision: 1.117 $)dnl +dnl ************************************************** +dnl * Check for libprelude * +dnl ************************************************** + +AC_PATH_GENERIC(libprelude, 0.8.6, , + AC_MSG_ERROR(Cannot find libprelude: Is libprelude-config in the path?) ) + +AC_SUBST(LIBPRELUDE_CFLAGS) +AC_SUBST(LIBPRELUDE_LIBS) + + dnl version stuff -- jordan save_IFS="${IFS}" IFS=. diff -upNr nessus-core.orig/nessus/cli.c nessus-core/nessus/cli.c --- nessus-core.orig/nessus/cli.c 2003-04-07 04:12:10.000000000 +0200 +++ nessus-core/nessus/cli.c 2003-09-05 11:22:00.000000000 +0200 @@ -40,6 +40,8 @@ #include "parser.h" #include "cli.h" +#include "prelude-output.h" + #undef USE_GTK #include "read_target_file.h" #include "nsr_output.h" @@ -55,7 +57,6 @@ #include "comm.h" #include "backend.h" - static struct cli_args * g_cli = NULL; /*--------------------------------------------------- Private functions @@ -366,7 +367,6 @@ cli_args_output(args, type) args->backend_output_func = 1; return; } - #ifndef _NO_PIES if(!strncmp(ftype, "html_pie", 8)|| !strncmp(ftype, "html_graph", 10)) { @@ -402,6 +402,8 @@ cli_args_output(args, type) args->output = (output_func_t)backend_to_xml_ng; args->backend_output_func = 1; } + else if(!strcmp(ftype, "prelude")) + args->output = (output_func_t) arglist_to_prelude; else { fprintf(stderr, "'%s' is not a valid report type\n", ftype); exit(1); Files nessus-core.orig/nessus/core and nessus-core/nessus/core differ diff -upNr nessus-core.orig/nessus/Makefile nessus-core/nessus/Makefile --- nessus-core.orig/nessus/Makefile 2003-02-22 14:47:43.000000000 +0100 +++ nessus-core/nessus/Makefile 2003-09-03 10:48:43.000000000 +0200 @@ -3,7 +3,7 @@ include ../nessus.tmpl GTKLIBS= $(GTKCONFIG_LIBS) $(GLIBCONFIG_LIBS) INCLUDE = ${include} $(GTKCONFIG_CFLAGS) $(GLIBCONFIG_CFLAGS) -Igdchart0.94b -Igdchart0.94b/gd1.3 LIBS = `$(NESSUSCONFIG) --libs` $(X_LIBS) $(X_CFLAGS) $(GTKLIBS) \ - $(RUN_LIBS) $(C_R_LIB) gdchart0.94b/gd1.3/libgd.a -lm + $(RUN_LIBS) $(C_R_LIB) gdchart0.94b/gd1.3/libgd.a -lm $(LIBPRELUDE_LIBS) NESSUS_INCLUDE=`sh ./cflags` @@ -24,6 +24,7 @@ OBJS = auth.o \ nsr_output.o \ nbe_output.o \ html_output.o \ + prelude-output.o \ latex_output.o \ text_output.o \ xml_output.o \ @@ -67,7 +68,7 @@ ${make_bindir}/nessus : cflags nessus cflags : - @echo "$(NESSUS_CFLAGS) $(NESSUS_DEFS) $(INCLUDE)" | sed 's/\"/\\\"/g' > cflags.tmp + @echo "$(NESSUS_CFLAGS) $(NESSUS_DEFS) $(INCLUDE) $(LIBPRELUDE_CFLAGS)" | sed 's/\"/\\\"/g' > cflags.tmp @echo "echo \"`cat cflags.tmp`\"" > cflags @rm cflags.tmp @chmod +x cflags @@ -147,6 +148,8 @@ latex_output.o : cflags latex_output.c l html_graph_output.o : cflags html_graph_output.c html_graph_output.h $(CC) $(CFLAGS) $(NESSUS_INCLUDE) -c html_graph_output.c +prelude-output.o : cflags prelude-output.c + $(CC) $(CFLAGS) $(NESSUS_INCLUDE) -c prelude-output.c monitor_dialog.o : cflags monitor_dialog.c monitor_dialog.h $(CC) $(CFLAGS) $(NESSUS_INCLUDE) -c monitor_dialog.c diff -upNr nessus-core.orig/nessus/nessus.c nessus-core/nessus/nessus.c --- nessus-core.orig/nessus/nessus.c 2003-06-17 14:40:56.000000000 +0200 +++ nessus-core/nessus/nessus.c 2003-09-05 11:19:17.000000000 +0200 @@ -29,6 +29,7 @@ #include #include "password_dialog.h" +#include "prelude-output.h" #ifdef USE_GTK #include @@ -686,6 +687,7 @@ display_help printf("\t to the screen.\n"); printf("\t-x : override SSL \"paranoia\" question preventing nessus from\n"); printf("\t checking certificates.\n\n"); + printf("\t--prelude=[mandatory prelude configuration file] : report Vulnerability Scan to Prelude.\n\n"); printf("The batch mode (-q) arguments are :\n"); #ifdef USE_AF_INET @@ -774,6 +776,7 @@ int main(int argc, char * argv[]) int opt_V= 0; int opt_i= 0; int opt_o= 0; + int use_prelude = 0; char * inf = NULL, *outf = NULL; /* @@ -843,12 +846,13 @@ you have deleted older versions nessus l #ifdef ENABLE_SAVE_TESTS {"list-sessions", no_argument, 0, 's'}, {"restore-session",required_argument, 0, 'R'}, -#endif +#endif + {"prelude", optional_argument, 0, 'a' }, {0, 0, 0, 0} }; if ((i = getopt_long - (argc, argv, "Ppc:T:Vvhqn?r:01sR:Smi:o:x", long_options, &option_index)) == EOF) + (argc, argv, "Ppc:T:Vvhqn?r:01sR:Smi:o:xa::", long_options, &option_index)) == EOF) break; else @@ -950,6 +954,17 @@ you have deleted older versions nessus l } break; #endif + + case 'a': + if ( prelude_init(optarg) < 0 ) { + fprintf(stderr, "error initializing the Prelude subsystem.\n"); + exit(1); + } + + use_prelude = 1; + output_type = "prelude"; + break; + default: display_help (myself); exit (0); @@ -1120,7 +1135,7 @@ you have deleted older versions nessus l } } else - if (argc - optind != NUM_ARGS) { + if (argc - optind != NUM_ARGS && argc - optind != NUM_ARGS - use_prelude) { display_help(myself); exit(0); } @@ -1200,7 +1215,7 @@ you have deleted older versions nessus l } t = argv[inc_optind()]; if(t) cli_args_results(cli, t); - else { + else if ( ! use_prelude ) { fprintf(stderr, "Missing parameter\n"); display_help(myself); } diff -upNr nessus-core.orig/nessus/prelude-output.c nessus-core/nessus/prelude-output.c --- nessus-core.orig/nessus/prelude-output.c 1970-01-01 01:00:00.000000000 +0100 +++ nessus-core/nessus/prelude-output.c 2003-09-08 11:21:56.000000000 +0200 @@ -0,0 +1,898 @@ +/* + * Copyright (C) 2003 Yoann Vandoorselaere . + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + */ + +#include +#include +#include +#include +#include +#include + +#include +#include "globals.h" +#include "corevers.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * This is necessary as both Prelude and Nessus define them + * so it won't compile if nothing is done before including prelude-getopt.h + */ +#undef no_argument +#undef optional_argument +#undef required_argument + +#include + + +/* + * Content of the meaning field we fill for each + * IDMEF AdditionalData section of the alert. + */ +#define DATA_PLUGIN_ID "Nessus plugin ID" +#define DATA_PLUGIN_NAME "Nessus plugin name" +#define DATA_PLUGIN_FAMILY "Nessus plugin family" +#define DATA_PLUGIN_SUMMARY "Nessus plugin summary" +#define DATA_PLUGIN_VERSION "Nessus plugin version" +#define DATA_PLUGIN_CATEGORY "Nessus plugin category" +#define DATA_PLUGIN_SOLUTION "Nessus plugin solution" +#define DATA_PLUGIN_COPYRIGHT "Nessus plugin copyright" +#define DATA_PLUGIN_DESCRIPTION "Nessus plugin description" +#define DATA_PLUGIN_REFERENCE "Nessus plugin reference" +#define DATA_PLUGIN_SEE_ALSO "Nessus plugin see also" + + +/* + * Analyzer field definition + */ +#define ANALYZER_MODEL "Nessus" +#define ANALYZER_CLASS "Vulnerability Scanner" +#define ANALYZER_MANUFACTURER "http://www.nessus.org" + + +/* + * String used for parsing Nessus report. + */ +#define NESSUS_SOLUTION_STRING "Solution" +#define NESSUS_SEE_ALSO_STRING "See also" +#define NESSUS_REFERENCE_STRING "Reference" +#define NESSUS_RISK_FACTOR_STRING "Risk Factor" + +/* + * URL to provide along with classification. + */ +#define CVE_URL "http://cve.mitre.org/cgi-bin/cvename.cgi?name=" +#define BUGTRAQ_URL "http://www.securityfocus.com/bid/" + + + +#define generic_free_list(type, head) do { \ + type *decl; \ + struct list_head *tmp; \ + \ + for (tmp = (head)->next; tmp != (head); ) { \ + decl = list_entry(tmp, type, list); \ + tmp = tmp->next; \ + free(decl); \ + } \ + \ + INIT_LIST_HEAD(head); \ +} while (0) + + + +typedef struct { + struct list_head list; + char string[0]; +} strdup_string_t; + + +/* + * Server IP / Hostname kept to be sent to the manager + */ +static int initialized = 0; +static LIST_HEAD(strdup_string_list); + + + + +static char *strdup_string_new(const char *string, size_t size) +{ + strdup_string_t *dup; + + dup = malloc(sizeof(*dup) + size + 1); + if ( ! dup ) { + log(LOG_ERR, "memory exhausted.\n"); + return NULL; + } + + dup->string[size] = '\0'; + memcpy(dup->string, string, size); + + list_add_tail(&dup->list, &strdup_string_list); + + return dup->string; +} + + + + +static char *strdup_string_new_limited(const char *string, char delim) +{ + size_t len = 0; + + while ( string[len] && string[len] != delim ) + len++; + + return strdup_string_new(string, len); +} + + + +static void strdup_string_destroy(strdup_string_t *dup) +{ + list_del(&dup->list); + free(dup); +} + + + +static void strdup_string_destroy_all(void) +{ + strdup_string_t *dup; + struct list_head *tmp, *bkp; + + list_for_each_safe(tmp, bkp, &strdup_string_list) { + dup = list_entry(tmp, strdup_string_t, list); + strdup_string_destroy(dup); + } +} + + + +static struct arglist *get_plugin_from_list(struct arglist *list, int wanted_id) +{ + int id; + + while ( list ) { + + id = (int) arg_get_value(list->value, "ID"); + if ( id == wanted_id ) + return list; + + list = list->next; + } + + return NULL; +} + + + + +/* + * Get the arglist of a plugin having only its id + * We search among the usual plugins first, them among the scanning ones + */ +static struct arglist *get_plugin(int p_id) +{ + struct arglist *ptr = NULL; + + ptr = get_plugin_from_list(Plugins, p_id); + if ( ptr ) + return ptr; + + return get_plugin_from_list(Scanners, p_id); +} + + + + +/* + * Set constant information relative to the Nessus Anlyzer + */ +static void set_analyzer_infos(idmef_analyzer_t *analyzer) +{ + prelude_analyzer_fill_infos(analyzer); + + idmef_string_set_constant(&analyzer->model, ANALYZER_MODEL); + idmef_string_set_constant(&analyzer->class, ANALYZER_CLASS); + idmef_string_set_constant(&analyzer->version, NESSUS_VERSION); + idmef_string_set_constant(&analyzer->manufacturer, ANALYZER_MANUFACTURER); +} + + + +/* + * convert an entry from 'telnet (21/tcp)' to an idmef_service_t. + */ +static int portstr_to_idmef_service(idmef_service_t *service, char *str) +{ + char *ptr; + + /* + * get service name. + */ + ptr = strtok(str, " "); + if ( ! ptr ) + return -1; + + idmef_string_set(&service->name, ptr); + + /* + * get port number. + */ + ptr = strtok(NULL, "/"); + if ( ! ptr ) + return -1; + + ptr = strchr(ptr, '('); + if ( ! ptr ) + return -1; + + service->port = atoi(ptr + 1); + + /* + * get protocol. + */ + ptr = strtok(NULL, ")"); + if ( ! ptr ) + return -1; + + idmef_string_set(&service->protocol, ptr); + + return 0; +} + + + +/* + * Nessus plugin output is not strictly formated. + * We deal with that here. + */ +static char *extract_generic(const char **str, const char *wanted) +{ + char *ptr; + int got_delim = 0; + + ptr = strstr(*str, wanted); + if ( ! ptr ) + return NULL; + + ptr += strlen(wanted); + do { + if ( *ptr == ' ' ) + ptr++; + + else if ( *ptr == ':' ) { + ptr++; + got_delim = 1; + } + + else if ( got_delim ) + break; + + else + return NULL; + + } while (*ptr); + + *str = ptr; + + return ptr; +} + + + + + +/* + * Get the risk factor from nessus report. + */ +static int risk_factor_to_idmef_severity(const char *desc, idmef_impact_severity_t dfl) +{ + char *ptr; + + if ( ! desc || ! (ptr = extract_generic(&desc, NESSUS_RISK_FACTOR_STRING)) ) + return dfl; + + /* + * Value may be None, Low, Medium, Serious, High, Critical + * We'll rely on the first character only, so... + * Everything above "Medium" will be considered as a high risk, from + * an IDMEF point of view + */ + + switch ( *ptr ) { + + case 'C': + case 'S': + case 'H': + return impact_high; + + case 'L': + return impact_low; + + case 'M': + return impact_medium; + } + + return dfl; +} + + + + +static idmef_impact_type_t category_to_idmef_impact_type(const char *category) +{ + switch (*category) { + + case 's': /* scanner */ + case 'i': /* infos */ + return recon; + + case 'd': /* denial */ + return dos; + + } + + return other; +} + + + +static int add_classification(idmef_alert_t *alert, + idmef_classification_origin_t origin, + const char *name, const char *url) +{ + idmef_classification_t *class; + + if ( ! name ) + return -1; + + class = idmef_alert_classification_new(alert); + if ( ! class ) + return -1; + + class->origin = origin; + idmef_string_set(&class->name, name); + + if ( url && *url ) + idmef_string_set(&class->url, url); + + return 0; +} + + + +static void parse_classification(idmef_alert_t *alert, + idmef_classification_origin_t origin, + char *start_url, char *url_arg_list) +{ + char *ptr, tmpbuf[1024]; + + while ( (ptr = strtok(url_arg_list, ",")) ) { + + while ( *ptr == ' ' ) + ptr++; + + snprintf(tmpbuf, sizeof(tmpbuf), "%s%s", start_url, ptr); + add_classification(alert, origin, ptr, strdup_string_new(tmpbuf, strlen(tmpbuf))); + + url_arg_list = NULL; + } +} + + + +static int add_default_classification(struct arglist *plug, idmef_alert_t *alert, char *description) +{ + char *str; + + add_classification(alert, vendor_specific, description, NULL); + + str = arg_get_value(plug->value, "CVE_ID"); + if ( str && *str ) + parse_classification(alert, cve, CVE_URL, str); + + str = arg_get_value(plug->value, "BUGTRAQ_ID"); + if ( str && *str ) + parse_classification(alert, bugtraqid, BUGTRAQ_URL, str); + + return 0; +} + + + + +static int plugin_infos_to_idmef_data(idmef_alert_t *alert, struct arglist *data) +{ + char *str; + const char *ptr; + static int plugin_id; + struct arglist *plug; + idmef_additional_data_t *ad; + idmef_impact_t *impact = alert->assessment->impact; + + plugin_id = atoi(data->name); + if ( ! plugin_id ) + return -1; + + plug = get_plugin(plugin_id); + if ( ! plug ) + return -1; + + /* + * fill plugin name. + */ + ad = idmef_alert_additional_data_new(alert); + if ( ! ad ) + return -1; + + idmef_string_set_constant(&ad->meaning, DATA_PLUGIN_NAME); + idmef_additional_data_set_data(ad, string, plug->name, strlen(plug->name) + 1); + + /* + * fill plugin ID. + */ + ad = idmef_alert_additional_data_new(alert); + if ( ! ad ) + return -1; + + plugin_id = htonl(plugin_id); + idmef_string_set_constant(&ad->meaning, DATA_PLUGIN_ID); + idmef_additional_data_set_data(ad, integer, &plugin_id, sizeof(plugin_id)); + + /* + * fill plugin version. + */ + str = (char *) arg_get_value(plug->value, "VERSION"); + if ( str && *str ) { + ad = idmef_alert_additional_data_new(alert); + if ( ! ad ) + return -1; + + idmef_string_set_constant(&ad->meaning, DATA_PLUGIN_VERSION); + idmef_additional_data_set_data(ad, string, str, strlen(str) + 1); + } + + /* + * fill plugin family. + */ + str = (char *) arg_get_value(plug->value, "FAMILY"); + if ( str && *str ) { + + ad = idmef_alert_additional_data_new(alert); + if ( !ad ) + return -1; + + idmef_string_set_constant(&ad->meaning, DATA_PLUGIN_FAMILY); + idmef_additional_data_set_data(ad, string, str, strlen(str) + 1); + } + + /* + * get the nessus category, try to find an idmef interpretation + */ + str = (char *) arg_get_value(plug->value, "CATEGORY"); + if ( str && *str ) { + impact->type = category_to_idmef_impact_type(str); + + ad = idmef_alert_additional_data_new(alert); + if ( ! ad ) + return -1; + + idmef_string_set_constant(&ad->meaning, DATA_PLUGIN_CATEGORY); + idmef_additional_data_set_data(ad, string, str, strlen(str) + 1); + } + + /* + * fill plugin summary into impact description/classification name. + */ + str = (char *) arg_get_value(plug->value, "SUMMARY"); + if ( str && *str ) { + ad = idmef_alert_additional_data_new(alert); + if ( ! ad ) + return -1; + + add_default_classification(plug, alert, str); + idmef_string_set_constant(&ad->meaning, DATA_PLUGIN_SUMMARY); + idmef_additional_data_set_data(ad, string, str, strlen(str) + 1); + } + + str = (char *) arg_get_value(plug->value, "COPYRIGHT"); + if ( str && *str ) { + ad = idmef_alert_additional_data_new(alert); + if ( ! ad ) + return -1; + + idmef_string_set_constant(&ad->meaning, DATA_PLUGIN_COPYRIGHT); + idmef_additional_data_set_data(ad, string, str, strlen(str) + 1); + } + + if ( data->value ) + idmef_string_set(&alert->assessment->impact->description, data->value); + + + ptr = data->value; + while ( (str = extract_generic(&ptr, NESSUS_REFERENCE_STRING)) ) { + + str = strdup_string_new_limited(str, '\n'); + if ( ! str ) + return -1; + + ad = idmef_alert_additional_data_new(alert); + if ( ! ad ) + return -1; + + idmef_string_set_constant(&ad->meaning, DATA_PLUGIN_REFERENCE); + idmef_additional_data_set_data(ad, string, str, strlen(str) + 1); + } + + + ptr = data->value; + while ( (str = extract_generic(&ptr, NESSUS_SOLUTION_STRING)) ) { + + str = strdup_string_new_limited(str, '\n'); + if ( ! str ) + return -1; + + ad = idmef_alert_additional_data_new(alert); + if ( ! ad ) + return -1; + + idmef_string_set_constant(&ad->meaning, DATA_PLUGIN_SOLUTION); + idmef_additional_data_set_data(ad, string, str, strlen(str) + 1); + } + + ptr = data->value; + while ( (str = extract_generic(&ptr, NESSUS_SEE_ALSO_STRING)) ) { + + str = strdup_string_new_limited(str, '\n'); + if ( ! str ) + return -1; + + ad = idmef_alert_additional_data_new(alert); + if ( ! ad ) + return -1; + + idmef_string_set_constant(&ad->meaning, DATA_PLUGIN_SEE_ALSO); + idmef_additional_data_set_data(ad, string, str, strlen(str) + 1); + } + + return 0; +} + + + + + +static int fill_node(idmef_node_t *node, prelude_addrinfo_t *ai) +{ + char str[256]; + void *in_addr; + idmef_address_t *addr; + + while ( ai ) { + + if ( ai->ai_flags & AI_CANONNAME ) + idmef_string_set(&node->name, strdup_string_new(ai->ai_canonname, strlen(ai->ai_canonname))); + + addr = idmef_node_address_new(node); + if ( ! addr ) + return -1; + + in_addr = prelude_inet_sockaddr_get_inaddr(ai->ai_addr); + assert(in_addr); + + if ( ai->ai_family == AF_INET ) + addr->category = ipv4_addr; + else + addr->category = ipv6_addr; + + if ( ! prelude_inet_ntop(ai->ai_family, in_addr, str, sizeof(str)) ) { + log(LOG_ERR, "inet_ntop returned an error.\n"); + return -1; + } + + idmef_string_set(&addr->address, strdup_string_new(str, strlen(str))); + + ai = ai->ai_next; + } + + return 0; +} + + + + +static int address_to_idmef_node(idmef_node_t *node, const char *address) +{ + int ret; + prelude_addrinfo_t *ai, hints; + + if ( ! address ) + return -1; + + memset(&hints, 0, sizeof(hints)); + hints.ai_flags = AI_CANONNAME; + hints.ai_socktype = SOCK_STREAM; + + ret = prelude_inet_getaddrinfo(address, NULL, &hints, &ai); + if ( ret < 0 ) { + fprintf(stderr, "error resolving \"%s\": %s.\n", address, prelude_inet_gai_strerror(ret)); + return -1; + } + + fill_node(node, ai); + + prelude_inet_freeaddrinfo(ai); + + return 0; +} + + + +static idmef_message_t *create_default_alert(void) +{ + int ret; + struct timeval tv; + idmef_user_t *user; + idmef_node_t *node; + idmef_message_t *msg; + idmef_alert_t *alert; + idmef_impact_t *impact; + idmef_source_t *source; + idmef_userid_t *userid; + idmef_assessment_t *assessment; + idmef_confidence_t *confidence; + + /* + * create the idmef container + */ + msg = idmef_message_new(); + if ( ! msg ) + return NULL; + + idmef_alert_new(msg); + alert = msg->message.alert; + + set_analyzer_infos(&alert->analyzer); + + /* + * create container for confidence and impact data + */ + idmef_alert_assessment_new(alert); + assessment = alert->assessment; + + /* + * consider nessus alert to be reliable. + */ + idmef_assessment_confidence_new(assessment); + confidence = assessment->confidence; + confidence->rating = high; + + /* + * alert completion: we consider the probe is a success + */ + idmef_assessment_impact_new(assessment); + impact = assessment->impact; + impact->completion = succeeded; + + /* + * generation and detection times + */ + gettimeofday(&tv, NULL); + alert->create_time.sec = tv.tv_sec; + alert->create_time.usec = tv.tv_usec; + + idmef_alert_detect_time_new(alert); + alert->detect_time->sec = tv.tv_sec; + alert->detect_time->usec = tv.tv_usec; + + source = idmef_alert_source_new(alert); + if ( ! source ) + return NULL; + + source->spoofed = no; + + node = idmef_source_node_new(source); + if ( ! node ) + return NULL; + + ret = address_to_idmef_node(node, arg_get_value(Prefs, "nessusd_host")); + if ( ret < 0 ) + return NULL; + + user = idmef_source_user_new(source); + if ( ! user ) + return NULL; + + user->category = application; + + userid = idmef_user_userid_new(user); + if ( ! userid ) + return NULL; + + userid->type = original_user; + idmef_string_set(&userid->name, arg_get_value(Prefs, "nessusd_user")); + + return msg; +} + + + + +static int walk_report(struct arglist *list, idmef_message_t *msg, idmef_impact_severity_t default_severity) +{ + prelude_msgbuf_t *msgbuf; + idmef_alert_t *alert = msg->message.alert; + idmef_impact_t *impact = alert->assessment->impact; + + msgbuf = prelude_msgbuf_new(0); + if ( ! msgbuf ) + return -1; + + while ( list && list->next ) { + + impact->severity = risk_factor_to_idmef_severity(list->value, default_severity); + plugin_infos_to_idmef_data(alert, list); + + idmef_msg_send(msgbuf, msg, PRELUDE_MSG_PRIORITY_LOW); + + generic_free_list(idmef_classification_t, &alert->classification_list); + generic_free_list(idmef_additional_data_t, &alert->additional_data_list); + + list = list->next; + } + + prelude_msgbuf_close(msgbuf); + + return 0; +} + + + + +static void send_heartbeat(void) +{ + struct timeval tv; + idmef_heartbeat_t *hb; + idmef_message_t *message; + prelude_msgbuf_t *msgbuf; + + msgbuf = prelude_msgbuf_new(0); + if ( ! msgbuf ) + return; + + message = idmef_message_new(); + if ( ! message ) + return; + + idmef_heartbeat_new(message); + hb = message->message.heartbeat; + + set_analyzer_infos(&hb->analyzer); + + gettimeofday(&tv, NULL); + hb->create_time.sec = tv.tv_sec; + hb->create_time.usec = tv.tv_usec; + + idmef_msg_send(msgbuf, message, PRELUDE_MSG_PRIORITY_MID); + idmef_message_free(message); + + prelude_msgbuf_close(msgbuf); +} + + + + +/* + * Prepare the server information + */ +int prelude_init(const char *cfgfile) +{ + int ret, argc = 1; + char *argv[] = { "nessus" }; + + ret = prelude_sensor_init("nessus", cfgfile, argc, argv); + if ( ret == prelude_option_error || ret == prelude_option_end ) + return -1; + + send_heartbeat(); + + initialized = 1; + + return 0; +} + + + + +int arglist_to_prelude(struct arglist *hosts) +{ + int ret; + idmef_node_t *node; + idmef_message_t *msg; + struct arglist *ports; + idmef_target_t *target; + idmef_service_t *service; + + if ( ! initialized ) + return -1; + + while ( hosts && hosts->next ) { + + ports = arg_get_value(hosts->value, "PORTS"); + while ( ports && ports->next ) { + + msg = create_default_alert(); + if ( ! msg ) + return -1; + + target = idmef_alert_target_new(msg->message.alert); + if ( ! target ) + goto err; + + target->decoy = no; + + node = idmef_target_node_new(target); + if ( ! node ) + goto err; + + ret = address_to_idmef_node(node, hosts->name); + if ( ret < 0 ) + goto err; + + service = idmef_target_service_new(target); + if ( ! service ) + goto err; + + ret = portstr_to_idmef_service(service, ports->name); + if ( ret < 0 ) + goto err; + + walk_report(arg_get_value(ports->value, "REPORT"), msg, impact_high); + walk_report(arg_get_value(ports->value, "INFO"), msg, impact_medium); + walk_report(arg_get_value(ports->value, "NOTE"), msg, impact_low); + + idmef_message_free(msg); + strdup_string_destroy_all(); + + ports = ports->next; + } + + hosts = hosts->next; + } + + return 0; + + err: + idmef_message_free(msg); + return -1; +} diff -upNr nessus-core.orig/nessus/prelude-output.h nessus-core/nessus/prelude-output.h --- nessus-core.orig/nessus/prelude-output.h 1970-01-01 01:00:00.000000000 +0100 +++ nessus-core/nessus/prelude-output.h 2003-09-05 09:20:51.000000000 +0200 @@ -0,0 +1,3 @@ +int arglist_to_prelude(struct arglist *hosts); + +int prelude_init(const char *cfgfile); diff -upNr nessus-core.orig/nessus/report.c nessus-core/nessus/report.c --- nessus-core.orig/nessus/report.c 2002-09-26 22:57:54.000000000 +0200 +++ nessus-core/nessus/report.c 2003-09-05 09:30:50.000000000 +0200 @@ -50,6 +50,7 @@ #include "report_ng.h" #endif +#include "prelude-output.h" #include "report.h" #include "families.h" #include "nsr_output.h" @@ -331,6 +332,8 @@ static void do_create_report_window(args GtkWidget * summary_box; struct arglist * report = args; struct arglist * hosts; + + arglist_to_prelude(args); if(!args || !args->next){ if(!interrupted_test) diff -upNr nessus-core.orig/nessus/report_ng.c nessus-core/nessus/report_ng.c --- nessus-core.orig/nessus/report_ng.c 2003-03-14 11:25:51.000000000 +0100 +++ nessus-core/nessus/report_ng.c 2003-09-05 09:30:36.000000000 +0200 @@ -46,6 +46,7 @@ #include "xstuff.h" #include "globals.h" +#include "prelude-output.h" #include "xpm/computer.xpm" #include "xpm/network.xpm" #include "xpm/warning_small.xpm" @@ -854,7 +855,8 @@ create_report_window (be) GtkWidget *list_reports; GtkWidget *vbox, *hbox; GtkWidget *save_button, *close_button; - + + Lists[0] = list_subnets = gtk_list_new (); Lists[1] = list_hosts = gtk_list_new (); Lists[2] = list_ports = gtk_list_new (); @@ -1354,6 +1356,9 @@ int report_tests_ng(be, interrupted) show_error("nessusd returned an empty report"); return -1; } + + arglist_to_prelude(backend_convert(be)); + window = create_report_window(be); gtk_widget_show(window); #ifdef TEST_QUERY_LANGUAGE diff -upNr nessus-core.orig/nessus.tmpl.in nessus-core/nessus.tmpl.in --- nessus-core.orig/nessus.tmpl.in 2003-01-21 11:52:47.000000000 +0100 +++ nessus-core/nessus.tmpl.in 2003-09-03 10:52:27.000000000 +0200 @@ -145,3 +145,9 @@ NESSUS_CFLAGS=$(CWARN) $(include) $(NESS CFLAGS=@CFLAGS@ LIBS=@LIBS@ + + +# Prelude options +LIBPRELUDE_LIBS=@LIBPRELUDE_LIBS@ +LIBPRELUDE_CFLAGS=@LIBPRELUDE_CFLAGS@ + diff -upNr nessus-core.orig/README.PRELUDE nessus-core/README.PRELUDE --- nessus-core.orig/README.PRELUDE 1970-01-01 01:00:00.000000000 +0100 +++ nessus-core/README.PRELUDE 2003-09-06 11:18:18.000000000 +0200 @@ -0,0 +1,13 @@ +Report bugs to Yoann Vandoorselaere + + +* Report to Prelude from the GUI : + nessus --prelude + nessus --prelude=/etc/prelude_config_file + + +* Report to Prelude from batch mode : + [notice that the "result file" argument is ignored when using --prelude] + + nessus --prelude -q + nessus --prelude=/etc/prelude_config_file -q