added boost_date_time dependence for the storageClient module;

added diagnostic message in the configure scripts for BOOST_DATE_TIME_LIB
This commit is contained in:
fgerlits 2006-03-23 21:36:58 +00:00
parent 397fea7c87
commit 23aa046283
10 changed files with 87 additions and 14 deletions

View file

@ -67,12 +67,11 @@ export PATH=${prefix}/bin:${PATH}
AX_BOOST_DATE_TIME() AX_BOOST_DATE_TIME()
if test "$BOOST_DATE_TIME_LIB" = "" ; then if test "$BOOST_DATE_TIME_LIB" = "" ; then
BOOST_DATE_TIME_LIB=boost_date_time-gcc BOOST_DATE_TIME_LIB=boost_date_time-gcc
AC_SUBST(BOOST_DATE_TIME_LIB) AC_SUBST(BOOST_DATE_TIME_LIB)
fi fi
AC_MSG_RESULT([checking BOOST_DATE_TIME_LIB... ${BOOST_DATE_TIME_LIB}])
PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1]) PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1])
AC_SUBST(LIBXMLPP_CFLAGS) AC_SUBST(LIBXMLPP_CFLAGS)

View file

@ -61,12 +61,11 @@ export PATH=${prefix}/bin:${PATH}
AX_BOOST_DATE_TIME() AX_BOOST_DATE_TIME()
if test "$BOOST_DATE_TIME_LIB" = "" ; then if test "$BOOST_DATE_TIME_LIB" = "" ; then
BOOST_DATE_TIME_LIB=boost_date_time-gcc BOOST_DATE_TIME_LIB=boost_date_time-gcc
AC_SUBST(BOOST_DATE_TIME_LIB) AC_SUBST(BOOST_DATE_TIME_LIB)
fi fi
AC_MSG_RESULT([checking BOOST_DATE_TIME_LIB... ${BOOST_DATE_TIME_LIB}])
PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1]) PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1])
AC_SUBST(LIBXMLPP_CFLAGS) AC_SUBST(LIBXMLPP_CFLAGS)

View file

@ -61,12 +61,11 @@ export PATH=${prefix}/bin:${PATH}
AX_BOOST_DATE_TIME() AX_BOOST_DATE_TIME()
if test "$BOOST_DATE_TIME_LIB" = "" ; then if test "$BOOST_DATE_TIME_LIB" = "" ; then
BOOST_DATE_TIME_LIB=boost_date_time-gcc BOOST_DATE_TIME_LIB=boost_date_time-gcc
AC_SUBST(BOOST_DATE_TIME_LIB) AC_SUBST(BOOST_DATE_TIME_LIB)
fi fi
AC_MSG_RESULT([checking BOOST_DATE_TIME_LIB... ${BOOST_DATE_TIME_LIB}])
PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1]) PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1])
AC_SUBST(LIBXMLPP_CFLAGS) AC_SUBST(LIBXMLPP_CFLAGS)

View file

@ -61,12 +61,11 @@ export PATH=${prefix}/bin:${PATH}
AX_BOOST_DATE_TIME() AX_BOOST_DATE_TIME()
if test "$BOOST_DATE_TIME_LIB" = "" ; then if test "$BOOST_DATE_TIME_LIB" = "" ; then
BOOST_DATE_TIME_LIB=boost_date_time-gcc BOOST_DATE_TIME_LIB=boost_date_time-gcc
AC_SUBST(BOOST_DATE_TIME_LIB) AC_SUBST(BOOST_DATE_TIME_LIB)
fi fi
AC_MSG_RESULT([checking BOOST_DATE_TIME_LIB... ${BOOST_DATE_TIME_LIB}])
PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1]) PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1])
AC_SUBST(LIBXMLPP_CFLAGS) AC_SUBST(LIBXMLPP_CFLAGS)

View file

@ -73,6 +73,8 @@ AUTHENTICATION_LIB_FILE = ${AUTHENTICATION_LIB_DIR}/lib${AUTHENTICATION_LIB}.a
VPATH = ${SRC_DIR} VPATH = ${SRC_DIR}
BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@
LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@
LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@
@ -136,6 +138,7 @@ TEST_RUNNER_OBJS = ${TMP_DIR}/TestRunner.o \
TEST_RUNNER_LIBS = -l${STORAGE_CLIENT_LIB} -l${CORE_LIB} \ TEST_RUNNER_LIBS = -l${STORAGE_CLIENT_LIB} -l${CORE_LIB} \
-l${AUTHENTICATION_LIB} \ -l${AUTHENTICATION_LIB} \
-l${BOOST_DATE_TIME_LIB} \
-lcppunit -ldl -lxmlrpc++ -lssl -lcppunit -ldl -lxmlrpc++ -lssl

View file

@ -262,3 +262,72 @@ AC_DEFUN([AC_CHECK_CURL], [
dnl-----------------------------------------------------------------------------
dnl Macro to check for C++ namespaces
dnl for more information on this macro, see
dnl http://autoconf-archive.cryp.to/ac_cxx_namespaces.html
dnl
dnl usage:
dnl If the compiler can prevent names clashes using namespaces,
dnl define HAVE_NAMESPACES.
dnl-----------------------------------------------------------------------------
AC_DEFUN([AC_CXX_NAMESPACES],
[AC_CACHE_CHECK(whether the compiler implements namespaces,
ac_cv_cxx_namespaces,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([namespace Outer { namespace Inner { int i = 0; }}],
[using namespace Outer::Inner; return i;],
ac_cv_cxx_namespaces=yes, ac_cv_cxx_namespaces=no)
AC_LANG_RESTORE
])
if test "$ac_cv_cxx_namespaces" = yes; then
AC_DEFINE(HAVE_NAMESPACES,,[define if the compiler implements namespaces])
fi
])
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

View file

@ -60,6 +60,13 @@ export PKG_CONFIG_PATH
export PATH=${prefix}/bin:${PATH} export PATH=${prefix}/bin:${PATH}
AX_BOOST_DATE_TIME()
if test "$BOOST_DATE_TIME_LIB" = "" ; then
BOOST_DATE_TIME_LIB=boost_date_time-gcc
AC_SUBST(BOOST_DATE_TIME_LIB)
fi
AC_MSG_RESULT([checking BOOST_DATE_TIME_LIB... ${BOOST_DATE_TIME_LIB}])
PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1]) PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1])
AC_SUBST(LIBXMLPP_CFLAGS) AC_SUBST(LIBXMLPP_CFLAGS)
AC_SUBST(LIBXMLPP_LIBS) AC_SUBST(LIBXMLPP_LIBS)

View file

@ -1,4 +1,4 @@
dnl----------------------------------------------------------------------------- bdnl-----------------------------------------------------------------------------
dnl Copyright (c) 2004 Media Development Loan Fund dnl Copyright (c) 2004 Media Development Loan Fund
dnl dnl
dnl This file is part of the LiveSupport project. dnl This file is part of the LiveSupport project.
@ -61,12 +61,11 @@ export PATH=${prefix}/bin:${PATH}
AX_BOOST_DATE_TIME() AX_BOOST_DATE_TIME()
if test "$BOOST_DATE_TIME_LIB" = "" ; then if test "$BOOST_DATE_TIME_LIB" = "" ; then
BOOST_DATE_TIME_LIB=boost_date_time-gcc BOOST_DATE_TIME_LIB=boost_date_time-gcc
AC_SUBST(BOOST_DATE_TIME_LIB) AC_SUBST(BOOST_DATE_TIME_LIB)
fi fi
AC_MSG_RESULT([checking BOOST_DATE_TIME_LIB... ${BOOST_DATE_TIME_LIB}])
PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1]) PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1])
AC_SUBST(LIBXMLPP_CFLAGS) AC_SUBST(LIBXMLPP_CFLAGS)

View file

@ -62,11 +62,11 @@ export PATH=${prefix}/bin:${PATH}
AX_BOOST_DATE_TIME() AX_BOOST_DATE_TIME()
if test "$BOOST_DATE_TIME_LIB" = "" ; then if test "$BOOST_DATE_TIME_LIB" = "" ; then
BOOST_DATE_TIME_LIB=boost_date_time-gcc BOOST_DATE_TIME_LIB=boost_date_time-gcc
AC_SUBST(BOOST_DATE_TIME_LIB) AC_SUBST(BOOST_DATE_TIME_LIB)
fi fi
AC_MSG_RESULT([checking BOOST_DATE_TIME_LIB... ${BOOST_DATE_TIME_LIB}])
PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1]) PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1])
AC_SUBST(LIBXMLPP_CFLAGS) AC_SUBST(LIBXMLPP_CFLAGS)

View file

@ -62,12 +62,11 @@ export PATH=${prefix}/bin:${PATH}
AX_BOOST_DATE_TIME() AX_BOOST_DATE_TIME()
if test "$BOOST_DATE_TIME_LIB" = "" ; then if test "$BOOST_DATE_TIME_LIB" = "" ; then
BOOST_DATE_TIME_LIB=boost_date_time-gcc BOOST_DATE_TIME_LIB=boost_date_time-gcc
AC_SUBST(BOOST_DATE_TIME_LIB) AC_SUBST(BOOST_DATE_TIME_LIB)
fi fi
AC_MSG_RESULT([checking BOOST_DATE_TIME_LIB... ${BOOST_DATE_TIME_LIB}])
PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1]) PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1])
AC_SUBST(LIBXMLPP_CFLAGS) AC_SUBST(LIBXMLPP_CFLAGS)