NetworkManager r3996 - in trunk: . libnm-util

[mbiebl svn gnome org]

Author: mbiebl
Date: Fri Aug 22 11:32:37 2008
New Revision: 3996
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3996&view=rev

Log:
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.

Modified:
   trunk/ChangeLog
   trunk/libnm-util/Makefile.am

Modified: trunk/libnm-util/Makefile.am
==============================================================================
--- trunk/libnm-util/Makefile.am	(original)
+++ trunk/libnm-util/Makefile.am	Fri Aug 22 11:32:37 2008
@@ -69,10 +69,22 @@
 
 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