added configure option --disable-examples to remove example code build, configure runs make clean at the end, sniffer test isn't built if sniffer disabled

configure.ac

@@ -661,6 +661,16 @@ then
 fi
 
 
+# Enable Examples, used to disable examples
+AC_ARG_ENABLE(examples,
+    [  --enable-examples       Enable Examples  (default: enabled)],
+    [ ENABLED_EXAMPLES=$enableval ],
+    [ ENABLED_EXAMPLES=yes ]
+    )
+
+AS_IF([test "x$ENABLED_SINGLETHREADED" = "xyes"], [ENABLED_EXAMPLES="no"])
+AM_CONDITIONAL([BUILD_EXAMPLES], [test "x$ENABLED_EXAMPLES" = "xyes"])
+
 # LIBZ
 trylibzdir=""
 AC_ARG_WITH(libz,
@@ -750,6 +760,11 @@ AX_AM_JOBSERVER([yes])
 
 AC_OUTPUT
 
+echo "---"
+echo "Running make clean..."
+make clean
+echo
+
 echo "---"
 echo "Configuration summary for $PACKAGE_NAME version $VERSION"
 echo ""
@@ -789,5 +804,7 @@ echo "   * OCSP:                      $ENABLED_OCSP"
 echo "   * CRL:                       $ENABLED_CRL"
 echo "   * CRL-MONITOR:               $ENABLED_CRL_MONITOR"
 echo "   * NTRU:                      $ENABLED_NTRU"
+echo "   * Examples:                  $ENABLED_EXAMPLES"
 echo ""
 echo "---"
+

examples/client/include.am

@@ -1,11 +1,13 @@
 # vim:ft=automake
 # All paths should be given relative to the root
 
+if BUILD_EXAMPLES
 noinst_PROGRAMS += examples/client/client
 noinst_HEADERS += examples/client/client.h
 examples_client_client_SOURCES      = examples/client/client.c
 examples_client_client_LDADD        = src/libcyassl.la
 examples_client_client_DEPENDENCIES = src/libcyassl.la
+endif
 EXTRA_DIST += examples/client/client.sln
 EXTRA_DIST += examples/client/client-ntru.vcproj
 EXTRA_DIST += examples/client/client.vcproj

examples/echoclient/include.am

@@ -3,11 +3,13 @@
 # All paths should be given relative to the root
 
 
+if BUILD_EXAMPLES
 noinst_PROGRAMS += examples/echoclient/echoclient
 noinst_HEADERS += examples/echoclient/echoclient.h
 examples_echoclient_echoclient_SOURCES      = examples/echoclient/echoclient.c
 examples_echoclient_echoclient_LDADD        = src/libcyassl.la
 examples_echoclient_echoclient_DEPENDENCIES = src/libcyassl.la
+endif
 EXTRA_DIST += examples/echoclient/echoclient.sln
 EXTRA_DIST += examples/echoclient/echoclient-ntru.vcproj
 EXTRA_DIST += examples/echoclient/echoclient.vcproj

examples/echoserver/include.am

@@ -3,11 +3,13 @@
 # All paths should be given relative to the root
 
 
+if BUILD_EXAMPLES
 noinst_PROGRAMS += examples/echoserver/echoserver
 noinst_HEADERS += examples/echoserver/echoserver.h
 examples_echoserver_echoserver_SOURCES      = examples/echoserver/echoserver.c
 examples_echoserver_echoserver_LDADD        = src/libcyassl.la
 examples_echoserver_echoserver_DEPENDENCIES = src/libcyassl.la
+endif
 EXTRA_DIST += examples/echoserver/echoserver.sln
 EXTRA_DIST += examples/echoserver/echoserver-ntru.vcproj
 EXTRA_DIST += examples/echoserver/echoserver.vcproj

examples/server/include.am

@@ -3,11 +3,13 @@
 # All paths should be given relative to the root
 
 
+if BUILD_EXAMPLES
 noinst_PROGRAMS += examples/server/server
 noinst_HEADERS += examples/server/server.h
 examples_server_server_SOURCES      = examples/server/server.c
 examples_server_server_LDADD        = src/libcyassl.la
 examples_server_server_DEPENDENCIES = src/libcyassl.la
+endif
 EXTRA_DIST += examples/server/server.sln
 EXTRA_DIST += examples/server/server-ntru.vcproj
 EXTRA_DIST += examples/server/server.vcproj

sslSniffer/sslSnifferTest/include.am

@@ -2,9 +2,9 @@
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
 
+if BUILD_SNIFFER
 noinst_PROGRAMS += sslSniffer/sslSnifferTest/snifftest
 sslSniffer_sslSnifferTest_snifftest_SOURCES = sslSniffer/sslSnifferTest/snifftest.c
-if BUILD_SNIFFER
 sslSniffer_sslSnifferTest_snifftest_LDADD        = src/libcyassl.la -lpcap
 sslSniffer_sslSnifferTest_snifftest_DEPENDENCIES = src/libcyassl.la
 endif

tests/include.am

@@ -3,6 +3,7 @@
 # All paths should be given relative to the root
 
 
+if BUILD_EXAMPLES
 check_PROGRAMS += tests/unit
 noinst_PROGRAMS += tests/unit
 tests_unit_SOURCES = \
@@ -15,6 +16,7 @@ tests_unit_SOURCES = \
 tests_unit_CFLAGS       = -DNO_MAIN_DRIVER $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 tests_unit_LDADD        = src/libcyassl.la  $(PTHREAD_LIBS)
 tests_unit_DEPENDENCIES = src/libcyassl.la
+endif
 EXTRA_DIST += tests/unit.h
 EXTRA_DIST += tests/test.conf \
               tests/test-openssl.conf \

testsuite/include.am

@@ -3,6 +3,7 @@
 # All paths should be given relative to the root
 
 
+if BUILD_EXAMPLES
 check_PROGRAMS += testsuite/testsuite
 noinst_PROGRAMS += testsuite/testsuite
 testsuite_testsuite_SOURCES = \
@@ -15,6 +16,7 @@ testsuite_testsuite_SOURCES = \
 testsuite_testsuite_CFLAGS       = -DNO_MAIN_DRIVER $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 testsuite_testsuite_LDADD        = src/libcyassl.la $(PTHREAD_LIBS)
 testsuite_testsuite_DEPENDENCIES = src/libcyassl.la
+endif
 EXTRA_DIST += testsuite/testsuite.sln
 EXTRA_DIST += testsuite/testsuite-ntru.vcproj
 EXTRA_DIST += testsuite/testsuite.vcproj