mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-05 09:10:17 +01:00
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
This commit is contained in:
parent
430e898e9f
commit
a4bc5d1c43
2 changed files with 18 additions and 1 deletions
|
|
@ -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 <dcbw@redhat.com>
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue