[gnome-keyring] Makefile.am: Fixes for building with/without optional components

[Stefan Walter <stefw src gnome org>]

commit 6fa69d9629f3b95b958a39ec2fc80f52292dab8f
Author: Stef Walter <stefw gnome org>
Date:   Wed Mar 19 20:22:13 2014 +0100

    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'

 Makefile.am |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index de06e2d..45a8bf0 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