[gnome-keyring] More build fixes after recent changes.

[Stefan Walter <stefw src gnome org>]

commit 36b62bbad78bced6da5545000e4d73f376d7b8f5
Author: Stef Walter <stefw collabora co uk>
Date:   Fri Jul 8 18:21:52 2011 +0200

    More build fixes after recent changes.
    
     * Use proper library names for gcr
     * Use lib64 properly for pam modules when default is configured.

 configure.ac    |    2 +-
 gcr/Makefile.am |    4 ++--
 gcr/gcr.pc.in   |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ba5e133..d53a9ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -300,7 +300,7 @@ fi
 AC_ARG_WITH([pam-dir],
             [AC_HELP_STRING([--with-pam-dir=DIR],
                              [directory to install pam modules in])],
-             [], [with_pam_dir='${prefix}/lib/security'])
+             [], [with_pam_dir='${libdir}/security'])
 PAM_DEST_DIR="$with_pam_dir"
 AC_SUBST(PAM_DEST_DIR)
 
diff --git a/gcr/Makefile.am b/gcr/Makefile.am
index ce367fd..a345416 100644
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@ -156,8 +156,8 @@ gcr-$(GCR_MAJOR).pc: gcr.pc
 
 # ----------------------------------------------------------------
 
-libgcr.symbols: .libs/libgcr GCR_VERSION_SUFFIX@.so
-	nm -D .libs/libgcr GCR_VERSION_SUFFIX@.so | grep -F ' T ' | \
+libgcr.symbols: .libs/libgcr- GCR_MAJOR@.so
+	nm -D .libs/libgcr- GCR_MAJOR@.so | grep -F ' T ' | \
 		cut -d ' ' -f 3 | sort > $@
 
 EXTRA_DIST = \
diff --git a/gcr/gcr.pc.in b/gcr/gcr.pc.in
index 5f08eec..c558c52 100644
--- a/gcr/gcr.pc.in
+++ b/gcr/gcr.pc.in
@@ -11,6 +11,6 @@ pkcs11standalonedir= pkcs11standalonedir@
 Name: gcr GCR_VERSION_SUFFIX@
 Description: GObject and GUI library for high level crypto parsing and display
 Version: @VERSION@
-Requires: glib-2.0 gtk+- GTK_API_VERSION@ libtasn1 gck-0 p11-kit-1
-Libs: -L${libdir} -lgcr GCR_VERSION_SUFFIX@
-Cflags: -I${includedir}/gcr GCR_VERSION_SUFFIX@
+Requires: glib-2.0 gtk+-3 libtasn1 gck- GCK_MAJOR@ p11-kit-1
+Libs: -L${libdir} -lgcr- GCR_MAJOR@
+Cflags: -I${includedir}/gcr- GCR_MAJOR@