renaud at nessus
May 29, 2006, 10:04 AM
Post #1 of 1
(650 views)
Permalink
|
|
NessusClient configure.in, 1.7, 1.8 configure, 1.3, 1.4 nessus.tmpl.in, 1.2, 1.3
|
|
Update of /usr/local/cvs/NessusClient
In directory raccoon.nessus.org:/tmp/cvs-serv74488
Modified Files:
configure.in configure nessus.tmpl.in
Log Message:
Solaris magic
Index: configure.in
===================================================================
RCS file: /usr/local/cvs/NessusClient/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- configure.in 17 May 2006 14:43:54 -0000 1.7
+++ configure.in 29 May 2006 17:04:38 -0000 1.8
@@ -340,6 +340,14 @@
AC_SYS_LONG_FILE_NAMES
+if test "`uname`" != "IRIX" ;
+then
+ AC_HAVE_LIBRARY(socket, [socket_lib="-lsocket";LIBS="-lsocket $LIBS";])
+ AC_HAVE_LIBRARY(nsl, [nsl_lib="-lnsl";LIBS="-lnsl $LIBS";])
+ AC_HAVE_LIBRARY(resolv, [resolv_lib="-lresolv";LIBS="-lresolv $LIBS";])
+fi
+
+
AC_CHECK_LIB(c, inet_aton, AC_DEFINE(HAVE_INET_ATON))
AC_CHECK_LIB(resolv, inet_aton, AC_DEFINE(HAVE_INET_ATON))
AC_CHECK_LIB(z, compress, , AC_ERROR("libz is needed"))
@@ -545,6 +553,8 @@
AC_SUBST(RUN_LIBS)
AC_SUBST(resolv_lib)
AC_SUBST(socket_lib)
+AC_SUBST(nsl_lib)
+AC_SUBST(resolv_lib)
AC_SUBST(ssl_lib)
AC_SUBST(gtk_flags)
AC_SUBST(debug_flags)
Index: configure
===================================================================
RCS file: /usr/local/cvs/NessusClient/configure,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure 12 Jan 2006 23:12:27 -0000 1.3
+++ configure 29 May 2006 17:04:38 -0000 1.4
@@ -532,7 +532,7 @@
fi
-# From configure.in Revision: 1.3
+# From configure.in Revision: 1.7
save_IFS="${IFS}"
IFS=.
read NESSUS_MAJOR NESSUS_MINOR NESSUS_PATCH NESSUS_RC <VERSION
@@ -3943,8 +3943,112 @@
+if test "`uname`" != "IRIX" ;
+then
+ echo $ac_n "checking for -lsocket""... $ac_c" 1>&6
+echo "configure:3950: checking for -lsocket" >&5
+if eval "test \"`echo '$''{'ac_cv_lib_socket'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lsocket $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 3957 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:3964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ ac_cv_lib_socket=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_cv_lib_socket=no
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+echo "$ac_t""$ac_cv_lib_socket" 1>&6
+if test "$ac_cv_lib_socket" = yes; then
+ socket_lib="-lsocket";LIBS="-lsocket $LIBS";
+fi
+
+ echo $ac_n "checking for -lnsl""... $ac_c" 1>&6
+echo "configure:3983: checking for -lnsl" >&5
+if eval "test \"`echo '$''{'ac_cv_lib_nsl'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lnsl $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 3990 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:3997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ ac_cv_lib_nsl=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_cv_lib_nsl=no
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+echo "$ac_t""$ac_cv_lib_nsl" 1>&6
+if test "$ac_cv_lib_nsl" = yes; then
+ nsl_lib="-lnsl";LIBS="-lnsl $LIBS";
+fi
+
+ echo $ac_n "checking for -lresolv""... $ac_c" 1>&6
+echo "configure:4016: checking for -lresolv" >&5
+if eval "test \"`echo '$''{'ac_cv_lib_resolv'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lresolv $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 4023 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:4030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ ac_cv_lib_resolv=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_cv_lib_resolv=no
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+echo "$ac_t""$ac_cv_lib_resolv" 1>&6
+if test "$ac_cv_lib_resolv" = yes; then
+ resolv_lib="-lresolv";LIBS="-lresolv $LIBS";
+fi
+
+fi
+
+
echo $ac_n "checking for inet_aton in -lc""... $ac_c" 1>&6
-echo "configure:3948: checking for inet_aton in -lc" >&5
+echo "configure:4052: 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
@@ -3952,7 +4056,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3956 "configure"
+#line 4060 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3963,7 +4067,7 @@
inet_aton()
; return 0; }
EOF
-if { (eval echo configure:3967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4071: \"$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
@@ -3987,7 +4091,7 @@
fi
echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6
-echo "configure:3991: checking for inet_aton in -lresolv" >&5
+echo "configure:4095: 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
@@ -3995,7 +4099,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3999 "configure"
+#line 4103 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4006,7 +4110,7 @@
inet_aton()
; return 0; }
EOF
-if { (eval echo configure:4010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4114: \"$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
@@ -4030,7 +4134,7 @@
fi
echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6
-echo "configure:4034: checking for compress in -lz" >&5
+echo "configure:4138: checking for compress in -lz" >&5
ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4038,7 +4142,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4042 "configure"
+#line 4146 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4049,7 +4153,7 @@
compress()
; return 0; }
EOF
-if { (eval echo configure:4053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4157: \"$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
@@ -4079,7 +4183,7 @@
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:4083: checking for dlopen in -ldl" >&5
+echo "configure:4187: 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
@@ -4087,7 +4191,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4091 "configure"
+#line 4195 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4098,7 +4202,7 @@
dlopen()
; return 0; }
EOF
-if { (eval echo configure:4102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4206: \"$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
@@ -4124,12 +4228,12 @@
for ac_func in getopt_long snprintf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4128: checking for $ac_func" >&5
+echo "configure:4232: 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 <<EOF
-#line 4133 "configure"
+#line 4237 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4152,7 +4256,7 @@
; return 0; }
EOF
-if { (eval echo configure:4156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4260: \"$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
@@ -4186,12 +4290,12 @@
echo $ac_n "checking if sockaddr{} has sa_len member""... $ac_c" 1>&6
-echo "configure:4190: checking if sockaddr{} has sa_len member" >&5
+echo "configure:4294: 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 <<EOF
-#line 4195 "configure"
+#line 4299 "configure"
#include "confdefs.h"
# include <sys/types.h>
@@ -4200,7 +4304,7 @@
unsigned int i = sizeof(((struct sockaddr *)0)->sa_len)
; return 0; }
EOF
-if { (eval echo configure:4204: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sockaddr_has_sa_len=yes
else
@@ -4369,14 +4473,20 @@
EOF
;;
+ *-cygwin*)
+ cat >> confdefs.h <<\EOF
+#define CYGWIN 1
+EOF
+
+ ;;
esac
echo $ac_n "checking whether struct sigaction has sa_restorer""... $ac_c" 1>&6
-echo "configure:4378: checking whether struct sigaction has sa_restorer" >&5
+echo "configure:4488: checking whether struct sigaction has sa_restorer" >&5
cat > conftest.$ac_ext <<EOF
-#line 4380 "configure"
+#line 4490 "configure"
#include "confdefs.h"
#include <signal.h>
@@ -4389,7 +4499,7 @@
; return 0; }
EOF
-if { (eval echo configure:4393: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
signal_sa_restorer=yes
else
@@ -4427,7 +4537,7 @@
# 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:4431: checking for $ac_word" >&5
+echo "configure:4541: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4471,19 +4581,19 @@
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for $pkg_modules""... $ac_c" 1>&6
-echo "configure:4475: checking for $pkg_modules" >&5
+echo "configure:4585: checking for $pkg_modules" >&5
if $PKG_CONFIG --exists "$pkg_modules" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking GTKCONFIG_CFLAGS""... $ac_c" 1>&6
-echo "configure:4482: checking GTKCONFIG_CFLAGS" >&5
+echo "configure:4592: checking GTKCONFIG_CFLAGS" >&5
GTKCONFIG_CFLAGS=`$PKG_CONFIG --cflags "$pkg_modules"`
echo "$ac_t""$GTKCONFIG_CFLAGS" 1>&6
echo $ac_n "checking GTKCONFIG_LIBS""... $ac_c" 1>&6
-echo "configure:4487: checking GTKCONFIG_LIBS" >&5
+echo "configure:4597: checking GTKCONFIG_LIBS" >&5
GTKCONFIG_LIBS=`$PKG_CONFIG --libs "$pkg_modules"`
echo "$ac_t""$GTKCONFIG_LIBS" 1>&6
else
@@ -4542,7 +4652,7 @@
# 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:4546: checking for $ac_word" >&5
+echo "configure:4656: 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
@@ -4620,6 +4730,8 @@
+
+
trap '' 1 2 15
cat > confcache <<\EOF
# This file is a shell script that caches the results of configure
@@ -4721,7 +4833,7 @@
ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
-trap 'rm -fr `echo "nessus.tmpl include/corevers.h nessus-mkcert-client doc/NessusClient.1 include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "nessus.tmpl include/corevers.h nessusclient-mkcert doc/NessusClient.1 include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
@@ -4798,6 +4910,7 @@
s%@RUN_LIBS@%$RUN_LIBS%g
s%@resolv_lib@%$resolv_lib%g
s%@socket_lib@%$socket_lib%g
+s%@nsl_lib@%$nsl_lib%g
s%@ssl_lib@%$ssl_lib%g
s%@gtk_flags@%$gtk_flags%g
s%@debug_flags@%$debug_flags%g
@@ -4852,7 +4965,7 @@
cat >> $CONFIG_STATUS <<EOF
-CONFIG_FILES=\${CONFIG_FILES-"nessus.tmpl include/corevers.h nessus-mkcert-client doc/NessusClient.1"}
+CONFIG_FILES=\${CONFIG_FILES-"nessus.tmpl include/corevers.h nessusclient-mkcert doc/NessusClient.1"}
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
@@ -5032,6 +5145,6 @@
-chmod +x nessus-mkcert-client
+chmod +x nessusclient-mkcert
exit 0
Index: nessus.tmpl.in
===================================================================
RCS file: /usr/local/cvs/NessusClient/nessus.tmpl.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nessus.tmpl.in 10 Sep 2005 18:08:07 -0000 1.2
+++ nessus.tmpl.in 29 May 2006 17:04:38 -0000 1.3
@@ -124,6 +124,7 @@
CLIENT=@client@
CLIENT_INSTALL=@client_install@
NESSUS_LIB=@nessus_lib@
+SOCKET_LIB=@socket_lib@ @nsl_lib@ @resolv_lib@
# documentation
MAN_NESSUS_1=@man_nessus_1@
_______________________________________________
Nessus-cvs mailing list
Nessus-cvs [at] list
http://mail.nessus.org/mailman/listinfo/nessus-cvs
|
