--- a/INSTALL.Ubuntu	Fri Jul 02 12:09:18 2010 +0900
+++ b/INSTALL.Ubuntu	Fri Jul 02 12:52:25 2010 +0900
@@ -16,6 +16,7 @@
  mercurial gdb
  
 In order to build app_acct extension, you will also need the package libpq-dev.
+In order to build app_sip extension, you will also need the package libmysqlclient-dev.
 
 
 If your debhelper environment is recent (> 7.3.9 to provide cmake support), 

--- a/LICENSE	Fri Jul 02 12:09:18 2010 +0900
+++ b/LICENSE	Fri Jul 02 12:52:25 2010 +0900
@@ -34,6 +34,8 @@
 
 
 
-The extensions/dict_sip files have been contributed by Alexandre Westfahl 
-	-- see source file for copyright information.
+The following files have been contributed by Alexandre Westfahl, see source files for copyright information:
+  extensions/dict_sip/*
+  extensions/app_sip/*
+  extensions/app_radgw/rgwx_sip.c
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cmake/Modules/FindMySQL.cmake	Fri Jul 02 12:52:25 2010 +0900
@@ -0,0 +1,54 @@
+# - Find mysqlclient
+#
+# -*- cmake -*-
+#
+# Find the native MySQL includes and library
+#
+#  MySQL_INCLUDE_DIR - where to find mysql.h, etc.
+#  MySQL_LIBRARIES   - List of libraries when using MySQL.
+#  MySQL_FOUND       - True if MySQL found.
+
+IF (MySQL_INCLUDE_DIR AND MySQL_LIBRARIES)
+  # Already in cache, be silent
+  SET(MySQL_FIND_QUIETLY TRUE)
+ENDIF (MySQL_INCLUDE_DIR AND MySQL_LIBRARIES)
+
+# Include dir
+FIND_PATH(MySQL_INCLUDE_DIR 
+  NAMES mysql.h
+  PATH_SUFFIXES mysql
+)
+
+# Library
+SET(MySQL_NAMES mysqlclient mysqlclient_r)
+FIND_LIBRARY(MySQL_LIBRARY
+  NAMES ${MySQL_NAMES}
+  PATHS /usr/lib /usr/local/lib
+  PATH_SUFFIXES mysql
+)
+
+IF (MySQL_INCLUDE_DIR AND MySQL_LIBRARY)
+  SET(MySQL_FOUND TRUE)
+  SET( MySQL_LIBRARIES ${MySQL_LIBRARY} )
+ELSE (MySQL_INCLUDE_DIR AND MySQL_LIBRARY)
+  SET(MySQL_FOUND FALSE)
+  SET( MySQL_LIBRARIES )
+ENDIF (MySQL_INCLUDE_DIR AND MySQL_LIBRARY)
+
+
+# handle the QUIETLY and REQUIRED arguments and set MySQL_FOUND to TRUE if 
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MySQL DEFAULT_MSG MySQL_LIBRARY MySQL_INCLUDE_DIR)
+
+IF(MySQL_FOUND)
+  SET( MySQL_LIBRARIES ${MySQL_LIBRARY} )
+ELSE(MySQL_FOUND)
+  SET( MySQL_LIBRARIES )
+ENDIF(MySQL_FOUND)
+
+MARK_AS_ADVANCED(
+  MySQL_LIBRARY
+  MySQL_INCLUDE_DIR
+  )
+

--- a/extensions/CMakeLists.txt	Fri Jul 02 12:09:18 2010 +0900
+++ b/extensions/CMakeLists.txt	Fri Jul 02 12:52:25 2010 +0900
@@ -58,6 +58,11 @@
 	   SUBDIRS(app_acct)
 	ENDIF (BUILD_APP_ACCT)
 
+OPTION(BUILD_APP_SIP "Build app_sip? (Authentication and authorization for Diameter SIP RFC4740)" OFF)
+	IF (BUILD_APP_SIP)
+	   SUBDIRS(app_sip)
+	ENDIF (BUILD_APP_SIP)
+
 
 
 ####

--- a/extensions/app_sip/CMakeLists.txt	Fri Jul 02 12:09:18 2010 +0900
+++ b/extensions/app_sip/CMakeLists.txt	Fri Jul 02 12:52:25 2010 +0900
@@ -1,8 +1,8 @@
 # The dict_nasreq extension
 PROJECT("Diameter SIP Application (RFC4740)" C)
 
-FIND_PACKAGE(MYSQL REQUIRED)
-INCLUDE_DIRECTORIES(${MYSQL_INCLUDE_DIR}) 
+FIND_PACKAGE(MySQL REQUIRED)
+INCLUDE_DIRECTORIES(${MySQL_INCLUDE_DIR}) 
 
 # List of source files
 SET( DIAM_SIP_SRC
@@ -16,4 +16,4 @@
 # Compile as a module
 FD_ADD_EXTENSION(app_sip ${DIAM_SIP_SRC})
 
-TARGET_LINK_LIBRARIES(app_sip ${MYSQL_LIBRARY})
+TARGET_LINK_LIBRARIES(app_sip ${MySQL_LIBRARIES})