summaryrefslogtreecommitdiff
path: root/plugin/auth_pam
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2014-06-23 12:09:00 +0200
committerSergei Golubchik <serg@mariadb.org>2014-06-23 17:39:13 +0200
commit787ec317784d58ca00c0c8e772173c66c5145f50 (patch)
tree3c46c110880a481341ba0cd40d54ce3af7ddea3d /plugin/auth_pam
parentda9bb66b028da9ef716de7325a5a91fa6216c217 (diff)
downloadmariadb-git-787ec317784d58ca00c0c8e772173c66c5145f50.tar.gz
MDEV-6248 GUI-friendly cmake options to enable/disable plugins
* Introduce a set of PLUGIN_xxx cmake options with values NO, STATIC, DYNAMIC, AUTO, YES (abort if plugin is not compiled) * Deprecate redundant and ambiguous WITH_xxx, WITH_PLUGIN_xxx, WITH_xxx_STORAGE_ENGINE, WITHOUT_xxx, WITHOUT_PLUGIN_xxx, WITHOUT_xxx_STORAGE_ENGINE * Actually check whether a plugin is disabled (DISABLED keyword was always present, but it was ignored until now). * Support conditionally disabled plugins - keyword ONLY_IF * Use ONLY_IF for conditionally skipping plugins, instead of doing MYSQL_ADD_PLUGIN conditionally as before. Because if MYSQL_ADD_PLUGIN isn't done at all, PLUGIN_xxx=YES cannot work.
Diffstat (limited to 'plugin/auth_pam')
-rw-r--r--plugin/auth_pam/CMakeLists.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/plugin/auth_pam/CMakeLists.txt b/plugin/auth_pam/CMakeLists.txt
index 51317527c77..055e188c45b 100644
--- a/plugin/auth_pam/CMakeLists.txt
+++ b/plugin/auth_pam/CMakeLists.txt
@@ -4,10 +4,10 @@ INCLUDE (CheckFunctionExists)
CHECK_INCLUDE_FILES (security/pam_appl.h HAVE_PAM_APPL_H)
CHECK_FUNCTION_EXISTS (strndup HAVE_STRNDUP)
-IF(HAVE_PAM_APPL_H)
- IF(HAVE_STRNDUP)
- ADD_DEFINITIONS(-DHAVE_STRNDUP)
- ENDIF(HAVE_STRNDUP)
- MYSQL_ADD_PLUGIN(auth_pam auth_pam.c LINK_LIBRARIES pam MODULE_ONLY)
-ENDIF(HAVE_PAM_APPL_H)
+IF(HAVE_STRNDUP)
+ ADD_DEFINITIONS(-DHAVE_STRNDUP)
+ENDIF(HAVE_STRNDUP)
+
+MYSQL_ADD_PLUGIN(auth_pam auth_pam.c ONLY_IF HAVE_PAM_APPL_H
+ LINK_LIBRARIES pam MODULE_ONLY)