changeset
merge of '42b776027452a88655415a229c29753b035065ac'
Sun, 17 Aug 2008 23:48:14 +0000
- author
- Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
- date
- Sun, 17 Aug 2008 23:48:14 +0000
- branch
- soc.2008.masterpassword
- changeset 34004
- e7aa63beb647
- parent 34003
- 42b776027452 (current diff)
- parent 34002
- 9f4b03e07b54 (diff)
- child 34005
- 592e6e8213a9
merge of '42b776027452a88655415a229c29753b035065ac'
and '9f4b03e07b54cbe90971f1ec5f5886b498ef1182'
--- a/configure.ac Sun Aug 17 22:59:33 2008 +0000 +++ b/configure.ac Sun Aug 17 23:48:14 2008 +0000 @@ -1265,7 +1265,6 @@ fi -PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1) dnl Check for gnome-keyring.h; if we don't have it, oh well if test "x$enable_gnome_keyring" = "xyes" ; then PKG_CHECK_MODULES(GNOMEKEYRING, [gnome-keyring-1], [
