undo of [2138]
This commit is contained in:
parent
efa9ca6e74
commit
eff58bbcbc
2 changed files with 0 additions and 47 deletions
|
@ -114,7 +114,6 @@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \
|
|||
-I${AUTHENTICATION_INCLUDE_DIR} \
|
||||
-I${INCLUDE_DIR} -I${TMP_DIR}
|
||||
LDFLAGS = @LDFLAGS@ -pthread \
|
||||
-l${BOOST_DATE_TIME_LIB} \
|
||||
${LIBXMLPP_LIBS} \
|
||||
${ICU_LIBS} \
|
||||
${CURL_LIBS} \
|
||||
|
|
|
@ -262,52 +262,6 @@ AC_DEFUN([AC_CHECK_CURL], [
|
|||
|
||||
|
||||
|
||||
<<<<<<< .mine
|
||||
dnl-----------------------------------------------------------------------------
|
||||
dnl Macro to check for the boost datetime library.
|
||||
dnl for more information on boost, see http://www.boost.org/
|
||||
dnl for more information on this macro, see
|
||||
dnl http://autoconf-archive.cryp.to/ax_boost_date-time.html
|
||||
dnl
|
||||
dnl usage:
|
||||
dnl This macro checks to see if the Boost.DateTime library is installed.
|
||||
dnl It also attempts to guess the currect library name using several attempts.
|
||||
dnl It tries to build the library name using a user supplied name or suffix
|
||||
dnl and then just the raw library.
|
||||
dnl
|
||||
dnl If the library is found, HAVE_BOOST_DATE_TIME is defined and
|
||||
dnl BOOST_DATE_TIME_LIB is set to the name of the library.
|
||||
dnl
|
||||
dnl This macro calls AC_SUBST(BOOST_DATE_TIME_LIB).
|
||||
dnl-----------------------------------------------------------------------------
|
||||
AC_DEFUN([AX_BOOST_DATE_TIME],
|
||||
[AC_REQUIRE([AC_CXX_NAMESPACES])dnl
|
||||
AC_CACHE_CHECK(whether the Boost::DateTime library is available,
|
||||
ax_cv_boost_date_time,
|
||||
[AC_LANG_SAVE
|
||||
AC_LANG_CPLUSPLUS
|
||||
AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[#include <boost/date_time/gregorian/gregorian_types.hpp>]],
|
||||
[[using namespace boost::gregorian; date d(2002,Jan,10); return 0;]]),
|
||||
ax_cv_boost_date_time=yes, ax_cv_boost_date_time=no)
|
||||
AC_LANG_RESTORE
|
||||
])
|
||||
if test "$ax_cv_boost_date_time" = yes; then
|
||||
AC_DEFINE(HAVE_BOOST_DATE_TIME,,[define if the Boost::DateTime library is available])
|
||||
dnl Now determine the appropriate file names
|
||||
AC_ARG_WITH([boost-date-time],AS_HELP_STRING([--with-boost-date-time],
|
||||
[specify the boost date-time library or suffix to use]),
|
||||
[if test "x$with_boost_date_time" != "xno"; then
|
||||
ax_date_time_lib=$with_boost_date_time
|
||||
ax_boost_date_time_lib=boost_date_time-$with_boost_date_time
|
||||
fi])
|
||||
for ax_lib in $ax_date_time_lib $ax_boost_date_time_lib boost_date_time; do
|
||||
AC_CHECK_LIB($ax_lib, main, [BOOST_DATE_TIME_LIB=$ax_lib break])
|
||||
done
|
||||
AC_SUBST(BOOST_DATE_TIME_LIB)
|
||||
fi
|
||||
])dnl
|
||||
|
||||
=======
|
||||
dnl-----------------------------------------------------------------------------
|
||||
dnl Macro to check for C++ namespaces
|
||||
dnl for more information on this macro, see
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue