# HG changeset patch
# User Sebastien Decugis <sdecugis@nict.go.jp>
# Date 1272350781 -32400
# Node ID f433bc04eb6a834591d0245e9f216f9563fca6a0
# Parent  3db90f9ce42fd1ab0bf0562cbd00688ed7929e6c
Renamed module to align with distribution shiped file

diff -r 3db90f9ce42f -r f433bc04eb6a cmake/Modules/FindGNUTLS.cmake
--- a/cmake/Modules/FindGNUTLS.cmake	Tue Apr 27 11:19:28 2010 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-# - Find gnutls
-# Find the native GNUTLS includes and library
-#
-#  GNUTLS_FOUND - True if gnutls found.
-#  GNUTLS_INCLUDE_DIRS - where to find gnutls.h, etc.
-#  GNUTLS_LIBRARIES - List of libraries when using gnutls.
-
-if (GNUTLS_INCLUDE_DIRS)
-  set(GNUTLS_FIND_QUIETLY TRUE)
-endif (GNUTLS_INCLUDE_DIRS)
-
-# Include dir
-find_path(GNUTLS_INCLUDE_DIR
-	NAMES
-	  gnutls.h
-	  gnutls/gnutls.h
-)
-
-# Library
-find_library(GNUTLS_LIBRARY 
-  NAMES gnutls
-)
-
-# handle the QUIETLY and REQUIRED arguments and set GNUTLS_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNUTLS DEFAULT_MSG GNUTLS_LIBRARY GNUTLS_INCLUDE_DIR)
-
-IF(GNUTLS_FOUND)
-  SET( GNUTLS_LIBRARIES ${GNUTLS_LIBRARY} )
-ELSE(GNUTLS_FOUND)
-  SET( GNUTLS_LIBRARIES )
-ENDIF(GNUTLS_FOUND)
-
-# Lastly make it so that the GNUTLS_LIBRARY and GNUTLS_INCLUDE_DIR variables
-# only show up under the advanced options in the gui cmake applications.
-MARK_AS_ADVANCED( GNUTLS_LIBRARIES GNUTLS_INCLUDE_DIRS )
diff -r 3db90f9ce42f -r f433bc04eb6a cmake/Modules/FindGnuTLS.cmake
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cmake/Modules/FindGnuTLS.cmake	Tue Apr 27 15:46:21 2010 +0900
@@ -0,0 +1,37 @@
+# - Find gnutls
+# Find the native GNUTLS includes and library
+#
+#  GNUTLS_FOUND - True if gnutls found.
+#  GNUTLS_INCLUDE_DIRS - where to find gnutls.h, etc.
+#  GNUTLS_LIBRARIES - List of libraries when using gnutls.
+
+if (GNUTLS_INCLUDE_DIRS)
+  set(GNUTLS_FIND_QUIETLY TRUE)
+endif (GNUTLS_INCLUDE_DIRS)
+
+# Include dir
+find_path(GNUTLS_INCLUDE_DIR
+	NAMES
+	  gnutls.h
+	  gnutls/gnutls.h
+)
+
+# Library
+find_library(GNUTLS_LIBRARY 
+  NAMES gnutls
+)
+
+# handle the QUIETLY and REQUIRED arguments and set GNUTLS_FOUND to TRUE if 
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNUTLS DEFAULT_MSG GNUTLS_LIBRARY GNUTLS_INCLUDE_DIR)
+
+IF(GNUTLS_FOUND)
+  SET( GNUTLS_LIBRARIES ${GNUTLS_LIBRARY} )
+ELSE(GNUTLS_FOUND)
+  SET( GNUTLS_LIBRARIES )
+ENDIF(GNUTLS_FOUND)
+
+# Lastly make it so that the GNUTLS_LIBRARY and GNUTLS_INCLUDE_DIR variables
+# only show up under the advanced options in the gui cmake applications.
+MARK_AS_ADVANCED( GNUTLS_LIBRARIES GNUTLS_INCLUDE_DIRS )
diff -r 3db90f9ce42f -r f433bc04eb6a extensions/CMakeLists.txt
--- a/extensions/CMakeLists.txt	Tue Apr 27 11:19:28 2010 +0900
+++ b/extensions/CMakeLists.txt	Tue Apr 27 15:46:21 2010 +0900
@@ -13,7 +13,7 @@
 ENDMACRO(FD_ADD_EXTENSION)
 
 # The extensions include the headers of freeDiameter that contains gnutls objects
-FIND_PACKAGE(GNUTLS REQUIRED)
+FIND_PACKAGE(GnuTLS REQUIRED)
 INCLUDE_DIRECTORIES(${GNUTLS_INCLUDE_DIRS})
 find_path(GCRYPT_INCLUDE_DIR NAMES gcrypt.h)
 If ( NOT GCRYPT_INCLUDE_DIR )
@@ -47,6 +47,11 @@
 	   SUBDIRS(app_radgw)
 	ENDIF (BUILD_APP_RADGW)
 
+OPTION(BUILD_APP_ACCT "Build app_acct? (simple accounting application that stores accounting records in flat database)" OFF)
+	IF (BUILD_APP_ACCT)
+	   SUBDIRS(app_acct)
+	ENDIF (BUILD_APP_ACCT)
+
 
 
 ####
diff -r 3db90f9ce42f -r f433bc04eb6a freeDiameter/CMakeLists.txt
--- a/freeDiameter/CMakeLists.txt	Tue Apr 27 11:19:28 2010 +0900
+++ b/freeDiameter/CMakeLists.txt	Tue Apr 27 15:46:21 2010 +0900
@@ -44,7 +44,7 @@
 	)
 
 # Require GNU TLS for building the daemon
-FIND_PACKAGE(GNUTLS REQUIRED)
+FIND_PACKAGE(GnuTLS REQUIRED)
 INCLUDE_DIRECTORIES(${GNUTLS_INCLUDE_DIRS})
 SET(FD_LIBS ${FD_LIBS} ${GNUTLS_LIBRARIES})
 find_path(GCRYPT_INCLUDE_DIR NAMES gcrypt.h)