Author: jan
Date: 2007-11-07 13:00:23 +0100 (Wed, 07 Nov 2007)
New Revision: 540

Modified:
   trunk/openvas-plugins/ChangeLog
   trunk/openvas-plugins/configure
   trunk/openvas-plugins/configure.in
Log:
* configure.in: Added test for mimimum required version of
openvas-server and openvas-libraries. Removed some W32/Cygwin stuff.

* configure: updated.



Modified: trunk/openvas-plugins/ChangeLog
===================================================================
--- trunk/openvas-plugins/ChangeLog     2007-11-07 11:14:07 UTC (rev 539)
+++ trunk/openvas-plugins/ChangeLog     2007-11-07 12:00:23 UTC (rev 540)
@@ -1,3 +1,10 @@
+2007-11-07  Jan-Oliver Wagner <[EMAIL PROTECTED]>
+
+       * configure.in: Added test for mimimum required version of
+       openvas-server and openvas-libraries. Removed some W32/Cygwin stuff.
+
+       * configure: updated.
+
 2007-11-06  Jan-Oliver Wagner <[EMAIL PROTECTED]>
 
        * scripts/debian_DSA-1200.nasl, scripts/debian_DSA-1201.nasl,

Modified: trunk/openvas-plugins/configure
===================================================================
--- trunk/openvas-plugins/configure     2007-11-07 11:14:07 UTC (rev 539)
+++ trunk/openvas-plugins/configure     2007-11-07 12:00:23 UTC (rev 540)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 216 .
+# From configure.in Revision: 527 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -828,9 +828,6 @@
 AR
 RANLIB
 STRIP
-DLLTOOL
-AS
-OBJDUMP
 CPP
 CXX
 CXXFLAGS
@@ -1901,6 +1898,8 @@
 
 
 
+NEED_OPENVASLIBS_VERSION=1.0.0
+NEED_OPENVASD_VERSION=0.9.2
 
 
 
@@ -2832,10 +2831,7 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext 
$LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-#AC_CONFIG_HEADER()
 
-
-
 # Check whether --enable-shared was given.
 if test "${enable_shared+set}" = set; then
   enableval=$enable_shared; p=${PACKAGE-default}
@@ -3642,7 +3638,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3645 "configure"' > conftest.$ac_ext
+  echo '#line 3641 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -3795,299 +3791,9 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a 
program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_DLLTOOL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x 
"$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
 
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
-  { echo "$as_me:$LINENO: result: $DLLTOOL" >&5
-echo "${ECHO_T}$DLLTOOL" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
-  ac_ct_DLLTOOL=$DLLTOOL
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_DLLTOOL"; then
-  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x 
"$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
-echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_DLLTOOL" = x; then
-    DLLTOOL="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect 
cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to [EMAIL PROTECTED]" >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to [EMAIL PROTECTED]" >&2;}
-ac_tool_warned=yes ;;
 esac
-    DLLTOOL=$ac_ct_DLLTOOL
-  fi
-else
-  DLLTOOL="$ac_cv_prog_DLLTOOL"
-fi
 
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}as", so it can be a program 
name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_AS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x 
"$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AS="${ac_tool_prefix}as"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AS=$ac_cv_prog_AS
-if test -n "$AS"; then
-  { echo "$as_me:$LINENO: result: $AS" >&5
-echo "${ECHO_T}$AS" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_AS"; then
-  ac_ct_AS=$AS
-  # Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_AS"; then
-  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x 
"$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_AS="as"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AS=$ac_cv_prog_ac_ct_AS
-if test -n "$ac_ct_AS"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
-echo "${ECHO_T}$ac_ct_AS" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_AS" = x; then
-    AS="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect 
cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to [EMAIL PROTECTED]" >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to [EMAIL PROTECTED]" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AS=$ac_ct_AS
-  fi
-else
-  AS="$ac_cv_prog_AS"
-fi
-
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a 
program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x 
"$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
-  { echo "$as_me:$LINENO: result: $OBJDUMP" >&5
-echo "${ECHO_T}$OBJDUMP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
-  ac_ct_OBJDUMP=$OBJDUMP
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_OBJDUMP"; then
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x 
"$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
-echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect 
cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to [EMAIL PROTECTED]" >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to [EMAIL PROTECTED]" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJDUMP=$ac_ct_OBJDUMP
-  fi
-else
-  OBJDUMP="$ac_cv_prog_OBJDUMP"
-fi
-
-  ;;
-
-esac
-
 need_locks="$enable_libtool_lock"
 
 
@@ -6359,7 +6065,7 @@
 esac
 
 enable_dlopen=no
-enable_win32_dll=yes
+enable_win32_dll=no
 
 # Check whether --enable-libtool-lock was given.
 if test "${enable_libtool_lock+set}" = set; then
@@ -6494,11 +6200,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6497: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6203: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6501: \$? = $ac_status" >&5
+   echo "$as_me:6207: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -6727,11 +6433,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6730: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6436: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6734: \$? = $ac_status" >&5
+   echo "$as_me:6440: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -6787,11 +6493,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6790: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6496: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6794: \$? = $ac_status" >&5
+   echo "$as_me:6500: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8947,7 +8653,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8950 "configure"
+#line 8656 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9045,7 +8751,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9048 "configure"
+#line 8754 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11220,11 +10926,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11223: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10929: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11227: \$? = $ac_status" >&5
+   echo "$as_me:10933: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -11280,11 +10986,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11283: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10989: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11287: \$? = $ac_status" >&5
+   echo "$as_me:10993: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12623,7 +12329,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12626 "configure"
+#line 12332 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12721,7 +12427,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12724 "configure"
+#line 12430 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13548,11 +13254,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13551: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13257: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13555: \$? = $ac_status" >&5
+   echo "$as_me:13261: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -13608,11 +13314,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13611: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13317: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13615: \$? = $ac_status" >&5
+   echo "$as_me:13321: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15650,11 +15356,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15653: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15359: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15657: \$? = $ac_status" >&5
+   echo "$as_me:15363: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15883,11 +15589,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15886: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15592: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15890: \$? = $ac_status" >&5
+   echo "$as_me:15596: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15943,11 +15649,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15946: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15652: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15950: \$? = $ac_status" >&5
+   echo "$as_me:15656: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18103,7 +17809,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 18106 "configure"
+#line 17812 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18201,7 +17907,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 18204 "configure"
+#line 17910 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -19342,13 +19048,7 @@
 : ${installuser:=root}
 
 
-case `uname` in
-CYGWIN*)
-  installuser=`whoami`
-  ;;
-esac
 
-
 { echo "$as_me:$LINENO: checking for openpty in -lutil" >&5
 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6; }
 if test "${ac_cv_lib_util_openpty+set}" = set; then
@@ -19415,6 +19115,8 @@
 fi
 
 
+
+
 # Extract the first word of "libopenvas-config", so it can be a program name 
with args.
 set dummy libopenvas-config; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -19455,6 +19157,61 @@
 fi
 
 
+
+test "x$LIBOPENVASCONFIG" = x && { { echo "$as_me:$LINENO: error: \"\"
+\"\"
+\"*** openvas-libraries is not installed ! You need to install it before you\"
+\"compile openvas-server.\"" >&5
+echo "$as_me: error: \"\"
+\"\"
+\"*** openvas-libraries is not installed ! You need to install it before you\"
+\"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 "openvasd-config", so it can be a program name 
with args.
 set dummy openvasd-config; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -19522,7 +19279,100 @@
 CFLAGS="$CFLAGS `$OPENVASDCONFIG --cflags` `$LIBOPENVASCONFIG --cflags`"
 LIBS="$LIBS `$LIBOPENVASCONFIG --libs`"
 
+# Extract the first word of "openvasd-config", so it can be a program name 
with args.
+set dummy openvasd-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_OPENVASDCONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $OPENVASDCONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_OPENVASDCONFIG="$OPENVASDCONFIG" # Let the user override the test 
with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $XPATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x 
"$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_OPENVASDCONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
+  ;;
+esac
+fi
+OPENVASDCONFIG=$ac_cv_path_OPENVASDCONFIG
+if test -n "$OPENVASDCONFIG"; then
+  { echo "$as_me:$LINENO: result: $OPENVASDCONFIG" >&5
+echo "${ECHO_T}$OPENVASDCONFIG" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+
+test "x$OPENVASDCONFIG" = x && { { echo "$as_me:$LINENO: error: \"\"
+\"\"
+\"*** openvas-server is not installed ! You need to install it before you\"
+\"compile openvas-plugins.\"" >&5
+echo "$as_me: error: \"\"
+\"\"
+\"*** openvas-server is not installed ! You need to install it before you\"
+\"compile openvas-plugins.\"" >&2;}
+   { (exit 1); exit 1; }; }
+
+OPENVASD_VERSION=`$OPENVASDCONFIG --version`
+
+OPENVASD_MAJOR=`echo $OPENVASD_VERSION | \
+               sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
+OPENVASD_MINOR=`echo $OPENVASD_VERSION | \
+               sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
+OPENVASD_PATCH=`echo $OPENVASD_VERSION | \
+               sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'`
+REQ_OPENVASD_MAJOR=`echo $NEED_OPENVASD_VERSION | \
+               sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
+REQ_OPENVASD_MINOR=`echo $NEED_OPENVASD_VERSION | \
+               sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
+REQ_OPENVASD_PATCH=`echo $NEED_OPENVASD_VERSION | \
+               sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'`
+
+
+ok=no
+if test "$OPENVASD_MAJOR" -gt "$REQ_OPENVASD_MAJOR"; then
+  ok=yes
+else
+  if test "$OPENVASD_MAJOR" -eq "$REQ_OPENVASD_MAJOR"; then
+    if test "$OPENVASD_MINOR" -gt "$REQ_OPENVASD_MINOR"; then
+      ok=yes
+    else
+      if test "$OPENVASD_MINOR" -eq "$REQ_OPENVASD_MINOR"; then
+        if test "$OPENVASD_PATCH" -ge "$REQ_OPENVASD_PATCH"; then
+          ok=yes
+        fi
+      fi
+    fi
+  fi
+fi
+if test $ok = no; then
+{ { echo "$as_me:$LINENO: error: openvas-server $OPENVASD_VERSION too old.
+Minimum required is $NEED_OPENVASD_VERSION .
+" >&5
+echo "$as_me: error: openvas-server $OPENVASD_VERSION too old.
+Minimum required is $NEED_OPENVASD_VERSION .
+" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
 test "x$prefix" = xNONE && prefix=/usr/local
 # Extract the first word of "cp", so it can be a program name with args.
 set dummy cp; ac_word=$2
@@ -20664,9 +20514,6 @@
 AR!$AR$ac_delim
 RANLIB!$RANLIB$ac_delim
 STRIP!$STRIP$ac_delim
-DLLTOOL!$DLLTOOL$ac_delim
-AS!$AS$ac_delim
-OBJDUMP!$OBJDUMP$ac_delim
 CPP!$CPP$ac_delim
 CXX!$CXX$ac_delim
 CXXFLAGS!$CXXFLAGS$ac_delim
@@ -20698,7 +20545,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

Modified: trunk/openvas-plugins/configure.in
===================================================================
--- trunk/openvas-plugins/configure.in  2007-11-07 11:14:07 UTC (rev 539)
+++ trunk/openvas-plugins/configure.in  2007-11-07 12:00:23 UTC (rev 540)
@@ -1,11 +1,31 @@
+dnl OpenVAS
+dnl $Id$
+dnl Description: autoconf script for the OpenVAS-plugins
 dnl
-dnl autoconf script for openvas-plugins
+dnl Authors:
+dnl Renaud Deraison <[EMAIL PROTECTED]> (Original pre-fork development)
 dnl
+dnl Copyright:
+dnl Based on work Copyright (C) 1998 - 2006 Tenable Network Security, Inc.
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License version 2,
+dnl as published by the Free Software Foundation
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-
 AC_INIT(.root-dir)
 AC_REVISION($Revision$)dnl
 
+NEED_OPENVASLIBS_VERSION=1.0.0
+NEED_OPENVASD_VERSION=0.9.2
 
 dnl Set up the main lines of the config script
 AC_PREFIX_DEFAULT("/usr/local")
@@ -15,9 +35,7 @@
 
 AC_LANG_C
 AC_PROG_CC
-#AC_CONFIG_HEADER()
 
-AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
@@ -41,18 +59,63 @@
 : ${installuser:=root}
 
 
-case `uname` in
-CYGWIN*)
-  installuser=`whoami`
-  ;;
-esac
 
-
 dnl containing funny things, like openpty, forkpty
 dnl this library is deprecated because of portability
 AC_CHECK_LIB(util, openpty, LIBUTIL="-lutil")
 
+
+dnl Check for openvas-libraries
+
 AC_PATH_PROG(LIBOPENVASCONFIG, libopenvas-config,,$XPATH)
+
+test "x$LIBOPENVASCONFIG" = x && AC_ERROR(""
+""
+"*** openvas-libraries is not installed ! You need to install it before you"
+"compile openvas-server.")
+
+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
+AC_ERROR(
+openvas-libraries $OPENVASLIBS_VERSION too old.
+Minimum required is $NEED_OPENVASLIBS_VERSION .
+)
+fi
+
+
+dnl Check for openvas-server
+
 AC_PATH_PROG(OPENVASDCONFIG, openvasd-config,,$XPATH)
 
 test "x$LIBOPENVASCONFIG" = x && AC_ERROR(""
@@ -70,7 +133,53 @@
 CFLAGS="$CFLAGS `$OPENVASDCONFIG --cflags` `$LIBOPENVASCONFIG --cflags`"
 LIBS="$LIBS `$LIBOPENVASCONFIG --libs`"
 
+AC_PATH_PROG(OPENVASDCONFIG, openvasd-config,,$XPATH)
 
+test "x$OPENVASDCONFIG" = x && AC_ERROR(""
+""
+"*** openvas-server is not installed ! You need to install it before you"
+"compile openvas-plugins.")
+
+OPENVASD_VERSION=`$OPENVASDCONFIG --version`
+
+OPENVASD_MAJOR=`echo $OPENVASD_VERSION | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
+OPENVASD_MINOR=`echo $OPENVASD_VERSION | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
+OPENVASD_PATCH=`echo $OPENVASD_VERSION | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
+REQ_OPENVASD_MAJOR=`echo $NEED_OPENVASD_VERSION | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
+REQ_OPENVASD_MINOR=`echo $NEED_OPENVASD_VERSION | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
+REQ_OPENVASD_PATCH=`echo $NEED_OPENVASD_VERSION | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
+
+
+ok=no
+if test "$OPENVASD_MAJOR" -gt "$REQ_OPENVASD_MAJOR"; then
+  ok=yes
+else
+  if test "$OPENVASD_MAJOR" -eq "$REQ_OPENVASD_MAJOR"; then
+    if test "$OPENVASD_MINOR" -gt "$REQ_OPENVASD_MINOR"; then
+      ok=yes
+    else
+      if test "$OPENVASD_MINOR" -eq "$REQ_OPENVASD_MINOR"; then
+        if test "$OPENVASD_PATCH" -ge "$REQ_OPENVASD_PATCH"; then
+          ok=yes
+        fi
+      fi
+    fi
+  fi
+fi
+if test $ok = no; then
+AC_ERROR(
+openvas-server $OPENVASD_VERSION too old.
+Minimum required is $NEED_OPENVASD_VERSION .
+)
+fi
+
+
 test "x$prefix" = xNONE && prefix=/usr/local
 AC_PATH_PROG(CP, cp)
 AC_PATH_PROG(MV, mv)

_______________________________________________
Openvas-commits mailing list
[email protected]
http://lists.wald.intevation.org/mailman/listinfo/openvas-commits

Reply via email to