summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2010-12-02 16:07:43 +0100
committerMiloslav Trmač <mitr@redhat.com>2010-12-02 16:07:43 +0100
commit2097b0ddb78190344f5b2d7e0affd6c02dce3fa5 (patch)
tree429b82e6a7a336ab1b0faf17693cd6e57fa2cc94
parent73f2df61b947fc2a4352ec305e3783b5071078c5 (diff)
downloadncrypto-2097b0ddb78190344f5b2d7e0affd6c02dce3fa5.tar.gz
ncrypto-2097b0ddb78190344f5b2d7e0affd6c02dce3fa5.tar.xz
ncrypto-2097b0ddb78190344f5b2d7e0affd6c02dce3fa5.zip
Stop linking with openssl
It is not needed any more, all functionality is provided either by the kernel or by NSS.
-rw-r--r--Makefile.am5
-rw-r--r--configure.ac1
2 files changed, 2 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 0d1c6aa..1216e10 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,8 +29,7 @@
versionedincludedir = $(includedir)/ncrypto-0/ncrypto
ACLOCAL_AMFLAGS = -I m4
-AM_CPPFLAGS = -I $(top_srcdir)/include $(GLIB_CFLAGS) $(NSS_CFLAGS) \
- $(OPENSSL_CFLAGS)
+AM_CPPFLAGS = -I $(top_srcdir)/include $(GLIB_CFLAGS) $(NSS_CFLAGS)
## Targets
lib_LTLIBRARIES = lib/libncrypto.la
@@ -43,7 +42,7 @@ noinst_PROGRAMS = $(TESTS)
lib_libncrypto_la_SOURCES = lib/internal.h lib/ncrypto.c lib/ncrypto_alg.c \
lib/ncrypto_local.c lib/ncrypto_nss.c
-lib_libncrypto_la_LDFLAGS = -version-info 0:0:0 $(NSS_LIBS) $(OPENSSL_LIBS)
+lib_libncrypto_la_LDFLAGS = -version-info 0:0:0 $(NSS_LIBS)
tests_dsa_LDADD = lib/libncrypto.la $(GLIB_LIBS)
tests_dsa_LDFLAGS = -no-install
diff --git a/configure.ac b/configure.ac
index fc29b65..ed53177 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,7 +49,6 @@ PKG_CHECK_MODULES(GLIB,[glib-2.0])
AC_DEFINE(G_DISABLE_DEPRECATED,,
[Stay away from deprecated glib functionality.])
PKG_CHECK_MODULES(NSS,[nss])
-PKG_CHECK_MODULES(OPENSSL,[libcrypto])
# Checks for header files.