From: Razvan Becheriu <ravan@isc.org>
Date: Mon, 4 Mar 2019 17:45:44 +0000 (+0200)
Subject: link with ssl for static cpp driver
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0eef799ea6717333a8518706180925bcf090bc7c;p=thirdparty%2Fkea.git

link with ssl for static cpp driver
---

diff --git a/configure.ac b/configure.ac
index 5491715675..63bc905eb1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -620,8 +620,11 @@ AC_ARG_WITH([gtest],
                             [specify a path to gtest header files (PATH/include) and library (PATH/lib)])],
         [gtest_path="$withval"; enable_gtest="yes"], [gtest_path="no"])
 
-AC_ARG_WITH(lcov,
-[  --with-lcov[=PROGRAM]         enable gtest and coverage target using the specified lcov], lcov="$withval", lcov="no")
+AC_ARG_WITH([lcov],
+            [AS_HELP_STRING([--with-lcov=PROGRAM],
+                            [enable gtest and coverage target using the specified lcov])],
+                            [lcov="$withval"],
+                            [lcov="no"])
 
 USE_LCOV="no"
 if test "$lcov" != "no"; then
@@ -947,6 +950,7 @@ if test "$SYSREPO_CONFIG" != "" ; then
        SYSREPO_LIBS="${SYSREPO_LIBS} ${SYSREPOCPP_LIBS}"
     fi
 
+    AC_SUBST(SYSREPO_INCLUDEDIR)
     AC_SUBST(SYSREPO_CPPFLAGS)
     AC_SUBST(SYSREPO_LIBS)
     AC_SUBST(SYSREPO_REPO)
diff --git a/m4macros/ax_crypto.m4 b/m4macros/ax_crypto.m4
index fe91b1f939..686fea094e 100644
--- 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"
+      CRYPTO_LIBS="-lcrypto -lssl"
       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"
+              CRYPTO_LIBS="-L${use_openssl}/lib -R${use_openssl}/lib -lcrypto -lssl"
               ;;
           *-hp-hpux*)
-              CRYPTO_LIBS="-L${use_openssl}/lib -Wl,+b: -lcrypto"
+              CRYPTO_LIBS="-L${use_openssl}/lib -Wl,+b: -lcrypto -lssl"
               ;;
           *-apple-darwin*)
               if test -f "${use_openssl}/lib/libcrypto.dylib" ; then
-                 CRYPTO_LIBS="-L${use_openssl}/lib -lcrypto"
+                 CRYPTO_LIBS="-L${use_openssl}/lib -lcrypto -lssl"
               else
                  CRYPTO_LIBS="${use_openssl}/lib/libcrypto.a"
               fi
               ;;
           *)
-              CRYPTO_LIBS="-L${use_openssl}/lib -lcrypto"
+              CRYPTO_LIBS="-L${use_openssl}/lib -lcrypto -lssl"
               ;;
       esac
     fi
diff --git a/src/bin/netconf/Makefile.am b/src/bin/netconf/Makefile.am
index 50040b69b9..6e86835ab6 100644
--- a/src/bin/netconf/Makefile.am
+++ b/src/bin/netconf/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = . tests
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin
 AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_builddir)/src
-AM_CPPFLAGS += $(BOOST_INCLUDES) $(SYSREPO_INCLUDES)
+AM_CPPFLAGS += $(BOOST_INCLUDES) $(SYSREPO_INCLUDEDIR)
 
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
diff --git a/src/bin/netconf/tests/Makefile.am b/src/bin/netconf/tests/Makefile.am
index 321a5ff577..42cb31dfe2 100644
--- a/src/bin/netconf/tests/Makefile.am
+++ b/src/bin/netconf/tests/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin
 AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/bin/netconf/tests\"
 AM_CPPFLAGS += -DCFG_EXAMPLES=\"$(abs_top_srcdir)/doc/examples/netconf\"
 AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/bin/netconf/tests\"
-AM_CPPFLAGS += $(BOOST_INCLUDES)
+AM_CPPFLAGS += $(BOOST_INCLUDES) $(SYSREPO_INCLUDEDIR)
 
 CLEANFILES = *.json *.log