reverted

diff --git a/m4macros/ax_crypto.m4 b/m4macros/ax_crypto.m4
index 686fea094ede89af45757d180ad089f936fcc3a0..fe91b1f93913742dfce08d1a0ad246952e82c486 100644 (file)
--- a/m4macros/ax_crypto.m4
+++ b/m4macros/ax_crypto.m4
@@ -408,7 +408,7 @@ else
    if test "${use_openssl}" = "/usr" ; then
       CRYPTO_CFLAGS=""
       CRYPTO_INCLUDES=""
-      CRYPTO_LIBS="-lcrypto -lssl"
+      CRYPTO_LIBS="-lcrypto"
       DISTCHECK_CRYPTO_CONFIGURE_FLAG="--with-openssl"
    else
       CRYPTO_CFLAGS=""
@@ -416,20 +416,20 @@ else
       DISTCHECK_CRYPTO_CONFIGURE_FLAG="--with-openssl=${use_openssl}"
       case $host in
           *-solaris*)
-              CRYPTO_LIBS="-L${use_openssl}/lib -R${use_openssl}/lib -lcrypto -lssl"
+              CRYPTO_LIBS="-L${use_openssl}/lib -R${use_openssl}/lib -lcrypto"
               ;;
           *-hp-hpux*)
-              CRYPTO_LIBS="-L${use_openssl}/lib -Wl,+b: -lcrypto -lssl"
+              CRYPTO_LIBS="-L${use_openssl}/lib -Wl,+b: -lcrypto"
               ;;
           *-apple-darwin*)
               if test -f "${use_openssl}/lib/libcrypto.dylib" ; then
-                 CRYPTO_LIBS="-L${use_openssl}/lib -lcrypto -lssl"
+                 CRYPTO_LIBS="-L${use_openssl}/lib -lcrypto"
               else
                  CRYPTO_LIBS="${use_openssl}/lib/libcrypto.a"
               fi
               ;;
           *)
-              CRYPTO_LIBS="-L${use_openssl}/lib -lcrypto -lssl"
+              CRYPTO_LIBS="-L${use_openssl}/lib -lcrypto"
               ;;
       esac
     fi

diff --git a/src/lib/cql/tests/Makefile.am b/src/lib/cql/tests/Makefile.am
index 8d7b2f20153bb77f367301ac51cc35f01d824d20..c7e38a400c03e8879d986750fd5af0ff3c2e7dda 100644 (file)
--- a/src/lib/cql/tests/Makefile.am
+++ b/src/lib/cql/tests/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = .
 
 AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
-AM_CPPFLAGS += $(BOOST_INCLUDES) $(CQL_CPPFLAGS)
+AM_CPPFLAGS += $(BOOST_INCLUDES)
 
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
@@ -22,12 +22,11 @@ libcql_unittests_SOURCES  = cql_connection_unittest.cc
 libcql_unittests_SOURCES += run_unittests.cc
 
 libcql_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) $(CQL_CPPFLAGS)
-libcql_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) $(CQL_LIBS) -lcrypto -lssl
+libcql_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) $(CQL_LIBS)
 
 libcql_unittests_LDADD  = $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libcql_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
 libcql_unittests_LDADD += $(top_builddir)/src/lib/cql/libkea-cql.la
-libcql_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 libcql_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 libcql_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 libcql_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la