diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2010-12-29 22:50:31 +0000 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2010-12-29 22:50:31 +0000 |
| commit | e985efa83458e1cc9c2bcb12e3cc10b6526c3399 (patch) | |
| tree | 8311cb525c9d452d62d88280e6cca854496f9c42 /configure.ac | |
| parent | 4e9224817ee303404b804a1a51f2f9c9a49164e4 (diff) | |
| parent | ed6bc27721075adf0215ad8b856fcdcf7b98b9b7 (diff) | |
merge changes from trunk
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd-solaris@1349 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index e47926b..6e94574 100644 --- a/configure.ac +++ b/configure.ac @@ -65,6 +65,7 @@ AC_PROG_INSTALL AC_PROG_RANLIB AM_PROG_CC_C_O AC_USE_SYSTEM_EXTENSIONS +AC_PROG_LN_S # checks for tool to convert docbook to man AC_PATH_PROGS(DOCBOOK2X_MAN, docbook2x-man) @@ -132,14 +133,27 @@ AC_MSG_RESULT($enable_pam) AM_CONDITIONAL([ENABLE_PAM], [test "x$enable_pam" = "xyes"]) # check whether the nslcd daemon should be built -AC_MSG_CHECKING([whether to build the nslcd server]) +AC_MSG_CHECKING([whether to build the nslcd daemon]) AC_ARG_ENABLE(nslcd, AS_HELP_STRING([--disable-nslcd], - [build the nslcd server [[default=enabled]]]),, + [build the nslcd daemon [[default=enabled]]]),, [enable_nslcd="yes"]) AC_MSG_RESULT($enable_nslcd) AM_CONDITIONAL([ENABLE_NSLCD], [test "x$enable_nslcd" = "xyes"]) +# check whether the Python version of the nslcd daemon should be built +AC_MSG_CHECKING([whether to build the pynslcd daemon]) +AC_ARG_ENABLE(pynslcd, + AS_HELP_STRING([--enable-pynslcd], + [build the pynslcd daemon [[default=disabled]]]),, + [enable_pynslcd="no"]) +AC_MSG_RESULT($enable_pynslcd) +AM_CONDITIONAL([ENABLE_PYNSLCD], [test "x$enable_pynslcd" = "xyes"]) +if test "x$enable_pynslcd" = "xyes" +then + AC_MSG_WARN([the pynslcd daemon is experimental]) +fi + # check whether SASL support should be enabled AC_MSG_CHECKING([whether to enable SASL support]) AC_ARG_ENABLE(sasl, @@ -169,6 +183,7 @@ AC_MSG_RESULT($configfile_checking) if test "x$configfile_checking" = "xyes" then AC_DEFINE(ENABLE_CONFIGFILE_CHECKING,1,[Whether to check configfile options.]) + AC_SUBST(ENABLE_CONFIGFILE_CHECKING,1) fi # check the name of the configuration file @@ -705,10 +720,18 @@ then AC_SUBST(nslcd_LIBS) fi +# pynslcd daemon-specific tests +if test "x$enable_pynslcd" = "xyes" +then + # check Python interpreter + AM_PATH_PYTHON(2.5) +fi + AM_CONDITIONAL([NSS_FLAVOUR_GLIBC], [test "x${with_nss_flavour}" = xglibc]) AM_CONDITIONAL([NSS_FLAVOUR_SOLARIS], [test "x${with_nss_flavour}" = xsolaris]) # generate files AC_CONFIG_FILES([Makefile compat/Makefile common/Makefile nss/Makefile - pam/Makefile nslcd/Makefile man/Makefile tests/Makefile]) + pam/Makefile nslcd/Makefile pynslcd/Makefile pynslcd/config.py + man/Makefile tests/Makefile]) AC_OUTPUT |