Author: jan
Date: 2007-10-17 21:28:16 +0200 (Wed, 17 Oct 2007)
New Revision: 445
Modified:
trunk/openvas-server/ChangeLog
trunk/openvas-server/configure
trunk/openvas-server/configure.in
trunk/openvas-server/openvas.tmpl.in
Log:
* configure.in, openvas.tmpl.in: Removed variable "nessus_lib".
It wasn't used anyway.
configure: Updated.
Modified: trunk/openvas-server/ChangeLog
===================================================================
--- trunk/openvas-server/ChangeLog 2007-10-17 19:23:26 UTC (rev 444)
+++ trunk/openvas-server/ChangeLog 2007-10-17 19:28:16 UTC (rev 445)
@@ -1,5 +1,12 @@
2007-10-17 Jan-Oliver Wagner <[EMAIL PROTECTED]>
+ * configure.in, openvas.tmpl.in: Removed variable "nessus_lib".
+ It wasn't used anyway.
+
+ * configure: Updated.
+
+2007-10-17 Jan-Oliver Wagner <[EMAIL PROTECTED]>
+
* configure.in: Added version checks for openvas-libraries
and openvas-libnasl.
Modified: trunk/openvas-server/configure
===================================================================
--- trunk/openvas-server/configure 2007-10-17 19:23:26 UTC (rev 444)
+++ trunk/openvas-server/configure 2007-10-17 19:28:16 UTC (rev 445)
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 208 .
+# From configure.in Revision: 444 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61.
#
@@ -714,7 +714,6 @@
ssl_lib
pthread_lib
debug_flags
-nessus_lib
man_openvas_1
man_openvasd_8
dl_lib
@@ -1761,6 +1760,9 @@
+NEED_OPENVASLIBS_VERSION=1.0.0
+NEED_OPENVASLIBNASL_VERSION=0.9.1
+
save_IFS="${IFS}"
IFS=.
read OPENVAS_MAJOR OPENVAS_MINOR OPENVAS_PATCH OPENVAS_RC <VERSION
@@ -2937,8 +2939,6 @@
test "x$enable_syslog" = "xno" && unset enable_syslog
-nessus_lib=-lnessus
-
XPATH="$prefix/bin:$PATH"
@@ -3033,6 +3033,49 @@
\"compile openvas-server.\"" >&2;}
{ (exit 1); exit 1; }; }
+OPENVASLIBS_VERSION=`$LIBOPENVASCONFIG --version`
+
+OPENVASLIBS_MAJOR=`echo $OPENVASLIBS_VERSION | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
+OPENVASLIBS_MINOR=`echo $OPENVASLIBS_VERSION | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
+OPENVASLIBS_PATCH=`echo $OPENVASLIBS_VERSION | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'`
+REQ_OPENVASLIBS_MAJOR=`echo $NEED_OPENVASLIBS_VERSION | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
+REQ_OPENVASLIBS_MINOR=`echo $NEED_OPENVASLIBS_VERSION | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
+REQ_OPENVASLIBS_PATCH=`echo $NEED_OPENVASLIBS_VERSION | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'`
+
+
+ok=no
+if test "$OPENVASLIBS_MAJOR" -gt "$REQ_OPENVASLIBS_MAJOR"; then
+ ok=yes
+else
+ if test "$OPENVASLIBS_MAJOR" -eq "$REQ_OPENVASLIBS_MAJOR"; then
+ if test "$OPENVASLIBS_MINOR" -gt "$REQ_OPENVASLIBS_MINOR"; then
+ ok=yes
+ else
+ if test "$OPENVASLIBS_MINOR" -eq "$REQ_OPENVASLIBS_MINOR"; then
+ if test "$OPENVASLIBS_PATCH" -ge "$REQ_OPENVASLIBS_PATCH"; then
+ ok=yes
+ fi
+ fi
+ fi
+ fi
+fi
+if test $ok = no; then
+{ { echo "$as_me:$LINENO: error: openvas-libraries $OPENVASLIBS_VERSION too
old.
+Minimum required is $NEED_OPENVASLIBS_VERSION .
+" >&5
+echo "$as_me: error: openvas-libraries $OPENVASLIBS_VERSION too old.
+Minimum required is $NEED_OPENVASLIBS_VERSION .
+" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+
# Extract the first word of "openvas-libnasl-config", so it can be a program
name with args.
set dummy openvas-libnasl-config; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -3084,7 +3127,48 @@
\"compile openvas-server.\"" >&2;}
{ (exit 1); exit 1; }; }
+OPENVASLIBNASL_VERSION=`$OPENVASLIBNASLCONFIG --version`
+OPENVASLIBNASL_MAJOR=`echo $OPENVASLIBNASL_VERSION | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
+OPENVASLIBNASL_MINOR=`echo $OPENVASLIBNASL_VERSION | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
+OPENVASLIBNASL_PATCH=`echo $OPENVASLIBNASL_VERSION | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'`
+REQ_OPENVASLIBNASL_MAJOR=`echo $NEED_OPENVASLIBNASL_VERSION | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
+REQ_OPENVASLIBNASL_MINOR=`echo $NEED_OPENVASLIBNASL_VERSION | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
+REQ_OPENVASLIBNASL_PATCH=`echo $NEED_OPENVASLIBNASL_VERSION | \
+ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'`
+
+
+ok=no
+if test "$OPENVASLIBNASL_MAJOR" -gt "$REQ_OPENVASLIBNASL_MAJOR"; then
+ ok=yes
+else
+ if test "$OPENVASLIBNASL_MAJOR" -eq "$REQ_OPENVASLIBNASL_MAJOR"; then
+ if test "$OPENVASLIBNASL_MINOR" -gt "$REQ_OPENVASLIBNASL_MINOR"; then
+ ok=yes
+ else
+ if test "$OPENVASLIBNASL_MINOR" -eq "$REQ_OPENVASLIBNASL_MINOR"; then
+ if test "$OPENVASLIBNASL_PATCH" -ge "$REQ_OPENVASLIBNASL_PATCH"; then
+ ok=yes
+ fi
+ fi
+ fi
+ fi
+fi
+if test $ok = no; then
+{ { echo "$as_me:$LINENO: error: openvas-libnasl $OPENVASLIBNASL_VERSION too
old.
+Minimum required is $NEED_OPENVASLIBNASL_VERSION .
+" >&5
+echo "$as_me: error: openvas-libnasl $OPENVASLIBNASL_VERSION too old.
+Minimum required is $NEED_OPENVASLIBNASL_VERSION .
+" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
OVSCFLAGS="`$LIBOPENVASCONFIG --cflags`"
NASLCFLAGS="`$OPENVASLIBNASLCONFIG --cflags`"
@@ -12108,7 +12192,6 @@
-
ac_config_files="$ac_config_files openvas.tmpl include/corevers.h
openvas-adduser openvas-rmuser openvas-mkcert openvas-mkcert-client
openvasd-config"
cat >confcache <<\_ACEOF
@@ -12873,7 +12956,6 @@
cat >conf$$subs.sed <<_ACEOF
pthread_lib!$pthread_lib$ac_delim
debug_flags!$debug_flags$ac_delim
-nessus_lib!$nessus_lib$ac_delim
man_openvas_1!$man_openvas_1$ac_delim
man_openvasd_8!$man_openvasd_8$ac_delim
dl_lib!$dl_lib$ac_delim
@@ -12890,7 +12972,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 16; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Modified: trunk/openvas-server/configure.in
===================================================================
--- trunk/openvas-server/configure.in 2007-10-17 19:23:26 UTC (rev 444)
+++ trunk/openvas-server/configure.in 2007-10-17 19:28:16 UTC (rev 445)
@@ -78,8 +78,6 @@
test "x$enable_syslog" = "xno" && unset enable_syslog
-nessus_lib=-lnessus
-
dnl extending the search path for AC_PATH_PROG when searching for config
scripts
XPATH="$prefix/bin:$PATH"
@@ -757,7 +755,6 @@
AC_SUBST(ssl_lib)
AC_SUBST(pthread_lib)
AC_SUBST(debug_flags)
-AC_SUBST(nessus_lib)
AC_SUBST(man_openvas_1)
AC_SUBST(man_openvasd_8)
AC_SUBST(dl_lib)
Modified: trunk/openvas-server/openvas.tmpl.in
===================================================================
--- trunk/openvas-server/openvas.tmpl.in 2007-10-17 19:23:26 UTC (rev
444)
+++ trunk/openvas-server/openvas.tmpl.in 2007-10-17 19:28:16 UTC (rev
445)
@@ -119,7 +119,6 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
# documentation
[EMAIL PROTECTED]@
_______________________________________________
Openvas-commits mailing list
[email protected]
http://lists.wald.intevation.org/mailman/listinfo/openvas-commits
