From 11894494c4619be6ec3660ba92d67f5352a23e77 Mon Sep 17 00:00:00 2001 From: maroy Date: Tue, 2 Aug 2005 08:45:41 +0000 Subject: [PATCH] changed modules to check for boost date-time lib --- livesupport/modules/core/etc/Makefile.in | 6 +- livesupport/modules/core/etc/acinclude.m4 | 71 ++++++++++++++++++- livesupport/modules/core/etc/configure.ac | 12 +++- .../modules/eventScheduler/etc/Makefile.in | 6 +- .../modules/eventScheduler/etc/acinclude.m4 | 71 ++++++++++++++++++- .../modules/eventScheduler/etc/configure.ac | 12 +++- .../modules/playlistExecutor/etc/Makefile.in | 6 +- .../modules/playlistExecutor/etc/acinclude.m4 | 71 ++++++++++++++++++- .../modules/playlistExecutor/etc/configure.ac | 12 +++- .../modules/schedulerClient/etc/acinclude.m4 | 71 ++++++++++++++++++- .../modules/schedulerClient/etc/configure.ac | 12 +++- livesupport/modules/widgets/etc/Makefile.in | 7 +- livesupport/modules/widgets/etc/acinclude.m4 | 71 ++++++++++++++++++- livesupport/modules/widgets/etc/configure.ac | 12 +++- .../products/gLiveSupport/etc/Makefile.in | 6 +- .../products/gLiveSupport/etc/acinclude.m4 | 71 ++++++++++++++++++- .../products/gLiveSupport/etc/configure.ac | 11 ++- .../products/scheduler/etc/Makefile.in | 8 ++- .../products/scheduler/etc/acinclude.m4 | 71 ++++++++++++++++++- .../products/scheduler/etc/configure.ac | 13 +++- 20 files changed, 586 insertions(+), 34 deletions(-) diff --git a/livesupport/modules/core/etc/Makefile.in b/livesupport/modules/core/etc/Makefile.in index 0303846bc..916a66d2d 100644 --- a/livesupport/modules/core/etc/Makefile.in +++ b/livesupport/modules/core/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.32 $ +# Version : $Revision: 1.33 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/etc/Makefile.in,v $ # # @configure_input@ @@ -67,6 +67,8 @@ GENRBOPTS = --destdir ${TMP_DIR} \ VPATH = ${SRC_DIR} +BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ + LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ @@ -155,7 +157,7 @@ TEST_RUNNER_RES = ${TMP_DIR}/${PACKAGE_NAME}_root.res \ ${TMP_DIR}/${PACKAGE_NAME}_jp.res TEST_RUNNER_LIBS = -l${CORE_LIB} ${ICU_LIBS} \ - -lboost_date_time-gcc -lcppunit -ldl -lxmlrpc++ + -l${BOOST_DATE_TIME_LIB} -lcppunit -ldl -lxmlrpc++ #------------------------------------------------------------------------------- diff --git a/livesupport/modules/core/etc/acinclude.m4 b/livesupport/modules/core/etc/acinclude.m4 index 367526ae9..362fb884e 100644 --- a/livesupport/modules/core/etc/acinclude.m4 +++ b/livesupport/modules/core/etc/acinclude.m4 @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.2 $ +dnl Version : $Revision: 1.3 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/etc/acinclude.m4,v $ dnl----------------------------------------------------------------------------- @@ -90,3 +90,72 @@ AC_DEFUN([PKG_CHECK_MODULES], [ +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 ]], + [[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 + diff --git a/livesupport/modules/core/etc/configure.ac b/livesupport/modules/core/etc/configure.ac index b282b627f..5ba011e52 100644 --- a/livesupport/modules/core/etc/configure.ac +++ b/livesupport/modules/core/etc/configure.ac @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.12 $ +dnl Version : $Revision: 1.13 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ dnl----------------------------------------------------------------------------- AC_INIT(Core, 1.0, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision: 1.12 $) +AC_REVISION($Revision: 1.13 $) AC_CONFIG_SRCDIR(../src/UniqueId.cxx) @@ -64,6 +64,14 @@ AC_MSG_RESULT([using pkg-config path: ${PKG_CONFIG_PATH}]) export PKG_CONFIG_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 + + PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1]) AC_SUBST(LIBXMLPP_CFLAGS) AC_SUBST(LIBXMLPP_LIBS) diff --git a/livesupport/modules/eventScheduler/etc/Makefile.in b/livesupport/modules/eventScheduler/etc/Makefile.in index a3f8c44fc..84a1f88e9 100644 --- a/livesupport/modules/eventScheduler/etc/Makefile.in +++ b/livesupport/modules/eventScheduler/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.8 $ +# Version : $Revision: 1.9 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/eventScheduler/etc/Makefile.in,v $ # # @configure_input@ @@ -65,6 +65,8 @@ CORE_LIB_FILE = ${CORE_LIB_DIR}/lib${CORE_LIB}.a VPATH = ${SRC_DIR} +BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ + LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ @@ -110,7 +112,7 @@ TEST_RUNNER_OBJS = ${TMP_DIR}/TestScheduledEvent.o \ ${TMP_DIR}/EventSchedulerTest.o \ ${TMP_DIR}/TestRunner.o TEST_RUNNER_LIBS = -l${EVENT_SCHEDULER_LIB} -l${CORE_LIB} \ - -lboost_date_time-gcc \ + -l${BOOST_DATE_TIME_LIB} \ -lcppunit -ldl diff --git a/livesupport/modules/eventScheduler/etc/acinclude.m4 b/livesupport/modules/eventScheduler/etc/acinclude.m4 index 1ac365c65..cd5ab0e4b 100644 --- a/livesupport/modules/eventScheduler/etc/acinclude.m4 +++ b/livesupport/modules/eventScheduler/etc/acinclude.m4 @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.2 $ +dnl Version : $Revision: 1.3 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/eventScheduler/etc/acinclude.m4,v $ dnl----------------------------------------------------------------------------- @@ -90,3 +90,72 @@ AC_DEFUN([PKG_CHECK_MODULES], [ +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 ]], + [[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 + diff --git a/livesupport/modules/eventScheduler/etc/configure.ac b/livesupport/modules/eventScheduler/etc/configure.ac index 861e2367d..b09d82ed1 100644 --- a/livesupport/modules/eventScheduler/etc/configure.ac +++ b/livesupport/modules/eventScheduler/etc/configure.ac @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.4 $ +dnl Version : $Revision: 1.5 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/eventScheduler/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ dnl----------------------------------------------------------------------------- AC_INIT(EventScheduler, 1.0, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision: 1.4 $) +AC_REVISION($Revision: 1.5 $) AC_CONFIG_SRCDIR(../src/SchedulerThread.cxx) @@ -58,6 +58,14 @@ AC_MSG_RESULT([using pkg-config path: ${PKG_CONFIG_PATH}]) export PKG_CONFIG_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 + + PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1]) AC_SUBST(LIBXMLPP_CFLAGS) AC_SUBST(LIBXMLPP_LIBS) diff --git a/livesupport/modules/playlistExecutor/etc/Makefile.in b/livesupport/modules/playlistExecutor/etc/Makefile.in index 6a2eebd56..e5cd2bd00 100644 --- a/livesupport/modules/playlistExecutor/etc/Makefile.in +++ b/livesupport/modules/playlistExecutor/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.19 $ +# Version : $Revision: 1.20 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/etc/Makefile.in,v $ # # @configure_input@ @@ -76,6 +76,8 @@ GST_REAL_LIB_DIR=${REAL_BASE_DIR}/modules/gstreamerElements/lib VPATH = ${SRC_DIR} +BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ + LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ @@ -137,7 +139,7 @@ TEST_RUNNER_OBJS = ${TMP_DIR}/TestRunner.o \ TEST_RUNNER_LIBS = -l${PLAYLIST_EXECUTOR_LIB} -l${CORE_LIB} \ -l${GSTREAMER_ELEMENTS_LIB} \ ${TAGLIB_LIBS} \ - -lboost_date_time-gcc -lcppunit -ldl -lm -lxmlrpc++ + -l${BOOST_DATE_TIME_LIB} -lcppunit -ldl -lm -lxmlrpc++ TWOTEST_RUNNER_OBJS = ${TMP_DIR}/TestRunner.o \ ${TMP_DIR}/TwoGstreamerPlayersTest.o diff --git a/livesupport/modules/playlistExecutor/etc/acinclude.m4 b/livesupport/modules/playlistExecutor/etc/acinclude.m4 index 117e23bff..0e7ba1f97 100644 --- a/livesupport/modules/playlistExecutor/etc/acinclude.m4 +++ b/livesupport/modules/playlistExecutor/etc/acinclude.m4 @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.2 $ +dnl Version : $Revision: 1.3 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/etc/acinclude.m4,v $ dnl----------------------------------------------------------------------------- @@ -90,3 +90,72 @@ AC_DEFUN([PKG_CHECK_MODULES], [ +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 ]], + [[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 + diff --git a/livesupport/modules/playlistExecutor/etc/configure.ac b/livesupport/modules/playlistExecutor/etc/configure.ac index a5ad78e76..54bc3852c 100644 --- a/livesupport/modules/playlistExecutor/etc/configure.ac +++ b/livesupport/modules/playlistExecutor/etc/configure.ac @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.10 $ +dnl Version : $Revision: 1.11 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ dnl----------------------------------------------------------------------------- AC_INIT(PlaylistExecutor, 1.0, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision: 1.10 $) +AC_REVISION($Revision: 1.11 $) AC_CONFIG_SRCDIR(../src/AudioPlayerFactory.cxx) @@ -58,6 +58,14 @@ AC_MSG_RESULT([using pkg-config path: ${PKG_CONFIG_PATH}]) export PKG_CONFIG_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 + + PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1]) AC_SUBST(LIBXMLPP_CFLAGS) AC_SUBST(LIBXMLPP_LIBS) diff --git a/livesupport/modules/schedulerClient/etc/acinclude.m4 b/livesupport/modules/schedulerClient/etc/acinclude.m4 index 6ee761693..617ed95fc 100644 --- a/livesupport/modules/schedulerClient/etc/acinclude.m4 +++ b/livesupport/modules/schedulerClient/etc/acinclude.m4 @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.2 $ +dnl Version : $Revision: 1.3 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/schedulerClient/etc/acinclude.m4,v $ dnl----------------------------------------------------------------------------- @@ -90,3 +90,72 @@ AC_DEFUN([PKG_CHECK_MODULES], [ +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 ]], + [[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 + diff --git a/livesupport/modules/schedulerClient/etc/configure.ac b/livesupport/modules/schedulerClient/etc/configure.ac index a510a7a79..16331aa6d 100644 --- a/livesupport/modules/schedulerClient/etc/configure.ac +++ b/livesupport/modules/schedulerClient/etc/configure.ac @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.4 $ +dnl Version : $Revision: 1.5 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/schedulerClient/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ dnl----------------------------------------------------------------------------- AC_INIT(StorageClient, 1.0, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision: 1.4 $) +AC_REVISION($Revision: 1.5 $) AC_CONFIG_SRCDIR(../include/LiveSupport/SchedulerClient/SchedulerClientFactory.h) @@ -58,6 +58,14 @@ AC_MSG_RESULT([using pkg-config path: ${PKG_CONFIG_PATH}]) export PKG_CONFIG_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 + + PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1]) AC_SUBST(LIBXMLPP_CFLAGS) AC_SUBST(LIBXMLPP_LIBS) diff --git a/livesupport/modules/widgets/etc/Makefile.in b/livesupport/modules/widgets/etc/Makefile.in index aac3a1592..d8da9f5c0 100644 --- a/livesupport/modules/widgets/etc/Makefile.in +++ b/livesupport/modules/widgets/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.21 $ +# Version : $Revision: 1.22 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/etc/Makefile.in,v $ # # @configure_input@ @@ -77,6 +77,8 @@ GENRBOPTS = --destdir ${TMP_DIR} \ VPATH = ${SRC_DIR} +BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ + LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ @@ -152,8 +154,7 @@ TEST_RUNNER_RES = ${TMP_DIR}/${PACKAGE_NAME}_root.res \ ${TMP_DIR}/${PACKAGE_NAME}_hu.res TEST_EXE_LIBS = -l${WIDGETS_LIB} -l${CORE_LIB} ${ICU_LIBS} \ - -lboost_date_time-gcc \ - -lxmlrpc++ -lssl + -l${BOOST_DATE_TIME_LIB} -lxmlrpc++ -lssl #------------------------------------------------------------------------------- # Targets diff --git a/livesupport/modules/widgets/etc/acinclude.m4 b/livesupport/modules/widgets/etc/acinclude.m4 index 3e911fac7..90b0d2140 100644 --- a/livesupport/modules/widgets/etc/acinclude.m4 +++ b/livesupport/modules/widgets/etc/acinclude.m4 @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.1 $ +dnl Version : $Revision: 1.2 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/etc/acinclude.m4,v $ dnl----------------------------------------------------------------------------- @@ -90,3 +90,72 @@ AC_DEFUN([PKG_CHECK_MODULES], [ +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 ]], + [[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 + diff --git a/livesupport/modules/widgets/etc/configure.ac b/livesupport/modules/widgets/etc/configure.ac index 1d5195e0a..38fd8cbe0 100644 --- a/livesupport/modules/widgets/etc/configure.ac +++ b/livesupport/modules/widgets/etc/configure.ac @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.2 $ +dnl Version : $Revision: 1.3 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ dnl----------------------------------------------------------------------------- AC_INIT(Widgets, 1.0, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision: 1.2 $) +AC_REVISION($Revision: 1.3 $) AC_CONFIG_SRCDIR(../include/LiveSupport/Widgets/ImageButton.h) @@ -58,6 +58,14 @@ AC_MSG_RESULT([using pkg-config path: ${PKG_CONFIG_PATH}]) export PKG_CONFIG_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 + + PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1]) AC_SUBST(LIBXMLPP_CFLAGS) AC_SUBST(LIBXMLPP_LIBS) diff --git a/livesupport/products/gLiveSupport/etc/Makefile.in b/livesupport/products/gLiveSupport/etc/Makefile.in index 89d555ef8..c82faca1d 100644 --- a/livesupport/products/gLiveSupport/etc/Makefile.in +++ b/livesupport/products/gLiveSupport/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.48 $ +# Version : $Revision: 1.49 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/etc/Makefile.in,v $ # # @configure_input@ @@ -165,6 +165,8 @@ WIDGETS_LIB_DIR = ${WIDGETS_DIR}/lib WIDGETS_LIB = livesupport_widgets WIDGETS_LIB_FILE = ${WIDGETS_LIB_DIR}/lib${WIDGETS_LIB}.a +BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ + LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ @@ -277,7 +279,7 @@ G_LIVESUPPORT_EXE_LIBS = -l${PLAYLIST_EXECUTOR_LIB} \ -l${WIDGETS_LIB} \ -l${SCHEDULER_CLIENT_LIB} \ -l${CORE_LIB} \ - -lboost_date_time-gcc \ + -l${BOOST_DATE_TIME_LIB} \ -lxmlrpc++ -lssl TEST_RUNNER_OBJS = ${G_LIVESUPPORT_OBJS} \ diff --git a/livesupport/products/gLiveSupport/etc/acinclude.m4 b/livesupport/products/gLiveSupport/etc/acinclude.m4 index 7286d8cce..66b29675a 100644 --- a/livesupport/products/gLiveSupport/etc/acinclude.m4 +++ b/livesupport/products/gLiveSupport/etc/acinclude.m4 @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.2 $ +dnl Version : $Revision: 1.3 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/etc/acinclude.m4,v $ dnl----------------------------------------------------------------------------- @@ -90,3 +90,72 @@ AC_DEFUN([PKG_CHECK_MODULES], [ +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 ]], + [[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 + diff --git a/livesupport/products/gLiveSupport/etc/configure.ac b/livesupport/products/gLiveSupport/etc/configure.ac index bb85609bc..149b67359 100644 --- a/livesupport/products/gLiveSupport/etc/configure.ac +++ b/livesupport/products/gLiveSupport/etc/configure.ac @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.9 $ +dnl Version : $Revision: 1.10 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ dnl----------------------------------------------------------------------------- AC_INIT(gLiveSupport, 0.1, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision: 1.9 $) +AC_REVISION($Revision: 1.10 $) AC_CONFIG_SRCDIR(../src/main.cxx) @@ -59,6 +59,13 @@ AC_MSG_RESULT([using pkg-config path: ${PKG_CONFIG_PATH}]) export PKG_CONFIG_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 + PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1]) AC_SUBST(LIBXMLPP_CFLAGS) AC_SUBST(LIBXMLPP_LIBS) diff --git a/livesupport/products/scheduler/etc/Makefile.in b/livesupport/products/scheduler/etc/Makefile.in index e2ebe95a9..91698fc08 100644 --- a/livesupport/products/scheduler/etc/Makefile.in +++ b/livesupport/products/scheduler/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.64 $ +# Version : $Revision: 1.65 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/Makefile.in,v $ # # @configure_input@ @@ -100,10 +100,14 @@ REPLACE_SED_STRING="s/ls_lib_dir/${USR_LIB_DIR_S}/; \ VPATH = ${SRC_DIR} +BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ + LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ + LIBODBCXX_CFLAGS=@LIBODBCXX_CFLAGS@ LIBODBCXX_LIBS=@LIBODBCXX_LIBS@ + GSTREAMER_CFLAGS=@GSTREAMER_CFLAGS@ GSTREAMER_LIBS=@GSTREAMER_LIBS@ @@ -259,7 +263,7 @@ SCHEDULER_EXE_LIBS = -l${EVENT_SCHEDULER_LIB} -l${PLAYLIST_EXECUTOR_LIB} \ -l${GSTREAMER_ELEMENTS_LIB} \ -l${STORAGE_LIB} -l${DB_LIB} -l${AUTHENTICATION_LIB} \ -l${CORE_LIB} \ - -lboost_date_time-gcc \ + -l${BOOST_DATE_TIME_LIB} \ -lxmlrpc++ -lssl TEST_RUNNER_OBJS = ${SCHEDULER_OBJS} \ diff --git a/livesupport/products/scheduler/etc/acinclude.m4 b/livesupport/products/scheduler/etc/acinclude.m4 index 02e0932fb..e747fba5b 100644 --- a/livesupport/products/scheduler/etc/acinclude.m4 +++ b/livesupport/products/scheduler/etc/acinclude.m4 @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.2 $ +dnl Version : $Revision: 1.3 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/acinclude.m4,v $ dnl----------------------------------------------------------------------------- @@ -90,3 +90,72 @@ AC_DEFUN([PKG_CHECK_MODULES], [ +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 ]], + [[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 + diff --git a/livesupport/products/scheduler/etc/configure.ac b/livesupport/products/scheduler/etc/configure.ac index b175b3405..a218cb5c2 100644 --- a/livesupport/products/scheduler/etc/configure.ac +++ b/livesupport/products/scheduler/etc/configure.ac @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.11 $ +dnl Version : $Revision: 1.12 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ dnl----------------------------------------------------------------------------- AC_INIT(Scheduler, 0.1, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision: 1.11 $) +AC_REVISION($Revision: 1.12 $) AC_CONFIG_SRCDIR(../src/main.cxx) @@ -59,6 +59,14 @@ AC_MSG_RESULT([using pkg-config path: ${PKG_CONFIG_PATH}]) export PKG_CONFIG_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 + + PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1]) AC_SUBST(LIBXMLPP_CFLAGS) AC_SUBST(LIBXMLPP_LIBS) @@ -69,6 +77,7 @@ PKG_CHECK_MODULES(GSTREAMER,[gstreamer-0.8 >= 0.8]) AC_SUBST(GSTREAMER_CFLAGS) AC_SUBST(GSTREAMER_LIBS) + dnl----------------------------------------------------------------------------- dnl enable compilaton for code coverage data dnl-----------------------------------------------------------------------------