[#1661] Moved to cpp03 server example

diff --git a/src/lib/asiolink/testutils/Makefile.am b/src/lib/asiolink/testutils/Makefile.am
index 8b1dce1748cc170807096666c10cdbb13623a770..33eaf9709daaae796dada584966a0c4d0f664d22 100644 (file)
--- 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