Author: jan
Date: 2007-08-03 01:18:23 +0200 (Fri, 03 Aug 2007)
New Revision: 361
Modified:
trunk/openvas-libraries/ChangeLog
trunk/openvas-libraries/configure
trunk/openvas-libraries/configure.in
trunk/openvas-libraries/include/libvers.h.in
trunk/openvas-libraries/libopenvas/plugutils.c
trunk/openvas-libraries/openvas-libraries.tmpl.in
Log:
* configure.in, openvas-libraries.tmpl.in, include/libvers.h.in,
libopenvas/plugutils.c: Replaced NESSUS_MAJOR etc. by
OPENVASLIBS_MAJOR etc. as well as NL_MAJOR etc. by
OPENVASLIBS_MAJOR etc.
* configure: updated.
Modified: trunk/openvas-libraries/ChangeLog
===================================================================
--- trunk/openvas-libraries/ChangeLog 2007-08-02 22:00:50 UTC (rev 360)
+++ trunk/openvas-libraries/ChangeLog 2007-08-02 23:18:23 UTC (rev 361)
@@ -1,3 +1,12 @@
+2007-08-03 Jan-Oliver Wagner <[EMAIL PROTECTED]>
+
+ * configure.in, openvas-libraries.tmpl.in, include/libvers.h.in,
+ libopenvas/plugutils.c: Replaced NESSUS_MAJOR etc. by
+ OPENVASLIBS_MAJOR etc. as well as NL_MAJOR etc. by
+ OPENVASLIBS_MAJOR etc.
+
+ * configure: updated.
+
2007-08-02 Jan-Oliver Wagner <[EMAIL PROTECTED]>
* libopenvas/plugutils.c, libopenvas/scanners_utils.c,
Modified: trunk/openvas-libraries/configure
===================================================================
--- trunk/openvas-libraries/configure 2007-08-02 22:00:50 UTC (rev 360)
+++ trunk/openvas-libraries/configure 2007-08-02 23:18:23 UTC (rev 361)
@@ -852,11 +852,11 @@
version
egdpath
debug_ssl
-NESSUS_MAJOR
-NESSUS_MINOR
-NESSUS_SUPER
-NESSUS_PATCH
-NESSUS_DATE
+OPENVASLIBS_MAJOR
+OPENVASLIBS_MINOR
+OPENVASLIBS_SUPER
+OPENVASLIBS_PATCH
+OPENVASLIBS_DATE
VERSION
ac_configure_args
LIBOBJS
@@ -1903,17 +1903,17 @@
VERSION=`cat VERSION`
save_IFS="${IFS}"
IFS=.
-read NESSUS_MAJOR NESSUS_MINOR NESSUS_PATCH NESSUS_RC <VERSION
+read OPENVASLIBS_MAJOR OPENVASLIBS_MINOR OPENVASLIBS_PATCH OPENVASLIBS_RC
<VERSION
IFS="${save_IFS}"
-NESSUS_DATE=\"`date '+%b %d, %Y'`\"
-expr 0 + $NESSUS_MAJOR + $NESSUS_MINOR + $NESSUS_PATCH + 0 >/dev/null ||
+OPENVASLIBS_DATE=\"`date '+%b %d, %Y'`\"
+expr 0 + $OPENVASLIBS_MAJOR + $OPENVASLIBS_MINOR + $OPENVASLIBS_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=$OPENVASLIBS_MAJOR.$OPENVASLIBS_MINOR.$OPENVASLIBS_PATCH
-NESSUS_SUPER=`expr $NESSUS_MAJOR + $NESSUS_MINOR`
+OPENVASLIBS_SUPER=`expr $OPENVASLIBS_MAJOR + $OPENVASLIBS_MINOR`
ac_config_headers="$ac_config_headers include/config.h"
@@ -14921,11 +14921,11 @@
version!$version$ac_delim
egdpath!$egdpath$ac_delim
debug_ssl!$debug_ssl$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
+OPENVASLIBS_MAJOR!$OPENVASLIBS_MAJOR$ac_delim
+OPENVASLIBS_MINOR!$OPENVASLIBS_MINOR$ac_delim
+OPENVASLIBS_SUPER!$OPENVASLIBS_SUPER$ac_delim
+OPENVASLIBS_PATCH!$OPENVASLIBS_PATCH$ac_delim
+OPENVASLIBS_DATE!$OPENVASLIBS_DATE$ac_delim
VERSION!$VERSION$ac_delim
ac_configure_args!$ac_configure_args$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
Modified: trunk/openvas-libraries/configure.in
===================================================================
--- trunk/openvas-libraries/configure.in 2007-08-02 22:00:50 UTC (rev
360)
+++ trunk/openvas-libraries/configure.in 2007-08-02 23:18:23 UTC (rev
361)
@@ -34,16 +34,16 @@
VERSION=`cat VERSION`
save_IFS="${IFS}"
IFS=.
-read NESSUS_MAJOR NESSUS_MINOR NESSUS_PATCH NESSUS_RC <VERSION
+read OPENVASLIBS_MAJOR OPENVASLIBS_MINOR OPENVASLIBS_PATCH OPENVASLIBS_RC
<VERSION
IFS="${save_IFS}"
-NESSUS_DATE=\"`date '+%b %d, %Y'`\"
-expr 0 + $NESSUS_MAJOR + $NESSUS_MINOR + $NESSUS_PATCH + 0 >/dev/null ||
+OPENVASLIBS_DATE=\"`date '+%b %d, %Y'`\"
+expr 0 + $OPENVASLIBS_MAJOR + $OPENVASLIBS_MINOR + $OPENVASLIBS_PATCH + 0
>/dev/null ||
AC_MSG_ERROR([ *** Panic: Corrupt version file])
-version=$NESSUS_MAJOR.$NESSUS_MINOR.$NESSUS_PATCH
+version=$OPENVASLIBS_MAJOR.$OPENVASLIBS_MINOR.$OPENVASLIBS_PATCH
dnl A tribute to libtool: more fiddling around wirh versions
-NESSUS_SUPER=`expr $NESSUS_MAJOR + $NESSUS_MINOR`
+OPENVASLIBS_SUPER=`expr $OPENVASLIBS_MAJOR + $OPENVASLIBS_MINOR`
dnl Set up the main lines of the config script
AC_CONFIG_HEADER(include/config.h)
@@ -537,11 +537,11 @@
AC_SUBST(version)
AC_SUBST(egdpath)
AC_SUBST(debug_ssl)
-AC_SUBST(NESSUS_MAJOR)
-AC_SUBST(NESSUS_MINOR)
-AC_SUBST(NESSUS_SUPER)
-AC_SUBST(NESSUS_PATCH)
-AC_SUBST(NESSUS_DATE)
+AC_SUBST(OPENVASLIBS_MAJOR)
+AC_SUBST(OPENVASLIBS_MINOR)
+AC_SUBST(OPENVASLIBS_SUPER)
+AC_SUBST(OPENVASLIBS_PATCH)
+AC_SUBST(OPENVASLIBS_DATE)
AC_SUBST(VERSION)
AC_SUBST(ac_configure_args)
Modified: trunk/openvas-libraries/include/libvers.h.in
===================================================================
--- trunk/openvas-libraries/include/libvers.h.in 2007-08-02 22:00:50 UTC
(rev 360)
+++ trunk/openvas-libraries/include/libvers.h.in 2007-08-02 23:18:23 UTC
(rev 361)
@@ -16,8 +16,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#define NL_MAJOR @NESSUS_MAJOR@
-#define NL_MINOR @NESSUS_MINOR@
-#define NL_REV @NESSUS_PATCH@
-#define NL_DATE @NESSUS_DATE@
+#define OPENVASLIBS_MAJOR @OPENVASLIBS_MAJOR@
+#define OPENVASLIBS_MINOR @OPENVASLIBS_MINOR@
+#define OPENVASLIBS_REV @OPENVASLIBS_PATCH@
+#define OPENVASLIBS_DATE @OPENVASLIBS_DATE@
#define VERSION "@VERSION@"
Modified: trunk/openvas-libraries/libopenvas/plugutils.c
===================================================================
--- trunk/openvas-libraries/libopenvas/plugutils.c 2007-08-02 22:00:50 UTC
(rev 360)
+++ trunk/openvas-libraries/libopenvas/plugutils.c 2007-08-02 23:18:23 UTC
(rev 361)
@@ -52,9 +52,9 @@
void nessus_lib_version(major, minor, rev)
int * major, *minor, *rev;
{
- *major = NL_MAJOR;
- *minor = NL_MINOR;
- *rev = NL_REV;
+ *major = OPENVASLIBS_MAJOR;
+ *minor = OPENVASLIBS_MINOR;
+ *rev = OPENVASLIBS_REV;
}
#ifdef USE_PTHREADS
Modified: trunk/openvas-libraries/openvas-libraries.tmpl.in
===================================================================
--- trunk/openvas-libraries/openvas-libraries.tmpl.in 2007-08-02 22:00:50 UTC
(rev 360)
+++ trunk/openvas-libraries/openvas-libraries.tmpl.in 2007-08-02 23:18:23 UTC
(rev 361)
@@ -71,4 +71,4 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-PACKAGE_VERSION = @NESSUS_SUPER@:@NESSUS_PATCH@:@NESSUS_MINOR@
+PACKAGE_VERSION = @OPENVASLIBS_SUPER@:@OPENVASLIBS_PATCH@:@OPENVASLIBS_MINOR@
_______________________________________________
Openvas-commits mailing list
[email protected]
http://lists.wald.intevation.org/mailman/listinfo/openvas-commits
