[Openvas-commits] r387 - trunk/openvas-libnasl

[scm-commit@wald.intevation.org]

Author: jan
Date: 2007-09-13 15:44:40 +0200 (Thu, 13 Sep 2007)
New Revision: 387

Modified:
   trunk/openvas-libnasl/ChangeLog
   trunk/openvas-libnasl/configure
   trunk/openvas-libnasl/configure.in
   trunk/openvas-libnasl/nasl.tmpl.in
Log:
* configure.in, nasl.tmpl.in: Replaced NESSUS_MAJOR etc. by
OPENVASNASL_MAJOR etc.

* configure: updated.



Modified: trunk/openvas-libnasl/ChangeLog
===================================================================
--- trunk/openvas-libnasl/ChangeLog	2007-09-13 13:34:04 UTC (rev 386)
+++ trunk/openvas-libnasl/ChangeLog	2007-09-13 13:44:40 UTC (rev 387)
@@ -1,5 +1,12 @@
 2007-09-13  Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
 
+	* configure.in, nasl.tmpl.in: Replaced NESSUS_MAJOR etc. by
+	OPENVASNASL_MAJOR etc.
+
+	* configure: updated.
+
+2007-09-13  Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
+
 	* nasl/nasl_server.c: Fixed state_dir paths.
 
 	* TODO: OPENVAS_STATE_DIR.

Modified: trunk/openvas-libnasl/configure
===================================================================
--- trunk/openvas-libnasl/configure	2007-09-13 13:34:04 UTC (rev 386)
+++ trunk/openvas-libnasl/configure	2007-09-13 13:44:40 UTC (rev 387)
@@ -845,11 +845,11 @@
 PWDD
 INSTALL
 version
-NESSUS_MAJOR
-NESSUS_MINOR
-NESSUS_SUPER
-NESSUS_PATCH
-NESSUS_DATE
+OPENVASNASL_MAJOR
+OPENVASNASL_MINOR
+OPENVASNASL_SUPER
+OPENVASNASL_PATCH
+OPENVASNASL_DATE
 INSTALL_DIR
 rpcsvc_lib
 compat_lib
@@ -1889,16 +1889,16 @@
 
 save_IFS="${IFS}"
 IFS=.
-read NESSUS_MAJOR NESSUS_MINOR NESSUS_PATCH NESSUS_RC <VERSION
+read OPENVASNASL_MAJOR OPENVASNASL_MINOR OPENVASNASL_PATCH OPENVASNASL_RC <VERSION
 VERSION=`cat VERSION`
-NESSUS_SUPER=`expr $NESSUS_MAJOR + $NESSUS_MINOR`
+OPENVASNASL_SUPER=`expr $OPENVASNASL_MAJOR + $OPENVASNASL_MINOR`
 IFS="${save_IFS}"
-NESSUS_DATE=\"`date '+%b %d, %Y'`\"
-expr 0 + $NESSUS_MAJOR + $NESSUS_MINOR + $NESSUS_PATCH + 0 >/dev/null ||
+OPENVASNASL_DATE=\"`date '+%b %d, %Y'`\"
+expr 0 + $OPENVASNASL_MAJOR + $OPENVASNASL_MINOR + $OPENVASNASL_PATCH + 0 >/dev/null ||
 { { echo "$as_me:$LINENO: error:  *** Panic: Corrupt version file" >&5
 echo "$as_me: error:  *** Panic: Corrupt version file" >&2;}
    { (exit 1); exit 1; }; }
-version=$NESSUS_MAJOR.$NESSUS_MINOR.$NESSUS_PATCH
+version=$OPENVASNASL_MAJOR.$OPENVASNASL_MINOR.$OPENVASNASL_PATCH
 
 
 GCC_NO_PIPE=no
@@ -15408,11 +15408,11 @@
 PWDD!$PWDD$ac_delim
 INSTALL!$INSTALL$ac_delim
 version!$version$ac_delim
-NESSUS_MAJOR!$NESSUS_MAJOR$ac_delim
-NESSUS_MINOR!$NESSUS_MINOR$ac_delim
-NESSUS_SUPER!$NESSUS_SUPER$ac_delim
-NESSUS_PATCH!$NESSUS_PATCH$ac_delim
-NESSUS_DATE!$NESSUS_DATE$ac_delim
+OPENVASNASL_MAJOR!$OPENVASNASL_MAJOR$ac_delim
+OPENVASNASL_MINOR!$OPENVASNASL_MINOR$ac_delim
+OPENVASNASL_SUPER!$OPENVASNASL_SUPER$ac_delim
+OPENVASNASL_PATCH!$OPENVASNASL_PATCH$ac_delim
+OPENVASNASL_DATE!$OPENVASNASL_DATE$ac_delim
 INSTALL_DIR!$INSTALL_DIR$ac_delim
 rpcsvc_lib!$rpcsvc_lib$ac_delim
 compat_lib!$compat_lib$ac_delim

Modified: trunk/openvas-libnasl/configure.in
===================================================================
--- trunk/openvas-libnasl/configure.in	2007-09-13 13:34:04 UTC (rev 386)
+++ trunk/openvas-libnasl/configure.in	2007-09-13 13:44:40 UTC (rev 387)
@@ -39,14 +39,14 @@
 
 save_IFS="${IFS}"
 IFS=.
-read NESSUS_MAJOR NESSUS_MINOR NESSUS_PATCH NESSUS_RC <VERSION
+read OPENVASNASL_MAJOR OPENVASNASL_MINOR OPENVASNASL_PATCH OPENVASNASL_RC <VERSION
 VERSION=`cat VERSION`
-NESSUS_SUPER=`expr $NESSUS_MAJOR + $NESSUS_MINOR`
+OPENVASNASL_SUPER=`expr $OPENVASNASL_MAJOR + $OPENVASNASL_MINOR`
 IFS="${save_IFS}"
-NESSUS_DATE=\"`date '+%b %d, %Y'`\"
-expr 0 + $NESSUS_MAJOR + $NESSUS_MINOR + $NESSUS_PATCH + 0 >/dev/null ||
+OPENVASNASL_DATE=\"`date '+%b %d, %Y'`\"
+expr 0 + $OPENVASNASL_MAJOR + $OPENVASNASL_MINOR + $OPENVASNASL_PATCH + 0 >/dev/null ||
 AC_MSG_ERROR([ *** Panic: Corrupt version file])
-version=$NESSUS_MAJOR.$NESSUS_MINOR.$NESSUS_PATCH
+version=$OPENVASNASL_MAJOR.$OPENVASNASL_MINOR.$OPENVASNASL_PATCH
 
 
 GCC_NO_PIPE=no
@@ -455,11 +455,11 @@
 AC_SUBST(LIBOPENVASCONFIG)
 AC_SUBST(INSTALL)
 AC_SUBST(version)
-AC_SUBST(NESSUS_MAJOR)
-AC_SUBST(NESSUS_MINOR)
-AC_SUBST(NESSUS_SUPER)
-AC_SUBST(NESSUS_PATCH)
-AC_SUBST(NESSUS_DATE)
+AC_SUBST(OPENVASNASL_MAJOR)
+AC_SUBST(OPENVASNASL_MINOR)
+AC_SUBST(OPENVASNASL_SUPER)
+AC_SUBST(OPENVASNASL_PATCH)
+AC_SUBST(OPENVASNASL_DATE)
 AC_SUBST(INSTALL_DIR)
 AC_SUBST(rpcsvc_lib)  
 AC_SUBST(compat_lib)

Modified: trunk/openvas-libnasl/nasl.tmpl.in
===================================================================
--- trunk/openvas-libnasl/nasl.tmpl.in	2007-09-13 13:34:04 UTC (rev 386)
+++ trunk/openvas-libnasl/nasl.tmpl.in	2007-09-13 13:44:40 UTC (rev 387)
@@ -74,5 +74,5 @@
 LIBS=@LIBS@ $(RPCSVC) $(COMPAT)
 LIBTOOL=@LIBTOOL@ --silent
 RANLIB=@RANLIB@
-PACKAGE_VERSION=@NESSUS_SUPER@:@NESSUS_PATCH@:@NESSUS_MINOR@
+PACKAGE_VERSION=@OPENVASNASL_SUPER@:@OPENVASNASL_PATCH@:@OPENVASNASL_MINOR@
 VERSION=@VERSION@