soc.2008.masterpassword: 39a8bd23: Made sure GNOME Keyring is properly capi...

[scrouaf at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 39a8bd23bfee874e5da4dbfe576e3ac25c133941
Ancestor: 02e2d6e95ef9f3977d1a18ed070721ca0a45b918
Author: scrouaf at soc.pidgin.im
Date: 2008-08-27T09:29:39
Branch: im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/39a8bd23bfee874e5da4dbfe576e3ac25c133941

Modified files:
        configure.ac

ChangeLog: 

Made sure GNOME Keyring is properly capitalised in configure.ac

-------------- next part --------------
============================================================
--- configure.ac	3131ea253f5b6a12926b5c5f25d3bf7a3b997401
+++ configure.ac	719868d53adecf3bead52b420f977ee05a3a595a
@@ -1230,7 +1230,7 @@ AC_ARG_ENABLE(nm, [AC_HELP_STRING([--dis
 
 AC_ARG_ENABLE(dbus, [AC_HELP_STRING([--disable-dbus], [disable D-Bus support])], , enable_dbus=yes)
 AC_ARG_ENABLE(nm, [AC_HELP_STRING([--disable-nm], [disable NetworkManager support (requires D-Bus)])], enable_nm=$enableval, enable_nm=yes)
-AC_ARG_ENABLE(gnome-keyring, [AC_HELP_STRING([--disable-gnome-keyring], [disable Gnome-Keyring support (requires D-Bus)])], enable_gnome_keyring=$enableval, enable_gnome_keyring=yes)
+AC_ARG_ENABLE(gnome-keyring, [AC_HELP_STRING([--disable-gnome-keyring], [disable GNOME Keyring support (requires D-Bus)])], enable_gnome_keyring=$enableval, enable_gnome_keyring=yes)
 
 if test "x$enable_dbus" = "xyes" ; then
 	AC_CHECK_PROG(enable_dbus, dbus-binding-tool, yes, no)
@@ -1270,12 +1270,12 @@ dnl Check for gnome-keyring.h; if we don
 		PKG_CHECK_MODULES(GNOMEKEYRING, [gnome-keyring-1], [
 			AC_SUBST(GNOMEKEYRING_CFLAGS)
 			AC_SUBST(GNOMEKEYRING_LIBS)
-			AC_DEFINE(HAVE_GNOMEKEYRING, 1, [Define if we have Gnome-Keyring.])
+			AC_DEFINE(HAVE_GNOMEKEYRING, 1, [Define if we have GNOME Keyring.])
 		], [
 			if test "x$force_deps" = "xyes" ; then
 				AC_MSG_ERROR([
-Gnome-Keyring development headers not found.
-Use --disable-gnome-keyring if you do not need Gnome-Keyring support.
+GNOME Keyring development headers not found.
+Use --disable-gnome-keyring if you do not need GNOME Keyring support.
 ])
 			fi])
 	fi
@@ -2479,7 +2479,7 @@ echo Build with NetworkManager..... : $e
 	eval eval echo D-Bus services directory...... : $DBUS_SERVICES_DIR
 fi
 echo Build with NetworkManager..... : $enable_nm
-echo Build with Gnome-Keyring...... : $enable_gnome_keyring
+echo Build with GNOME Keyring...... : $enable_gnome_keyring
 echo SSL Library/Libraries......... : $msg_ssl
 if test "x$SSL_CERTIFICATES_DIR" != "x" ; then
 	eval eval echo SSL CA certificates directory. : $SSL_CERTIFICATES_DIR