From 8d78492fda851aff3d42c26b21c1ed1d6807d13e Mon Sep 17 00:00:00 2001 From: Robert Love Date: Thu, 25 May 2006 20:32:10 +0000 Subject: [PATCH] 2006-05-25 Robert Love Patch Valentine Sinitsyn to fix GNOME bug #342400: * libnm-util/Makefile.am: Only build gnome-keyring-md5.{c,h} if we are not using gcrypt. Otherwise, we get a linker error. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1766 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ libnm-util/Makefile.am | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 37637ed346..d6d9896c63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-05-25 Robert Love + + Patch Valentine Sinitsyn to fix GNOME bug #342400: + * libnm-util/Makefile.am: Only build gnome-keyring-md5.{c,h} if we are + not using gcrypt. Otherwise, we get a linker error. + 2006-05-25 Robert Love Patch Valentine Sinitsyn to fix GNOME bug #342398: diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am index b67245d459..8dc994034d 100644 --- a/libnm-util/Makefile.am +++ b/libnm-util/Makefile.am @@ -29,8 +29,6 @@ libnm_util_la_SOURCES= \ cipher-wpa-psk-hex.h \ cipher-wpa-psk-passphrase.c \ cipher-wpa-psk-passphrase.h \ - gnome-keyring-md5.c \ - gnome-keyring-md5.h \ dbus-helpers.c \ dbus-helpers.h \ sha1.c \