From: Thomas Markwalder <tmark@isc.org>
Date: Fri, 14 Jul 2017 18:04:21 +0000 (-0400)
Subject: [5215] Building with boost_system library is now the default
X-Git-Tag: trac5124a_base~40^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5f6a669c97ad46d35ed3e962eb6a10a24aee796;p=thirdparty%2Fkea.git

[5215] Building with boost_system library is now the default

configure.ac
    Added WARNING message when building boost headers only.

m4macros/ax_boost_for_kea.m4
    Building with boost system library is the default.

    Added --enable-boost-headers-only, to explicitly build with boost
    headers only, rather than linking to boost's system library.
---

diff --git a/configure.ac b/configure.ac
index 2380729c94..279970643f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1346,7 +1346,7 @@ if test $enable_gtest != "no"; then
     	[AC_MSG_ERROR([XXX_TRUE() Google Test macros won't compile; the most likely reason is that a later version of Google Test is required])])
     CPPFLAGS=$CPPFLAGS_SAVED
 fi
-	    
+
 # Check for CreateUnifiedDiff from gtest >= 1.8.0
 if test $enable_gtest != "no"; then
    AC_MSG_CHECKING([for CreateUnifiedDiff in $GTEST_INCLUDES/gtest.h])
@@ -1370,7 +1370,7 @@ if test $enable_gtest != "no"; then
 	 [Define to 1 if gtest defines edit_distance::CreateUnifiedDiff])],
 	[AC_MSG_RESULT(no)])
     CPPFLAGS=$CPPFLAGS_SAVED
-fi    
+fi
 
 #
 # ASIO: we extensively use it as the C++ event management module.
@@ -1811,6 +1811,18 @@ Boost:
   BOOST_INCLUDES:  ${BOOST_INCLUDES}
   BOOST_LIBS:      ${BOOST_LIBS}
 
+END
+if test x"$BOOST_LIBS" = "x"; then
+   cat >> config.report << END
+    WARNING: You will be building with boost headers only rather
+    than linking with boost_system library. This is NOT recommended as
+    it may result in non-optimized code on some platforms and
+    introduce runtime errors on others.
+
+END
+fi
+
+cat >> config.report << END
 ${CRYPTO_NAME}:
   CRYPTO_VERSION:  ${CRYPTO_VERSION}
   CRYPTO_CFLAGS:   ${CRYPTO_CFLAGS}
diff --git a/m4macros/ax_boost_for_kea.m4 b/m4macros/ax_boost_for_kea.m4
index a2111c10ae..31ef5f4561 100644
--- a/m4macros/ax_boost_for_kea.m4
+++ b/m4macros/ax_boost_for_kea.m4
@@ -40,7 +40,7 @@ AC_LANG([C++])
 
 DISTCHECK_BOOST_CONFIGURE_FLAG=
 
-# No library by default (and as goal)
+# We'll attempt to Use Boost system library by default
 BOOST_LIBS=
 BOOST_LIB_DIR=
 boost_lib_path=
@@ -157,6 +157,15 @@ AC_ARG_WITH([boost-lib-dir],
     [BOOST_LIB_DIR="$withval"
      DISTCHECK_BOOST_CONFIGURE_FLAG="$DISTCHECK_BOOST_CONFIGURE_FLAG --with-boot-lib-dir=$withval"])
 
+AC_ARG_ENABLE([boost-headers-only],
+    [AS_HELP_STRING([--enable-boost-headers-only],
+        [Build with boost headers only rather than link
+         with boost_system library. This is NOT recommended
+         as it may result in non-optimized code on some
+         platforms or introduce runtime errors on others.])],
+    [enable_boost_header="yes"; BOOST_LIBS=""],
+    [BOOST_LIBS="${BOOST_LIBS} -lboost_system"])
+
 # BOOST_ERROR_CODE_HEADER_ONLY in versions below Boost 1.56.0 can fail
 # to find the error_code.cpp file.
 if test "x${BOOST_LIBS}" = "x"; then