From a4bc5d1c434f6331dc9e2f0050e4230bd9ad9977 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 22 Aug 2008 11:32:37 +0000 Subject: [PATCH] Fix test-crypto binary The crypto functions are no longer part of the public API/ABI. Make sure test-crypto compiles all necessary sources and links against the crypto libraries. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3996 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 5 +++++ libnm-util/Makefile.am | 14 +++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 93cd3d11ae..9da96ae774 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,11 @@ libnm-util/libnm-util.ver - Use linker version scripts to control the list of exported symbols. List each exported symbol explicitely. + * libnm-util/Makefile.am + - Fix compilation of the test-crypto binary. The crypto + functions are no longer part of the libnm-util API. Add + crypto_*.c to test_crypto_SOURCES and link against the correct + crypto libraries. 2008-08-19 Dan Williams diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am index a7b577c8b6..42d2fcdca7 100644 --- a/libnm-util/Makefile.am +++ b/libnm-util/Makefile.am @@ -69,10 +69,22 @@ libnm_util_includedir=$(includedir)/NetworkManager noinst_PROGRAMS = test-crypto -test_crypto_SOURCES = test-crypto.c +test_crypto_SOURCES = test-crypto.c crypto.c test_crypto_CPPFLAGS = $(GLIB_CFLAGS) -D_GNU_SOURCE test_crypto_LDADD = $(GLIB_LIBS) libnm-util.la +if WITH_GNUTLS +test_crypto_SOURCES += crypto_gnutls.c +test_crypto_CPPFLAGS += $(LIBGCRYPT_CFLAGS) $(GNUTLS_CFLAGS) +test_crypto_LDADD += $(LIBGCRYPT_LIBS) $(GNUTLS_LIBS) +endif + +if WITH_NSS +test_crypto_SOURCES += crypto_nss.c +test_crypto_CPPFLAGS += $(NSS_CFLAGS) +test_crypto_LDADD += $(NSS_LIBS) +endif + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libnm-util.pc