Index: FindXMLRPC.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindXMLRPC.cmake,v
retrieving revision 1.3
diff -b -u -p -r1.3 FindXMLRPC.cmake
--- FindXMLRPC.cmake	9 Jun 2008 20:04:06 -0000	1.3
+++ FindXMLRPC.cmake	4 Jul 2008 17:04:05 -0000
@@ -12,18 +12,13 @@
 # Typical usage:
 #  FIND_PACKAGE(XMLRPC REQUIRED libwww-client)
 
+SET(FAIL_MSG DEFAULT_MSG)
+
 # First find the config script from which to obtain other values.
 FIND_PROGRAM(XMLRPC_C_CONFIG NAMES xmlrpc-c-config)
 
-# Check whether we found anything.
-IF(XMLRPC_C_CONFIG)
-  SET(XMLRPC_FOUND 1)
-ELSE(XMLRPC_C_CONFIG)
-  SET(XMLRPC_FOUND 0)
-ENDIF(XMLRPC_C_CONFIG)
-
 # Lookup the include directories needed for the components requested.
-IF(XMLRPC_FOUND)
+IF(XMLRPC_C_CONFIG)
   # Use the newer EXECUTE_PROCESS command if it is available.
   IF(COMMAND EXECUTE_PROCESS)
     EXECUTE_PROCESS(
@@ -55,13 +50,12 @@ IF(XMLRPC_FOUND)
       ENDIF("${flag}" MATCHES "^-I")
     ENDFOREACH(flag)
   ELSE("${XMLRPC_C_CONFIG_RESULT}" MATCHES "^0$")
-    MESSAGE("Error running ${XMLRPC_C_CONFIG}: [${XMLRPC_C_CONFIG_RESULT}]")
-    SET(XMLRPC_FOUND 0)
+    SET(FAIL_MSG "Error running ${XMLRPC_C_CONFIG}: [${XMLRPC_C_CONFIG_RESULT}]")
   ENDIF("${XMLRPC_C_CONFIG_RESULT}" MATCHES "^0$")
-ENDIF(XMLRPC_FOUND)
+ENDIF(XMLRPC_C_CONFIG)
 
 # Lookup the libraries needed for the components requested.
-IF(XMLRPC_FOUND)
+IF(XMLRPC_C_CONFIG)
   # Use the newer EXECUTE_PROCESS command if it is available.
   IF(COMMAND EXECUTE_PROCESS)
     EXECUTE_PROCESS(
@@ -97,6 +91,7 @@ IF(XMLRPC_FOUND)
     ENDFOREACH(flag)
 
     # Search for each library needed using the directories given.
+    SET(XMLRPC_FOUND TRUE)
     FOREACH(name ${XMLRPC_LIBRARY_NAMES})
       # Look for this library.
       FIND_LIBRARY(XMLRPC_${name}_LIBRARY
@@ -107,27 +102,20 @@ IF(XMLRPC_FOUND)
 
       # If any library is not found then the whole package is not found.
       IF(NOT XMLRPC_${name}_LIBRARY)
-        SET(XMLRPC_FOUND 0)
+        SET(XMLRPC_${name}_FOUND FALSE)
+        SET(XMLRPC_FOUND FALSE)
       ENDIF(NOT XMLRPC_${name}_LIBRARY)
 
       # Build an ordered list of all the libraries needed.
       SET(XMLRPC_LIBRARIES ${XMLRPC_LIBRARIES} "${XMLRPC_${name}_LIBRARY}")
     ENDFOREACH(name)
   ELSE("${XMLRPC_C_CONFIG_RESULT}" MATCHES "^0$")
-    MESSAGE("Error running ${XMLRPC_C_CONFIG}: [${XMLRPC_C_CONFIG_RESULT}]")
-    SET(XMLRPC_FOUND 0)
+    SET(FAIL_MSG "${FAIL_MSG}\nError running ${XMLRPC_C_CONFIG}: [${XMLRPC_C_CONFIG_RESULT}]")
   ENDIF("${XMLRPC_C_CONFIG_RESULT}" MATCHES "^0$")
-ENDIF(XMLRPC_FOUND)
+ENDIF(XMLRPC_C_CONFIG)
 
 # Report the results.
-IF(NOT XMLRPC_FOUND)
-  SET(XMLRPC_DIR_MESSAGE
-    "XMLRPC was not found. Make sure the entries XMLRPC_* are set.")
-  IF(NOT XMLRPC_FIND_QUIETLY)
-    MESSAGE(STATUS "${XMLRPC_DIR_MESSAGE}")
-  ELSE(NOT XMLRPC_FIND_QUIETLY)
-    IF(XMLRPC_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "${XMLRPC_DIR_MESSAGE}")
-    ENDIF(XMLRPC_FIND_REQUIRED)
-  ENDIF(NOT XMLRPC_FIND_QUIETLY)
-ENDIF(NOT XMLRPC_FOUND)
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(
+  XMLRPC "${FAIL_MSG}" XMLRPC_C_CONFIG XMLRPC_INCLUDE_DIRS XMLRPC_LIBRARIES XMLRPC_FOUND)
+