From: Francis Dupont <fdupont@isc.org>
Date: Mon, 22 Feb 2021 13:03:39 +0000 (+0100)
Subject: [#1661] Moved to cpp03 server example
X-Git-Tag: Kea-1.9.6~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b2055f40cf1b06bc98465810d78c4e645355688;p=thirdparty%2Fkea.git

[#1661] Moved to cpp03 server example
---

diff --git a/src/lib/asiolink/testutils/Makefile.am b/src/lib/asiolink/testutils/Makefile.am
index 8b1dce1748..33eaf9709d 100644
--- a/src/lib/asiolink/testutils/Makefile.am
+++ b/src/lib/asiolink/testutils/Makefile.am
@@ -59,8 +59,9 @@ if HAVE_OPENSSL
 # openssl_sample_server <port>
 # openssl_sample_server <address> <port>
 
-#noinst_PROGRAMS = openssl_sample_client openssl_sample_server
+noinst_PROGRAMS = openssl_sample_client openssl_sample_server
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 openssl_sample_client_SOURCES = openssl_sample_client.cc
 openssl_sample_client_CPPFLAGS = $(AM_CPPFLAGS)
@@ -82,6 +83,17 @@ openssl_sample_server_LDADD = $(BOOST_LIBS) $(CRYPTO_LIBS)
 #openssl_sample_server_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)
 #openssl_sample_server_LDADD = $(CRYPTO_LIBS)
 >>>>>>> [#1661] Fixed build on last Fedora
+=======
+openssl_sample_client_SOURCES = openssl_sample_client.cc
+openssl_sample_client_CPPFLAGS = $(AM_CPPFLAGS)
+openssl_sample_client_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)
+openssl_sample_client_LDADD = $(CRYPTO_LIBS)
+
+openssl_sample_server_SOURCES = openssl_sample_server.cc
+openssl_sample_server_CPPFLAGS = $(AM_CPPFLAGS)
+openssl_sample_server_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)
+openssl_sample_server_LDADD = $(CRYPTO_LIBS)
+>>>>>>> [#1661] Moved to cpp03 server example
 endif
 endif