[Openvas-commits] r6080 - trunk/gsa

[scm-commit@wald.intevation.org]

Author: felix
Date: 2009-12-07 15:20:51 +0100 (Mon, 07 Dec 2009)
New Revision: 6080

Modified:
   trunk/gsa/CMakeLists.txt
   trunk/gsa/ChangeLog
Log:
* CMakeLists.txt: Improved checks for pkg-config and libopenvas-config,
Intention was to first collect missing tools and then report on them to
avoid configure-install cycles.



Modified: trunk/gsa/CMakeLists.txt
===================================================================
--- trunk/gsa/CMakeLists.txt	2009-12-07 14:16:33 UTC (rev 6079)
+++ trunk/gsa/CMakeLists.txt	2009-12-07 14:20:51 UTC (rev 6080)
@@ -39,7 +39,7 @@
 
 SET (MANDATORY_TOOL_MISSING FALSE)
 
-FIND_PROGRAM(PATH_TO_PKGCONFIG pkgo-config DOC "pkg-config program to retrieve "
+FIND_PROGRAM(PATH_TO_PKGCONFIG pkg-config DOC "pkg-config program to retrieve "
                         "information about installed libraries in the system.")
 
 FIND_PROGRAM(PATH_TO_LIBOPENVASCONFIG libopenvas-config DOC "libopenvas-config program"
@@ -57,14 +57,14 @@
 ENDIF(NOT PATH_TO_LIBOPENVASCONFIG)
 
 IF(MANDATORY_TOOL_MISSING)
-  MESSAGE("One or more tools or libraries could not be found on your system:")
   IF(NOT PATH_TO_PKGCONFIG)
-    MESSAGE(FATAL_ERROR "  - The pkg-config tool is required.")
+    MESSAGE("The pkg-config tool is required.")
   ENDIF(NOT PATH_TO_PKGCONFIG)
   IF(NOT PATH_TO_LIBOPENVASCONFIG)
-     MESSAGE(FATAL_ERROR "  - The libopenvas-config tool is required (part of "
-                         "openvas-libraries).")
+     MESSAGE("The libopenvas-config tool is required (part of openvas-libraries).")
   ENDIF(NOT PATH_TO_LIBOPENVASCONFIG)
+  MESSAGE(FATAL_ERROR "One or more tools or libraries could not be found on "
+                      "your system. Please check the logs above.")
 ENDIF(MANDATORY_TOOL_MISSING)
 
 # TODO: Check for libmicrohttpd, rats, flawfinder, splint, doxygen.

Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog	2009-12-07 14:16:33 UTC (rev 6079)
+++ trunk/gsa/ChangeLog	2009-12-07 14:20:51 UTC (rev 6080)
@@ -1,5 +1,11 @@
 2009-12-07  Felix Wolfsteller <felix.wolfsteller at intevation.de>
 
+	* CMakeLists.txt: Improved checks for pkg-config and libopenvas-config,
+	Intention was to first collect missing tools and then report on them to
+	avoid configure-install cycles.
+
+2009-12-07  Felix Wolfsteller <felix.wolfsteller at intevation.de>
+
 	* CMakeLists.txt: Added checks for pkg-config and libopenvas-config.
 
 2009-12-03  Michael Wiegand <michael.wiegand at intevation.de>