From e571aae9e2e7fe5a435eab5c9536c5cdcaa6901c Mon Sep 17 00:00:00 2001 From: TATEISHI Katsuyuki Date: Sat, 15 Aug 2009 19:05:31 +0900 Subject: [PATCH] Check the gcc version to determin boost so name. --- configure.ac | 4 ++++ src/Makefile.am | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 923cace..0704a28 100644 --- a/configure.ac +++ b/configure.ac @@ -64,10 +64,14 @@ AC_FUNC_MKTIME AC_FUNC_STRFTIME AC_CHECK_FUNCS([gethostname localtime_r memset]) +# Check gcc version. +AC_CONFIG_COMMANDS_PRE([sslproxy_gcc_ver=`gcc -dumpversion | sed -e 's/\.//; s/\..*$//;'`]) + AC_SUBST(CC,g++) AC_SUBST(sslproxy_version, SSLPROXY_VERSION) AC_SUBST(sslproxy_patchlv, SSLPROXY_PATCHLV) AC_SUBST(sslproxy_relsuffix, SSLPROXY_RELSUFFIX) +AC_SUBST(sslproxy_gcc_ver) AC_CONFIG_FILES([parameter/Makefile] [logger/Makefile] [Makefile] diff --git a/src/Makefile.am b/src/Makefile.am index e1f3dc2..00a1673 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -34,6 +34,6 @@ sslproxy_LDADD = $(top_builddir)/logger/libsslproxy_logger.a \ -llog4cxx \ -lrt \ -lssl \ - -lboost_regex-gcc41-mt \ - -lboost_system-gcc41-mt \ - -lboost_thread-gcc41-mt + -lboost_regex-gcc@sslproxy_gcc_ver@-mt \ + -lboost_system-gcc@sslproxy_gcc_ver@-mt \ + -lboost_thread-gcc@sslproxy_gcc_ver@-mt -- 2.11.0