Browse Source

[4009] Fixed the boost_system dependency

Francis Dupont 9 years ago
parent
commit
d7c8e1aa32
3 changed files with 8 additions and 4 deletions
  1. 7 1
      configure.ac
  2. 1 2
      src/lib/asiolink/Makefile.am
  3. 0 1
      src/lib/cc/Makefile.am

+ 7 - 1
configure.ac

@@ -1245,7 +1245,13 @@ AC_SUBST(GTEST_SOURCE)
 CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/ext/coroutine"
 CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/ext/coroutine"
 #
 #
 # Disable threads: Currently we don't use them.
 # Disable threads: Currently we don't use them.
-CPPFLAGS="$CPPFLAGS -DASIO_DISABLE_THREADS=1"
+CPPFLAGS="$CPPFLAGS -DBOOST_ASIO_DISABLE_THREADS=1"
+#
+# Don't want boost system library
+CPPFLAGS="$CPPFLAGS -DBOOST_ERROR_CODE_HEADER_ONLY"
+#
+# Avoid boost::system::throws multiple defines
+CPPFLAGS="$CPPFLAGS -DBOOST_SYSTEM_NO_DEPRECATED"
 
 
 # Check for functions that are not available on all platforms
 # Check for functions that are not available on all platforms
 AC_CHECK_FUNCS([pselect])
 AC_CHECK_FUNCS([pselect])

+ 1 - 2
src/lib/asiolink/Makefile.am

@@ -35,8 +35,7 @@ libkea_asiolink_la_SOURCES += udp_socket.h
 # KEA_CXXFLAGS)
 # KEA_CXXFLAGS)
 libkea_asiolink_la_CXXFLAGS = $(AM_CXXFLAGS)
 libkea_asiolink_la_CXXFLAGS = $(AM_CXXFLAGS)
 libkea_asiolink_la_CPPFLAGS = $(AM_CPPFLAGS)
 libkea_asiolink_la_CPPFLAGS = $(AM_CPPFLAGS)
-libkea_asiolink_la_LIBADD  = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-libkea_asiolink_la_LIBADD += -lboost_system
+libkea_asiolink_la_LIBADD = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 
 
 # IOAddress is sometimes used in user-library code
 # IOAddress is sometimes used in user-library code
 libkea_asiolink_includedir = $(pkgincludedir)/asiolink
 libkea_asiolink_includedir = $(pkgincludedir)/asiolink

+ 0 - 1
src/lib/cc/Makefile.am

@@ -9,7 +9,6 @@ libkea_cc_la_SOURCES = data.cc data.h
 libkea_cc_la_SOURCES += command_interpreter.cc command_interpreter.h
 libkea_cc_la_SOURCES += command_interpreter.cc command_interpreter.h
 
 
 libkea_cc_la_LIBADD  = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 libkea_cc_la_LIBADD  = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-libkea_cc_la_LIBADD += -lboost_system
 
 
 libkea_cc_la_LDFLAGS = -no-undefined -version-info 1:0:0
 libkea_cc_la_LDFLAGS = -no-undefined -version-info 1:0:0