[gnome-keyring: 2/3] Minor fine tuning of GTK+ 3.0 build support.

[Stefan Walter <stefw src gnome org>]

commit 2b308e57df63d4ac0de3f3469ef4c48efe77d8a6
Author: Stef Walter <stef memberwebs com>
Date:   Wed Sep 1 03:16:10 2010 +0000

    Minor fine tuning of GTK+ 3.0 build support.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=624570

 configure.in     |    4 ++--
 tool/Makefile.am |    2 +-
 ui/Makefile.am   |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/configure.in b/configure.in
index c950e8a..6f8cc26 100644
--- a/configure.in
+++ b/configure.in
@@ -25,7 +25,7 @@ GP11_AGE=0
 
 # GCR package versioning
 GCR_MAJOR_GTK2=0
-GCR_MAJOR_GTK3=1
+GCR_MAJOR_GTK3=3
 GCR_MINOR=0
 GCR_MICRO=0
 
@@ -111,7 +111,7 @@ PKG_CHECK_MODULES(GTK, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED)
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 AC_SUBST(GTK_API_VERSION)
-AM_CONDITIONAL([HAVE_GTK3],[test "$with_gtk" = "3.0"])
+AM_CONDITIONAL([WITH_GTK3],[test "$with_gtk" = "3.0"])
 
 GETTEXT_PACKAGE=gnome-keyring
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext domain name])
diff --git a/tool/Makefile.am b/tool/Makefile.am
index 01fc9d8..f5b99c7 100644
--- a/tool/Makefile.am
+++ b/tool/Makefile.am
@@ -26,7 +26,7 @@ gnome_keyring GCR_VERSION_SUFFIX@_LDADD = \
 	$(DAEMON_LIBS)
 
 # Install a link from gnome-keyring â?? gnome-keyring GCR_VERSION_SUFFIX@ to maintain compatibility
-if HAVE_GTK3
+if WITH_GTK3
 install-exec-hook:
 	@test -e "$(DESTDIR)$(bindir)/gnome-keyring" || (cd $(DESTDIR)$(bindir) && $(LN_S) gnome-keyring GCR_VERSION_SUFFIX@ gnome-keyring)
 endif
diff --git a/ui/Makefile.am b/ui/Makefile.am
index 23876d6..50c5370 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -79,7 +79,7 @@ gnome_keyring_prompt GCR_VERSION_SUFFIX@_CFLAGS = \
 	$(GTK_CFLAGS)
 
 # Install a link from gnome-keyring-prompt â?? gnome-keyring-prompt GCR_VERSION_SUFFIX@ to maintain compatibility
-if HAVE_GTK3
+if WITH_GTK3
 install-exec-hook:
 	@test -e "$(DESTDIR)$(libexecdir)/gnome-keyring-prompt" || (cd $(DESTDIR)$(libexecdir) && $(LN_S) gnome-keyring-prompt GCR_VERSION_SUFFIX@ gnome-keyring-prompt)
 endif