From 865ef7161276d2dd1ac8d40827cb4d27cdb60b0c Mon Sep 17 00:00:00 2001 From: 0809216 <0809216@1ed66053-1c2d-0410-8867-f7571e6e31d3> Date: Tue, 7 Sep 2010 12:41:57 +0000 Subject: [PATCH] Fix boost lib suffix git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-ramiel-epoll-cond@10288 1ed66053-1c2d-0410-8867-f7571e6e31d3 --- config.h.in | 2 +- configure | 6 +++--- l7vsd/src/Makefile.am | 14 +++++++------- l7vsd/src/Makefile.in | 14 +++++++------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/config.h.in b/config.h.in index 199183df..cd09d136 100644 --- a/config.h.in +++ b/config.h.in @@ -97,5 +97,5 @@ #undef inline #endif -/* Define to `unsigned' if does not define. */ +/* Define to `unsigned int' if does not define. */ #undef size_t diff --git a/configure b/configure index 23962ab2..fd67e268 100755 --- a/configure +++ b/configure @@ -19164,13 +19164,13 @@ echo "$as_me: error: l7vsd require rt library. " >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: checking for main in -lboost_thread" >&5 -echo $ECHO_N "checking for main in -lboost_thread... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for main in -lboost_thread-mt" >&5 +echo $ECHO_N "checking for main in -lboost_thread-mt... $ECHO_C" >&6 if test "${ac_cv_lib_boost_thread_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lboost_thread $LIBS" +LIBS="-lboost_thread-mt $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF diff --git a/l7vsd/src/Makefile.am b/l7vsd/src/Makefile.am index ea73b471..efb7b4b0 100644 --- a/l7vsd/src/Makefile.am +++ b/l7vsd/src/Makefile.am @@ -204,9 +204,9 @@ l7vsd_LDADD = \ -llog4cxx \ -lrt \ -lssl \ - -lboost_thread \ - -lboost_system \ - -lboost_serialization + -lboost_thread-mt \ + -lboost_system-mt \ + -lboost_serialization-mt l7vsadm_CPPFLAGS = \ -O2 -fno-strict-aliasing -g -Wall -Werror \ @@ -231,10 +231,10 @@ l7vsadm_LDADD = \ libl7vsadm_parameter.a \ -llog4cxx \ -lrt \ - -lboost_thread \ - -lboost_system \ - -lboost_serialization \ - -lboost_regex + -lboost_thread-mt \ + -lboost_system-mt \ + -lboost_serialization-mt \ + -lboost_regex-mt install: $(INSTALL) -m 755 -d $(CONFIG_SOCK_PATH) diff --git a/l7vsd/src/Makefile.in b/l7vsd/src/Makefile.in index 55f97a07..9ecd5bef 100644 --- a/l7vsd/src/Makefile.in +++ b/l7vsd/src/Makefile.in @@ -467,9 +467,9 @@ l7vsd_LDADD = \ -llog4cxx \ -lrt \ -lssl \ - -lboost_thread \ - -lboost_system \ - -lboost_serialization + -lboost_thread-mt \ + -lboost_system-mt \ + -lboost_serialization-mt l7vsadm_CPPFLAGS = \ -O2 -fno-strict-aliasing -g -Wall -Werror \ @@ -494,10 +494,10 @@ l7vsadm_LDADD = \ libl7vsadm_parameter.a \ -llog4cxx \ -lrt \ - -lboost_thread \ - -lboost_system \ - -lboost_serialization \ - -lboost_regex + -lboost_thread-mt \ + -lboost_system-mt \ + -lboost_serialization-mt \ + -lboost_regex-mt all: all-am -- 2.11.0