diff options
| author | Stefan Schubert <schubi@suse.de> | 2021-12-03 14:33:20 +0100 |
|---|---|---|
| committer | Thorsten Kukuk <5908016+thkukuk@users.noreply.github.com> | 2022-12-14 09:29:35 +0100 |
| commit | 6135c45347b6173e305fda66eef138bde693b795 (patch) | |
| tree | c67f2d947b9f9411268efb1f1ae1f611be0bb636 /configure.ac | |
| parent | d71de05146d03c271bd5507724d24d1ad17c2be5 (diff) | |
| download | pam-6135c45347b6173e305fda66eef138bde693b795.tar.gz pam-6135c45347b6173e305fda66eef138bde693b795.tar.bz2 pam-6135c45347b6173e305fda66eef138bde693b795.zip | |
pam_env: Use vendor specific pam_env.conf and environment as fallback
Use the vendor directory as fallback for a distribution provided default
config if there is no one in /etc.
* Makefile.am: Add libeconf setting.
* pam_env.c: Take care about the fallback configuration in the vendor directory.
* pam_env.8.xml: Add description for the vendor directory.
* pam_env.conf.5.xml: Add description for the vendor directory.
* tst-pam_env-retval.c: Add tests for libeconf.
* configure.ac: Add ECONF settings for building man pages.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 0892049e..538195e5 100644 --- a/configure.ac +++ b/configure.ac @@ -516,17 +516,17 @@ if test -n "$LIBSELINUX" ; then LIBS=$BACKUP_LIBS fi +ECONF_CFLAGS= +ECONF_LIBS= AC_ARG_ENABLE([econf], AS_HELP_STRING([--disable-econf], [do not use libeconf]), - [WITH_ECONF=$enableval], WITH_ECONF=yes) -if test "$WITH_ECONF" = "yes" ; then - AC_CHECK_LIB([econf],[econf_readDirsWithCallback],[ECONF_LIBS="-leconf"],[ECONF_LIBS=""]) - if test -n "$ECONF_LIBS" ; then - ECONF_CFLAGS="-DUSE_ECONF=1 $ECONF_CFLAGS" - fi + [WITH_ECONF=$enableval], [WITH_ECONF=yes]) +if test "$WITH_ECONF" = "yes"; then + PKG_CHECK_MODULES([ECONF], [libeconf >= 0.5.0], [ECONF_CFLAGS="-DUSE_ECONF=1 $ECONF_CFLAGS"], [:]) fi AC_SUBST([ECONF_CFLAGS]) AC_SUBST([ECONF_LIBS]) + AC_ARG_ENABLE([vendordir], AS_HELP_STRING([--enable-vendordir=DIR], [Directory for distribution provided configuration files]),,[]) if test -n "$enable_vendordir"; then |