[prev in list] [next in list] [prev in thread] [next in thread]
List: openvas-cvs
Subject: [Openvas-commits] r965 - trunk/openvas-libraries
From: scm-commit () wald ! intevation ! org
Date: 2008-06-25 21:26:44
Message-ID: 20080625212644.01F734053F () pyrosoma ! intevation ! org
[Download RAW message or body]
Author: jan
Date: 2008-06-25 23:26:44 +0200 (Wed, 25 Jun 2008)
New Revision: 965
Added:
trunk/openvas-libraries/libopenvas-config.in
Removed:
trunk/openvas-libraries/libopenvas-config.pre.in
Modified:
trunk/openvas-libraries/ChangeLog
trunk/openvas-libraries/MANIFEST
trunk/openvas-libraries/Makefile
trunk/openvas-libraries/configure
trunk/openvas-libraries/configure.in
Log:
Simplify handling of libopenvas-config: The two-step
method is not necessary.
* libopenvas-config.pre.in: Removed. Renamed to
libopenvas-config.in.
* libopenvas-config.in: New. Former libopenvas-config.pre.in.
* configure.in: Process libopenvas-config.in instead of
libopenvas-config.pre.in.
* Makefile: Removed any processing of libopenvas-config.
* configure: Updated.
* MANIFEST: Updated.
Modified: trunk/openvas-libraries/ChangeLog
===================================================================
--- trunk/openvas-libraries/ChangeLog 2008-06-25 21:05:59 UTC (rev 964)
+++ trunk/openvas-libraries/ChangeLog 2008-06-25 21:26:44 UTC (rev 965)
@@ -1,5 +1,24 @@
2008-06-25 Jan-Oliver Wagner <jan-oliver.wagner@intevation.de>
+ Simplify handling of libopenvas-config: The two-step
+ method is not necessary.
+
+ * libopenvas-config.pre.in: Removed. Renamed to
+ libopenvas-config.in.
+
+ * libopenvas-config.in: New. Former libopenvas-config.pre.in.
+
+ * configure.in: Process libopenvas-config.in instead of
+ libopenvas-config.pre.in.
+
+ * Makefile: Removed any processing of libopenvas-config.
+
+ * configure: Updated.
+
+ * MANIFEST: Updated.
+
+2008-06-25 Jan-Oliver Wagner <jan-oliver.wagner@intevation.de>
+
Removing handling of "CIPHER" information because
the client-server communication is always encrypted.
Modified: trunk/openvas-libraries/MANIFEST
===================================================================
--- trunk/openvas-libraries/MANIFEST 2008-06-25 21:05:59 UTC (rev 964)
+++ trunk/openvas-libraries/MANIFEST 2008-06-25 21:26:44 UTC (rev 965)
@@ -44,7 +44,7 @@
libopenvas/bpf_share.c
libopenvas/comm.h
libopenvas-config.1
-libopenvas-config.pre.in
+libopenvas-config.in
libopenvas/COPYING
libopenvas/ftp_funcs.c
libopenvas/ftp_funcs.h
Modified: trunk/openvas-libraries/Makefile
===================================================================
--- trunk/openvas-libraries/Makefile 2008-06-25 21:05:59 UTC (rev 964)
+++ trunk/openvas-libraries/Makefile 2008-06-25 21:26:44 UTC (rev 965)
@@ -27,20 +27,12 @@
include openvas-libraries.tmpl
-ALLDEPS = openvas-libraries.tmpl libopenvas-config
+ALLDEPS = openvas-libraries.tmpl
all: $(ALLDEPS)
cd libopenvas && ${MAKE}
cd libopenvas_hg && ${MAKE}
-libopenvas-config: libopenvas-config.pre Makefile openvas-libraries.tmpl
- @echo Creating $@ ...
- @eval LDFLAGS=\"$(CIPHER_LDFLAGS)\" ; \
- eval CFLAGS=\"$(CIPHER_CFLAGS)\" ; \
- sed -e 's?%CIPHER_LDFLAGS%?'"$$LDFLAGS"'?' \
- -e 's?%CIPHER_CFLAGS%?'"$$CFLAGS"'?' \
- libopenvas-config.pre >$@
-
openvas-libraries.tmpl: openvas-libraries.tmpl.in configure VERSION
$(SHELL) configure $(CONFIGURE_ARGS)
touch $@
Modified: trunk/openvas-libraries/configure
===================================================================
--- trunk/openvas-libraries/configure 2008-06-25 21:05:59 UTC (rev 964)
+++ trunk/openvas-libraries/configure 2008-06-25 21:26:44 UTC (rev 965)
@@ -14179,7 +14179,7 @@
-ac_config_files="$ac_config_files openvas-libraries.tmpl libopenvas-config.pre \
include/libvers.h" +ac_config_files="$ac_config_files openvas-libraries.tmpl \
libopenvas-config include/libvers.h"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -14736,7 +14736,7 @@
case $ac_config_target in
"include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;;
"openvas-libraries.tmpl") CONFIG_FILES="$CONFIG_FILES openvas-libraries.tmpl" ;;
- "libopenvas-config.pre") CONFIG_FILES="$CONFIG_FILES libopenvas-config.pre" ;;
+ "libopenvas-config") CONFIG_FILES="$CONFIG_FILES libopenvas-config" ;;
"include/libvers.h") CONFIG_FILES="$CONFIG_FILES include/libvers.h" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
Modified: trunk/openvas-libraries/configure.in
===================================================================
--- trunk/openvas-libraries/configure.in 2008-06-25 21:05:59 UTC (rev 964)
+++ trunk/openvas-libraries/configure.in 2008-06-25 21:26:44 UTC (rev 965)
@@ -517,7 +517,7 @@
AC_SUBST(ac_configure_args)
dnl And we put everything in THREE files
-AC_OUTPUT(openvas-libraries.tmpl libopenvas-config.pre include/libvers.h)
+AC_OUTPUT(openvas-libraries.tmpl libopenvas-config include/libvers.h)
AC_MSG_RESULT([
Configuration successful. Now type
Copied: trunk/openvas-libraries/libopenvas-config.in (from rev 964, \
trunk/openvas-libraries/libopenvas-config.pre.in)
Deleted: trunk/openvas-libraries/libopenvas-config.pre.in
===================================================================
--- trunk/openvas-libraries/libopenvas-config.pre.in 2008-06-25 21:05:59 UTC (rev \
964)
+++ trunk/openvas-libraries/libopenvas-config.pre.in 2008-06-25 21:26:44 UTC (rev \
965) @@ -1,81 +0,0 @@
-#!/bin/sh
-
-# OpenVAS
-# $Id$
-# Description: Configuration script for openvas-libraries
-#
-# Authors:
-# Renaud Deraison <deraison@nessus.org> (Original pre-fork development)
-#
-# Copyright:
-# Based on work Copyright (C) 1998 - 2007 Tenable Network Security, Inc.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2,
-# as published by the Free Software Foundation
-
-PREFIX=@prefix@
-LIBDIR=$PREFIX/lib
-INCLUDEDIR=$PREFIX/include
-VERSION=@version@
-EXTRA="@EXTRA@ @llib@"
-EGDPATH="@egdpath@"
-
-
-usage()
-{
- echo "Usage : libopenvas-config [ --cflags | --libs | --version | --egd ]"
- exit $1
-}
-
-
-test $# -gt 0 || usage 1
-
-
-# check whether we have echo -n, depending
-# on the current shell, used
-case `echo -n` in
-\-n) Xn= ; Xc='\c' ;;
-*) Xn=-n ; Xc=
-esac
-
-while test $# -gt 0; do
- case "$1" in
- --version)
- echo $VERSION
- exit 0
- ;;
- --libs)
-
- echo $Xn "-L$LIBDIR -lopenvas -lopenvas_hg $EXTRA $Xc"
- ;;
- --cflags)
- echo $Xn "$DEFS -I$INCLUDEDIR/openvas $Xc"
- ;;
- --egd)
- echo $Xn "$EGDPATH" $Xc
- ;;
- --help | -h)
- usage 0
- ;;
- *)
- usage 1
- ;;
- esac
- shift
-done
-
-echo
_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
http://lists.wald.intevation.org/mailman/listinfo/openvas-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic