summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStef Walter <stefw@gnome.org>2014-03-19 20:22:13 +0100
committerStef Walter <stefw@gnome.org>2014-03-19 20:22:13 +0100
commit6fa69d9629f3b95b958a39ec2fc80f52292dab8f (patch)
treecea5108b58b7776194a2b3e48f97a0ecd7b589dd
parenta19d736e4176b5215b611dfe5fa29c34fa582fc1 (diff)
Makefile.am: Fixes for building with/without optional components
Make build with --disable-pam work again. And enforce that we have all the optional components when doing a 'make distcheck'
-rw-r--r--Makefile.am8
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index de06e2d2..45a8bf0e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,9 +8,11 @@ ACLOCAL_AMFLAGS = -I build/m4 ${ACLOCAL_FLAGS}
DISTCHECK_CONFIGURE_FLAGS = \
--enable-doc \
+ --enable-pam \
+ --enable-ssh-agent \
+ --enable-gpg-agent \
--disable-strict \
--disable-coverage \
- --disable-update-mime \
--disable-silent-rules \
--with-pkcs11-modules=$(abs_srcdir)/$(top_distdir)/_inst/lib \
--with-pkcs11-config=$(abs_srcdir)/$(top_distdir)/_inst/etc/pkcs11 \
@@ -210,6 +212,6 @@ include pkcs11/xdg-store/Makefile.am
include schema/Makefile.am
include tool/Makefile.am
-#ifdef WITH_PAM
+if WITH_PAM
include pam/Makefile.am
-#endif
+endif