diff --git a/livesupport/Makefile b/livesupport/Makefile index 74bd62387..2af007947 100644 --- a/livesupport/Makefile +++ b/livesupport/Makefile @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.21 $ +# Version : $Revision: 1.22 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/Attic/Makefile,v $ #------------------------------------------------------------------------------- @@ -67,7 +67,7 @@ TOOLS_DIR = ${BASE_DIR}/tools BOOST_DIR = ${TOOLS_DIR}/boost BOOST_VERSION = boost-1.31 LIBXMLXX_DIR = ${TOOLS_DIR}/libxml++ -LIBXMLXX_VERSION = libxml++-1.0.4 +LIBXMLXX_VERSION = libxml++-2.8.0 CXXUNIT_DIR = ${TOOLS_DIR}/cppunit CXXUNIT_VERSION = cppunit-1.10.2 LIBODBCXX_DIR = ${TOOLS_DIR}/libodbc++ @@ -155,7 +155,6 @@ recompile: distclean modules_setup products_setup compile tools_setup: ${BOOST_DIR}/${BOOST_VERSION}/bin/install.sh - ${LIBXMLXX_DIR}/${LIBXMLXX_VERSION}/bin/install.sh ${CXXUNIT_DIR}/${CXXUNIT_VERSION}/bin/install.sh ${LIBODBCXX_DIR}/${LIBODBCXX_VERSION}/bin/install.sh ${XMLRPCXX_DIR}/${XMLRPCXX_VERSION}/bin/install.sh @@ -163,6 +162,7 @@ tools_setup: ${HELIX_DIR}/${HELIX_VERSION}/bin/install.sh ${GTK_DIR}/${GTK_VERSION}/bin/install.sh ${GTKMM_DIR}/${GTKMM_VERSION}/bin/install.sh + ${LIBXMLXX_DIR}/${LIBXMLXX_VERSION}/bin/install.sh ${ICU_DIR}/${ICU_VERSION}/bin/install.sh doxytag_setup: diff --git a/livesupport/modules/authentication/bin/autogen.sh b/livesupport/modules/authentication/bin/autogen.sh index 659444e21..cc76d62f2 100755 --- a/livesupport/modules/authentication/bin/autogen.sh +++ b/livesupport/modules/authentication/bin/autogen.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.2 $ +# Version : $Revision: 1.3 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/bin/autogen.sh,v $ #------------------------------------------------------------------------------- @@ -33,20 +33,18 @@ package="Authentication" -# assume we're in $basedir/bin -basedir=`dirname $0`/.. +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd; cd -` test -z "$basedir" && basedir=. +usrdir=`cd $basedir/../../usr; pwd; cd -` +bindir=$basedir/bin +etcdir=$basedir/etc tmpdir=$basedir/tmp cd "$tmpdir" DIE=0 -# look at all other directories as seen from ${basedir}/tmp -tmpdir=. -bindir=../bin -etcdir=../etc - (autoheader --version) < /dev/null > /dev/null 2>&1 || { echo echo "You must have autoconf installed to compile $package." @@ -76,12 +74,21 @@ echo "Generating configuration files for $package, please wait...." configure_ac=${etcdir}/configure.ac configure=${tmpdir}/configure +aclocal_m4=${tmpdir}/aclocal.m4 -#echo " aclocal $ACLOCAL_FLAGS" -#aclocal $ACLOCAL_FLAGS +# run aclocal in etc, as it's blind, only sees files in the current directory +ACLOCAL_FLAGS="--output=${aclocal_m4}" +echo " aclocal $ACLOCAL_FLAGS" +cd ${etcdir} && aclocal $ACLOCAL_FLAGS ; cd ${tmpdir} echo " autoheader ${configure_ac}" autoheader ${configure_ac} -echo " autoconf -o ${configure} ${configure_ac}" -autoconf -o ${configure} ${configure_ac} +echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" +autoconf -I ${tmpdir} -o ${configure} ${configure_ac} + +export CPPFLAGS="-I$usrdir/include" +export LDFLAGS="-L$usrdir/lib" +export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig" +export LD_LIBRARY_PATH="$usrdir/lib" ${configure} "$@" && echo + diff --git a/livesupport/modules/authentication/etc/Makefile.in b/livesupport/modules/authentication/etc/Makefile.in index 1958329b4..1fde82686 100644 --- a/livesupport/modules/authentication/etc/Makefile.in +++ b/livesupport/modules/authentication/etc/Makefile.in @@ -20,8 +20,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: fgerlits $ -# Version : $Revision: 1.5 $ +# Author : $Author: maroy $ +# Version : $Revision: 1.6 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/etc/Makefile.in,v $ # # @configure_input@ @@ -53,7 +53,6 @@ USR_DIR = ${BASE_DIR}/../../usr USR_INCLUDE_DIR = ${USR_DIR}/include USR_LIB_DIR = ${USR_DIR}/lib BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 -LIBXMLPP_INCLUDE_DIR = ${USR_INCLUDE_DIR}/libxml++-1.0 MODULES_DIR = ${BASE_DIR}/.. @@ -67,6 +66,9 @@ STORAGE_SERVER_DIR = ${MODULES_DIR}/storageServer VPATH = ${SRC_DIR} +LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ +LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ + TEST_RESULTS = ${DOC_DIR}/testResults.xml # the text result XSLT has to be relative to the test result file, e.g. TMP_DIR TEST_XSLT = ../etc/testResultToHtml.xsl @@ -84,12 +86,16 @@ DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config CPPFLAGS = @CPPFLAGS@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \ -pedantic -Wall -Wno-long-long \ + ${LIBXMLPP_CFLAGS} \ -I${USR_INCLUDE_DIR} \ -I${BOOST_INCLUDE_DIR} \ - -I${LIBXMLPP_INCLUDE_DIR} \ -I${CORE_INCLUDE_DIR} \ -I${INCLUDE_DIR} -I${TMP_DIR} -LDFLAGS = @LDFLAGS@ -pthread -L${USR_LIB_DIR} -L${CORE_LIB_DIR} -L${LIB_DIR} +LDFLAGS = @LDFLAGS@ -pthread \ + ${LIBXMLPP_LIBS} \ + -L${USR_LIB_DIR} \ + -L${CORE_LIB_DIR} \ + -L${LIB_DIR} #------------------------------------------------------------------------------- @@ -104,7 +110,7 @@ TEST_RUNNER_OBJS = ${TMP_DIR}/TestRunner.o \ ${TMP_DIR}/WebAuthenticationClientTest.o \ ${TMP_DIR}/AuthenticationClientFactoryTest.o -TEST_RUNNER_LIBS = -l${AUTHENTICATION_LIB} -l${CORE_LIB} -lxml++-1.0 \ +TEST_RUNNER_LIBS = -l${AUTHENTICATION_LIB} -l${CORE_LIB} \ -lcppunit -ldl -lxmlrpc++ -lssl diff --git a/livesupport/modules/authentication/etc/acinclude.m4 b/livesupport/modules/authentication/etc/acinclude.m4 new file mode 100644 index 000000000..641ec1a97 --- /dev/null +++ b/livesupport/modules/authentication/etc/acinclude.m4 @@ -0,0 +1,92 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +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 Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/etc/acinclude.m4,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl Macro to check for available modules using pkg-conf +dnl +dnl usage: +dnl PKG_CHECK_MODULES(GSTUFF,[gtk+-2.0 >= 1.3], action-if, action-not) +dnl +dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page +dnl also defines GSTUFF_PKG_ERRORS on error +dnl +dnl This function was taken from the glade-- project +dnl----------------------------------------------------------------------------- +AC_DEFUN(PKG_CHECK_MODULES, [ + succeeded=no + + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + AC_MSG_CHECKING(for $2) + + if $PKG_CONFIG --exists "$2" ; then + AC_MSG_RESULT(yes) + succeeded=yes + + AC_MSG_CHECKING($1_CFLAGS) + $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` + AC_MSG_RESULT($$1_CFLAGS) + + AC_MSG_CHECKING($1_LIBS) + $1_LIBS=`$PKG_CONFIG --libs "$2"` + AC_MSG_RESULT($$1_LIBS) + else + $1_CFLAGS="" + $1_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + ifelse([$4], ,echo $$1_PKG_ERRORS,) + fi + + AC_SUBST($1_CFLAGS) + AC_SUBST($1_LIBS) + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + ifelse([$3], , :, [$3]) + else + ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) + fi +]) + + + diff --git a/livesupport/modules/authentication/etc/configure.ac b/livesupport/modules/authentication/etc/configure.ac index a76c005e1..d7e569d82 100644 --- a/livesupport/modules/authentication/etc/configure.ac +++ b/livesupport/modules/authentication/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/authentication/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ dnl----------------------------------------------------------------------------- AC_INIT(Authentication, 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(../src/AuthenticationClientFactory.cxx) @@ -44,6 +44,10 @@ AC_PROG_CXX() AC_CHECK_HEADERS(getopt.h) +PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.6.0]) +AC_SUBST(LIBXMLPP_CFLAGS) +AC_SUBST(LIBXMLPP_LIBS) + dnl----------------------------------------------------------------------------- dnl enable compilaton for code coverage data dnl----------------------------------------------------------------------------- diff --git a/livesupport/modules/core/bin/autogen.sh b/livesupport/modules/core/bin/autogen.sh index 0e05be22e..1bb1a0e42 100755 --- a/livesupport/modules/core/bin/autogen.sh +++ b/livesupport/modules/core/bin/autogen.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.1 $ +# Version : $Revision: 1.2 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/bin/autogen.sh,v $ #------------------------------------------------------------------------------- @@ -34,19 +34,18 @@ package="Core" # assume we're in $basedir/bin -basedir=`dirname $0`/.. +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd; cd -` test -z "$basedir" && basedir=. +usrdir=`cd $basedir/../../usr; pwd; cd -` +bindir=$basedir/bin +etcdir=$basedir/etc tmpdir=$basedir/tmp cd "$tmpdir" DIE=0 -# look at all other directories as seen from ${basedir}/tmp -tmpdir=. -bindir=../bin -etcdir=../etc - (autoheader --version) < /dev/null > /dev/null 2>&1 || { echo echo "You must have autoconf installed to compile $package." @@ -76,12 +75,20 @@ echo "Generating configuration files for $package, please wait...." configure_ac=${etcdir}/configure.ac configure=${tmpdir}/configure +aclocal_m4=${tmpdir}/aclocal.m4 -#echo " aclocal $ACLOCAL_FLAGS" -#aclocal $ACLOCAL_FLAGS +# run aclocal in etc, as it's blind, only sees files in the current directory +ACLOCAL_FLAGS="--output=${aclocal_m4}" +echo " aclocal $ACLOCAL_FLAGS" +cd ${etcdir} && aclocal $ACLOCAL_FLAGS ; cd ${tmpdir} echo " autoheader ${configure_ac}" autoheader ${configure_ac} -echo " autoconf -o ${configure} ${configure_ac}" -autoconf -o ${configure} ${configure_ac} +echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" +autoconf -I ${tmpdir} -o ${configure} ${configure_ac} + +export CPPFLAGS="-I$usrdir/include" +export LDFLAGS="-L$usrdir/lib" +export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig" +export LD_LIBRARY_PATH="$usrdir/lib" ${configure} "$@" && echo diff --git a/livesupport/modules/core/etc/Makefile.in b/livesupport/modules/core/etc/Makefile.in index 5d712e1f5..3dd31c71a 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.14 $ +# Version : $Revision: 1.15 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/etc/Makefile.in,v $ # # @configure_input@ @@ -57,7 +57,6 @@ USR_INCLUDE_DIR = ${USR_DIR}/include USR_BIN_DIR = ${USR_DIR}/bin USR_LIB_DIR = ${USR_DIR}/lib BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 -LIBXMLPP_INCLUDE_DIR = ${USR_INCLUDE_DIR}/libxml++-1.0 GENRB = ${USR_BIN_DIR}/genrb GENRBOPTS = --destdir ${TMP_DIR} \ @@ -67,6 +66,9 @@ GENRBOPTS = --destdir ${TMP_DIR} \ VPATH = ${SRC_DIR} +LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ +LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ + # TODO: move ICU flag determination to configure script ICU_CFLAGS= ICU_LIBS=`${USR_DIR}/bin/icu-config --ldflags-toolutil --ldflags-icuio` @@ -91,11 +93,15 @@ CPPFLAGS = @CPPFLAGS@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \ -pedantic -Wall -Wno-long-long \ ${ICU_CFLAGS} \ + ${LIBXMLPP_CFLAGS} \ -I${USR_INCLUDE_DIR} \ -I${BOOST_INCLUDE_DIR} \ - -I${LIBXMLPP_INCLUDE_DIR} \ -I${INCLUDE_DIR} -I${TMP_DIR} -LDFLAGS = @LDFLAGS@ -pthread -L${USR_LIB_DIR} -L${LIB_DIR} +LDFLAGS = @LDFLAGS@ -pthread \ + ${ICU_LIBS} \ + ${LIBXMLPP_LIBS} \ + -L${USR_LIB_DIR} \ + -L${LIB_DIR} #------------------------------------------------------------------------------- @@ -125,7 +131,7 @@ TEST_RUNNER_RES = ${TMP_DIR}/${PACKAGE_NAME}_root.res \ ${TMP_DIR}/${PACKAGE_NAME}_hu.res \ ${TMP_DIR}/${PACKAGE_NAME}_jp.res -TEST_RUNNER_LIBS = -l${CORE_LIB} ${ICU_LIBS} -lxml++-1.0 -lboost_date_time-gcc \ +TEST_RUNNER_LIBS = -l${CORE_LIB} ${ICU_LIBS} -lboost_date_time-gcc \ -lcppunit -ldl diff --git a/livesupport/modules/core/etc/acinclude.m4 b/livesupport/modules/core/etc/acinclude.m4 new file mode 100644 index 000000000..371e8ec68 --- /dev/null +++ b/livesupport/modules/core/etc/acinclude.m4 @@ -0,0 +1,92 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +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 Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/etc/acinclude.m4,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl Macro to check for available modules using pkg-conf +dnl +dnl usage: +dnl PKG_CHECK_MODULES(GSTUFF,[gtk+-2.0 >= 1.3], action-if, action-not) +dnl +dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page +dnl also defines GSTUFF_PKG_ERRORS on error +dnl +dnl This function was taken from the glade-- project +dnl----------------------------------------------------------------------------- +AC_DEFUN(PKG_CHECK_MODULES, [ + succeeded=no + + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + AC_MSG_CHECKING(for $2) + + if $PKG_CONFIG --exists "$2" ; then + AC_MSG_RESULT(yes) + succeeded=yes + + AC_MSG_CHECKING($1_CFLAGS) + $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` + AC_MSG_RESULT($$1_CFLAGS) + + AC_MSG_CHECKING($1_LIBS) + $1_LIBS=`$PKG_CONFIG --libs "$2"` + AC_MSG_RESULT($$1_LIBS) + else + $1_CFLAGS="" + $1_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + ifelse([$4], ,echo $$1_PKG_ERRORS,) + fi + + AC_SUBST($1_CFLAGS) + AC_SUBST($1_LIBS) + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + ifelse([$3], , :, [$3]) + else + ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) + fi +]) + + + diff --git a/livesupport/modules/core/etc/configure.ac b/livesupport/modules/core/etc/configure.ac index f0ea1b14d..b0ed69686 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.6 $ +dnl Version : $Revision: 1.7 $ 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.6 $) +AC_REVISION($Revision: 1.7 $) AC_CONFIG_SRCDIR(../src/UniqueId.cxx) @@ -44,6 +44,9 @@ AC_PROG_CXX() AC_CHECK_HEADERS(getopt.h sys/time.h) +PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.6.0]) +AC_SUBST(LIBXMLPP_CFLAGS) +AC_SUBST(LIBXMLPP_LIBS) dnl----------------------------------------------------------------------------- dnl enable compilaton for code coverage data diff --git a/livesupport/modules/db/bin/autogen.sh b/livesupport/modules/db/bin/autogen.sh index 72389b4b7..bf0f51247 100755 --- a/livesupport/modules/db/bin/autogen.sh +++ b/livesupport/modules/db/bin/autogen.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.1 $ +# Version : $Revision: 1.2 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/db/bin/autogen.sh,v $ #------------------------------------------------------------------------------- @@ -34,19 +34,18 @@ package="Db" # assume we're in $basedir/bin -basedir=`dirname $0`/.. +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd; cd -` test -z "$basedir" && basedir=. +usrdir=`cd $basedir/../../usr; pwd; cd -` +bindir=$basedir/bin +etcdir=$basedir/etc tmpdir=$basedir/tmp cd "$tmpdir" DIE=0 -# look at all other directories as seen from ${basedir}/tmp -tmpdir=. -bindir=../bin -etcdir=../etc - (autoheader --version) < /dev/null > /dev/null 2>&1 || { echo echo "You must have autoconf installed to compile $package." @@ -76,12 +75,21 @@ echo "Generating configuration files for $package, please wait...." configure_ac=${etcdir}/configure.ac configure=${tmpdir}/configure +aclocal_m4=${tmpdir}/aclocal.m4 -#echo " aclocal $ACLOCAL_FLAGS" -#aclocal $ACLOCAL_FLAGS +# run aclocal in etc, as it's blind, only sees files in the current directory +ACLOCAL_FLAGS="--output=${aclocal_m4}" +echo " aclocal $ACLOCAL_FLAGS" +cd ${etcdir} && aclocal $ACLOCAL_FLAGS ; cd ${tmpdir} echo " autoheader ${configure_ac}" autoheader ${configure_ac} -echo " autoconf -o ${configure} ${configure_ac}" -autoconf -o ${configure} ${configure_ac} +echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" +autoconf -I ${tmpdir} -o ${configure} ${configure_ac} + +export CPPFLAGS="-I$usrdir/include" +export LDFLAGS="-L$usrdir/lib" +export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig" +export LD_LIBRARY_PATH="$usrdir/lib" ${configure} "$@" && echo + diff --git a/livesupport/modules/db/etc/Makefile.in b/livesupport/modules/db/etc/Makefile.in index 34f9fff26..91d311a80 100644 --- a/livesupport/modules/db/etc/Makefile.in +++ b/livesupport/modules/db/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.5 $ +# Version : $Revision: 1.6 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/db/etc/Makefile.in,v $ # # @configure_input@ @@ -53,7 +53,6 @@ USR_DIR = ${BASE_DIR}/../../usr USR_INCLUDE_DIR = ${USR_DIR}/include USR_LIB_DIR = ${USR_DIR}/lib BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 -LIBXMLPP_INCLUDE_DIR = ${USR_INCLUDE_DIR}/libxml++-1.0 MODULES_DIR = ${BASE_DIR}/.. @@ -65,6 +64,9 @@ CORE_LIB_FILE = ${CORE_LIB_DIR}/lib${CORE_LIB}.a VPATH = ${SRC_DIR} +LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ +LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ + TEST_RESULTS = ${DOC_DIR}/testResults.xml # the text result XSLT has to be relative to the test result file, e.g. TMP_DIR TEST_XSLT = ../etc/testResultToHtml.xsl @@ -82,12 +84,16 @@ DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config CPPFLAGS = @CPPFLAGS@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \ -pedantic -Wall -Wno-long-long \ + ${LIBXMLPP_CFLAGS} \ -I${USR_INCLUDE_DIR} \ -I${BOOST_INCLUDE_DIR} \ - -I${LIBXMLPP_INCLUDE_DIR} \ -I${CORE_INCLUDE_DIR} \ -I${INCLUDE_DIR} -I${TMP_DIR} -LDFLAGS = @LDFLAGS@ -pthread -L${USR_LIB_DIR} -L${CORE_LIB_DIR} -L${LIB_DIR} +LDFLAGS = @LDFLAGS@ -pthread \ + ${LIBXMLPP_LIBS} \ + -L${USR_LIB_DIR} \ + -L${CORE_LIB_DIR} \ + -L${LIB_DIR} #------------------------------------------------------------------------------- @@ -99,7 +105,7 @@ DB_LIB_OBJS = ${TMP_DIR}/SimpleConnectionManager.o \ TEST_RUNNER_OBJS = ${TMP_DIR}/SimpleConnectionManagerTest.o \ ${TMP_DIR}/ConnectionManagerFactoryTest.o \ ${TMP_DIR}/TestRunner.o -TEST_RUNNER_LIBS = -l${DB_LIB} -l${CORE_LIB} -lodbc++ -lxml++-1.0 -lcppunit -ldl +TEST_RUNNER_LIBS = -l${DB_LIB} -l${CORE_LIB} -lodbc++ -lcppunit -ldl #------------------------------------------------------------------------------- diff --git a/livesupport/modules/db/etc/acinclude.m4 b/livesupport/modules/db/etc/acinclude.m4 new file mode 100644 index 000000000..4cab28825 --- /dev/null +++ b/livesupport/modules/db/etc/acinclude.m4 @@ -0,0 +1,92 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +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 Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/db/etc/acinclude.m4,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl Macro to check for available modules using pkg-conf +dnl +dnl usage: +dnl PKG_CHECK_MODULES(GSTUFF,[gtk+-2.0 >= 1.3], action-if, action-not) +dnl +dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page +dnl also defines GSTUFF_PKG_ERRORS on error +dnl +dnl This function was taken from the glade-- project +dnl----------------------------------------------------------------------------- +AC_DEFUN(PKG_CHECK_MODULES, [ + succeeded=no + + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + AC_MSG_CHECKING(for $2) + + if $PKG_CONFIG --exists "$2" ; then + AC_MSG_RESULT(yes) + succeeded=yes + + AC_MSG_CHECKING($1_CFLAGS) + $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` + AC_MSG_RESULT($$1_CFLAGS) + + AC_MSG_CHECKING($1_LIBS) + $1_LIBS=`$PKG_CONFIG --libs "$2"` + AC_MSG_RESULT($$1_LIBS) + else + $1_CFLAGS="" + $1_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + ifelse([$4], ,echo $$1_PKG_ERRORS,) + fi + + AC_SUBST($1_CFLAGS) + AC_SUBST($1_LIBS) + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + ifelse([$3], , :, [$3]) + else + ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) + fi +]) + + + diff --git a/livesupport/modules/db/etc/configure.ac b/livesupport/modules/db/etc/configure.ac index ef4ca8020..739d6509b 100644 --- a/livesupport/modules/db/etc/configure.ac +++ b/livesupport/modules/db/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/db/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ dnl----------------------------------------------------------------------------- AC_INIT(Db, 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/Db/ConnectionManagerInterface.h) @@ -44,6 +44,10 @@ AC_PROG_CXX() AC_CHECK_HEADERS(getopt.h) +PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.6.0]) +AC_SUBST(LIBXMLPP_CFLAGS) +AC_SUBST(LIBXMLPP_LIBS) + dnl----------------------------------------------------------------------------- dnl enable compilaton for code coverage data dnl----------------------------------------------------------------------------- diff --git a/livesupport/modules/eventScheduler/bin/autogen.sh b/livesupport/modules/eventScheduler/bin/autogen.sh index 904e82e0c..326eac804 100755 --- a/livesupport/modules/eventScheduler/bin/autogen.sh +++ b/livesupport/modules/eventScheduler/bin/autogen.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.1 $ +# Version : $Revision: 1.2 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/eventScheduler/bin/autogen.sh,v $ #------------------------------------------------------------------------------- @@ -34,19 +34,18 @@ package="EventScheduler" # assume we're in $basedir/bin -basedir=`dirname $0`/.. +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd; cd -` test -z "$basedir" && basedir=. +usrdir=`cd $basedir/../../usr; pwd; cd -` +bindir=$basedir/bin +etcdir=$basedir/etc tmpdir=$basedir/tmp cd "$tmpdir" DIE=0 -# look at all other directories as seen from ${basedir}/tmp -tmpdir=. -bindir=../bin -etcdir=../etc - (autoheader --version) < /dev/null > /dev/null 2>&1 || { echo echo "You must have autoconf installed to compile $package." @@ -76,12 +75,21 @@ echo "Generating configuration files for $package, please wait...." configure_ac=${etcdir}/configure.ac configure=${tmpdir}/configure +aclocal_m4=${tmpdir}/aclocal.m4 -#echo " aclocal $ACLOCAL_FLAGS" -#aclocal $ACLOCAL_FLAGS +# run aclocal in etc, as it's blind, only sees files in the current directory +ACLOCAL_FLAGS="--output=${aclocal_m4}" +echo " aclocal $ACLOCAL_FLAGS" +cd ${etcdir} && aclocal $ACLOCAL_FLAGS ; cd ${tmpdir} echo " autoheader ${configure_ac}" autoheader ${configure_ac} -echo " autoconf -o ${configure} ${configure_ac}" -autoconf -o ${configure} ${configure_ac} +echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" +autoconf -I ${tmpdir} -o ${configure} ${configure_ac} + +export CPPFLAGS="-I$usrdir/include" +export LDFLAGS="-L$usrdir/lib" +export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig" +export LD_LIBRARY_PATH="$usrdir/lib" ${configure} "$@" && echo + diff --git a/livesupport/modules/eventScheduler/etc/Makefile.in b/livesupport/modules/eventScheduler/etc/Makefile.in index fc37cae34..5af1d53f9 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.4 $ +# Version : $Revision: 1.5 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/eventScheduler/etc/Makefile.in,v $ # # @configure_input@ @@ -53,7 +53,6 @@ USR_DIR = ${BASE_DIR}/../../usr USR_INCLUDE_DIR = ${USR_DIR}/include USR_LIB_DIR = ${USR_DIR}/lib BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 -LIBXMLPP_INCLUDE_DIR = ${USR_INCLUDE_DIR}/libxml++-1.0 MODULES_DIR = ${BASE_DIR}/.. @@ -65,6 +64,9 @@ CORE_LIB_FILE = ${CORE_LIB_DIR}/lib${CORE_LIB}.a VPATH = ${SRC_DIR} +LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ +LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ + TEST_RESULTS = ${DOC_DIR}/testResults.xml # the text result XSLT has to be relative to the test result file, e.g. TMP_DIR TEST_XSLT = ../etc/testResultToHtml.xsl @@ -82,12 +84,16 @@ DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config CPPFLAGS = @CPPFLAGS@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \ -Wall -Wno-long-long \ + ${LIBXMLPP_CFLAGS} \ -I${USR_INCLUDE_DIR} \ -I${BOOST_INCLUDE_DIR} \ - -I${LIBXMLPP_INCLUDE_DIR} \ -I${CORE_INCLUDE_DIR} \ -I${INCLUDE_DIR} -I${TMP_DIR} -LDFLAGS = @LDFLAGS@ -pthread -L${USR_LIB_DIR} -L${CORE_LIB_DIR} -L${LIB_DIR} +LDFLAGS = @LDFLAGS@ -pthread \ + ${LIBXMLPP_LIBS} \ + -L${USR_LIB_DIR} \ + -L${CORE_LIB_DIR} \ + -L${LIB_DIR} #------------------------------------------------------------------------------- @@ -102,7 +108,7 @@ TEST_RUNNER_OBJS = ${TMP_DIR}/TestScheduledEvent.o \ ${TMP_DIR}/TestRunner.o TEST_RUNNER_LIBS = -l${EVENT_SCHEDULER_LIB} -l${CORE_LIB} \ -lboost_date_time-gcc \ - -lxml++-1.0 -lcppunit -ldl + -lcppunit -ldl #------------------------------------------------------------------------------- diff --git a/livesupport/modules/eventScheduler/etc/acinclude.m4 b/livesupport/modules/eventScheduler/etc/acinclude.m4 new file mode 100644 index 000000000..0071672b2 --- /dev/null +++ b/livesupport/modules/eventScheduler/etc/acinclude.m4 @@ -0,0 +1,92 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +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 Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/eventScheduler/etc/acinclude.m4,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl Macro to check for available modules using pkg-conf +dnl +dnl usage: +dnl PKG_CHECK_MODULES(GSTUFF,[gtk+-2.0 >= 1.3], action-if, action-not) +dnl +dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page +dnl also defines GSTUFF_PKG_ERRORS on error +dnl +dnl This function was taken from the glade-- project +dnl----------------------------------------------------------------------------- +AC_DEFUN(PKG_CHECK_MODULES, [ + succeeded=no + + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + AC_MSG_CHECKING(for $2) + + if $PKG_CONFIG --exists "$2" ; then + AC_MSG_RESULT(yes) + succeeded=yes + + AC_MSG_CHECKING($1_CFLAGS) + $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` + AC_MSG_RESULT($$1_CFLAGS) + + AC_MSG_CHECKING($1_LIBS) + $1_LIBS=`$PKG_CONFIG --libs "$2"` + AC_MSG_RESULT($$1_LIBS) + else + $1_CFLAGS="" + $1_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + ifelse([$4], ,echo $$1_PKG_ERRORS,) + fi + + AC_SUBST($1_CFLAGS) + AC_SUBST($1_LIBS) + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + ifelse([$3], , :, [$3]) + else + ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) + fi +]) + + + diff --git a/livesupport/modules/eventScheduler/etc/configure.ac b/livesupport/modules/eventScheduler/etc/configure.ac index 504ab58b7..171b0d63e 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.2 $ +dnl Version : $Revision: 1.3 $ 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.2 $) +AC_REVISION($Revision: 1.3 $) AC_CONFIG_SRCDIR(../src/SchedulerThread.cxx) @@ -44,6 +44,10 @@ AC_PROG_CXX() AC_CHECK_HEADERS(getopt.h unistd.h sys/time.h) +PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.6.0]) +AC_SUBST(LIBXMLPP_CFLAGS) +AC_SUBST(LIBXMLPP_LIBS) + dnl----------------------------------------------------------------------------- dnl enable compilaton for code coverage data dnl----------------------------------------------------------------------------- diff --git a/livesupport/modules/playlistExecutor/bin/autogen.sh b/livesupport/modules/playlistExecutor/bin/autogen.sh index 96776430b..6bf2c997e 100755 --- a/livesupport/modules/playlistExecutor/bin/autogen.sh +++ b/livesupport/modules/playlistExecutor/bin/autogen.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.1 $ +# Version : $Revision: 1.2 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/bin/autogen.sh,v $ #------------------------------------------------------------------------------- @@ -34,19 +34,18 @@ package="PlaylistExecutor" # assume we're in $basedir/bin -basedir=`dirname $0`/.. +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd; cd -` test -z "$basedir" && basedir=. +usrdir=`cd $basedir/../../usr; pwd; cd -` +bindir=$basedir/bin +etcdir=$basedir/etc tmpdir=$basedir/tmp cd "$tmpdir" DIE=0 -# look at all other directories as seen from ${basedir}/tmp -tmpdir=. -bindir=../bin -etcdir=../etc - (autoheader --version) < /dev/null > /dev/null 2>&1 || { echo echo "You must have autoconf installed to compile $package." @@ -76,12 +75,21 @@ echo "Generating configuration files for $package, please wait...." configure_ac=${etcdir}/configure.ac configure=${tmpdir}/configure +aclocal_m4=${tmpdir}/aclocal.m4 -#echo " aclocal $ACLOCAL_FLAGS" -#aclocal $ACLOCAL_FLAGS +# run aclocal in etc, as it's blind, only sees files in the current directory +ACLOCAL_FLAGS="--output=${aclocal_m4}" +echo " aclocal $ACLOCAL_FLAGS" +cd ${etcdir} && aclocal $ACLOCAL_FLAGS ; cd ${tmpdir} echo " autoheader ${configure_ac}" autoheader ${configure_ac} -echo " autoconf -o ${configure} ${configure_ac}" -autoconf -o ${configure} ${configure_ac} +echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" +autoconf -I ${tmpdir} -o ${configure} ${configure_ac} + +export CPPFLAGS="-I$usrdir/include" +export LDFLAGS="-L$usrdir/lib" +export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig" +export LD_LIBRARY_PATH="$usrdir/lib" ${configure} "$@" && echo + diff --git a/livesupport/modules/playlistExecutor/etc/Makefile.in b/livesupport/modules/playlistExecutor/etc/Makefile.in index cf68855f2..be0f1088f 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.4 $ +# Version : $Revision: 1.5 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/etc/Makefile.in,v $ # # @configure_input@ @@ -53,7 +53,6 @@ USR_DIR = ${BASE_DIR}/../../usr USR_INCLUDE_DIR = ${USR_DIR}/include USR_LIB_DIR = ${USR_DIR}/lib BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 -LIBXMLPP_INCLUDE_DIR = ${USR_INCLUDE_DIR}/libxml++-1.0 HELIX_INCLUDE_DIR = ${USR_INCLUDE_DIR}/helix HELIX_LIB_DIR = ${USR_LIB_DIR}/helix @@ -75,6 +74,9 @@ CORE_LIB_FILE = ${CORE_LIB_DIR}/lib${CORE_LIB}.a VPATH = ${SRC_DIR} +LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ +LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ + TEST_RESULTS = ${DOC_DIR}/testResults.xml # the text result XSLT has to be relative to the test result file, e.g. TMP_DIR TEST_XSLT = ../etc/testResultToHtml.xsl @@ -94,14 +96,15 @@ export LD_LIBRARY_PATH=${USR_LIB_DIR} CPPFLAGS = @CPPFLAGS@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \ -Wall -Wno-long-long \ + ${LIBXMLPP_CFLAGS} \ ${HELIX_CFLAGS} \ -I${USR_INCLUDE_DIR} \ -I${BOOST_INCLUDE_DIR} \ - -I${LIBXMLPP_INCLUDE_DIR} \ -I${HELIX_INCLUDE_DIR} \ -I${CORE_INCLUDE_DIR} \ -I${INCLUDE_DIR} -I${TMP_DIR} LDFLAGS = @LDFLAGS@ -pthread \ + ${LIBXMLPP_LIBS} \ -L${USR_LIB_DIR} \ -L${CORE_LIB_DIR} \ -L${HELIX_LIB_DIR} \ @@ -124,7 +127,7 @@ TEST_RUNNER_OBJS = ${TMP_DIR}/TestRunner.o \ ${TMP_DIR}/AudioPlayerFactoryTest.o TEST_RUNNER_LIBS = -l${PLAYLIST_EXECUTOR_LIB} -l${CORE_LIB} \ ${HELIX_LIBS} \ - -lxml++-1.0 -lcppunit -ldl -lm + -lcppunit -ldl -lm #------------------------------------------------------------------------------- diff --git a/livesupport/modules/playlistExecutor/etc/acinclude.m4 b/livesupport/modules/playlistExecutor/etc/acinclude.m4 new file mode 100644 index 000000000..df2eb6547 --- /dev/null +++ b/livesupport/modules/playlistExecutor/etc/acinclude.m4 @@ -0,0 +1,92 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +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 Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/etc/acinclude.m4,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl Macro to check for available modules using pkg-conf +dnl +dnl usage: +dnl PKG_CHECK_MODULES(GSTUFF,[gtk+-2.0 >= 1.3], action-if, action-not) +dnl +dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page +dnl also defines GSTUFF_PKG_ERRORS on error +dnl +dnl This function was taken from the glade-- project +dnl----------------------------------------------------------------------------- +AC_DEFUN(PKG_CHECK_MODULES, [ + succeeded=no + + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + AC_MSG_CHECKING(for $2) + + if $PKG_CONFIG --exists "$2" ; then + AC_MSG_RESULT(yes) + succeeded=yes + + AC_MSG_CHECKING($1_CFLAGS) + $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` + AC_MSG_RESULT($$1_CFLAGS) + + AC_MSG_CHECKING($1_LIBS) + $1_LIBS=`$PKG_CONFIG --libs "$2"` + AC_MSG_RESULT($$1_LIBS) + else + $1_CFLAGS="" + $1_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + ifelse([$4], ,echo $$1_PKG_ERRORS,) + fi + + AC_SUBST($1_CFLAGS) + AC_SUBST($1_LIBS) + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + ifelse([$3], , :, [$3]) + else + ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) + fi +]) + + + diff --git a/livesupport/modules/playlistExecutor/etc/configure.ac b/livesupport/modules/playlistExecutor/etc/configure.ac index 6a673582f..a5cff38ce 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.2 $ +dnl Version : $Revision: 1.3 $ 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.2 $) +AC_REVISION($Revision: 1.3 $) AC_CONFIG_SRCDIR(../src/HelixPlayer.cxx) @@ -44,6 +44,10 @@ AC_PROG_CXX() AC_CHECK_HEADERS(getopt.h sys/time.h) +PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.6.0]) +AC_SUBST(LIBXMLPP_CFLAGS) +AC_SUBST(LIBXMLPP_LIBS) + dnl----------------------------------------------------------------------------- dnl enable compilaton for code coverage data dnl----------------------------------------------------------------------------- diff --git a/livesupport/modules/schedulerClient/bin/autogen.sh b/livesupport/modules/schedulerClient/bin/autogen.sh index e991e9383..b2d94f1f2 100755 --- a/livesupport/modules/schedulerClient/bin/autogen.sh +++ b/livesupport/modules/schedulerClient/bin/autogen.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.1 $ +# Version : $Revision: 1.2 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/schedulerClient/bin/autogen.sh,v $ #------------------------------------------------------------------------------- @@ -34,19 +34,18 @@ package="SchedulerClient" # assume we're in $basedir/bin -basedir=`dirname $0`/.. +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd; cd -` test -z "$basedir" && basedir=. +usrdir=`cd $basedir/../../usr; pwd; cd -` +bindir=$basedir/bin +etcdir=$basedir/etc tmpdir=$basedir/tmp cd "$tmpdir" DIE=0 -# look at all other directories as seen from ${basedir}/tmp -tmpdir=. -bindir=../bin -etcdir=../etc - (autoheader --version) < /dev/null > /dev/null 2>&1 || { echo echo "You must have autoconf installed to compile $package." @@ -76,12 +75,21 @@ echo "Generating configuration files for $package, please wait...." configure_ac=${etcdir}/configure.ac configure=${tmpdir}/configure +aclocal_m4=${tmpdir}/aclocal.m4 -#echo " aclocal $ACLOCAL_FLAGS" -#aclocal $ACLOCAL_FLAGS +# run aclocal in etc, as it's blind, only sees files in the current directory +ACLOCAL_FLAGS="--output=${aclocal_m4}" +echo " aclocal $ACLOCAL_FLAGS" +cd ${etcdir} && aclocal $ACLOCAL_FLAGS ; cd ${tmpdir} echo " autoheader ${configure_ac}" autoheader ${configure_ac} -echo " autoconf -o ${configure} ${configure_ac}" -autoconf -o ${configure} ${configure_ac} +echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" +autoconf -I ${tmpdir} -o ${configure} ${configure_ac} + +export CPPFLAGS="-I$usrdir/include" +export LDFLAGS="-L$usrdir/lib" +export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig" +export LD_LIBRARY_PATH="$usrdir/lib" ${configure} "$@" && echo + diff --git a/livesupport/modules/schedulerClient/etc/Makefile.in b/livesupport/modules/schedulerClient/etc/Makefile.in index 2adcb1eab..a6cb77df1 100644 --- a/livesupport/modules/schedulerClient/etc/Makefile.in +++ b/livesupport/modules/schedulerClient/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.2 $ +# Version : $Revision: 1.3 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/schedulerClient/etc/Makefile.in,v $ # # @configure_input@ @@ -53,7 +53,6 @@ USR_DIR = ${BASE_DIR}/../../usr USR_INCLUDE_DIR = ${USR_DIR}/include USR_LIB_DIR = ${USR_DIR}/lib BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 -LIBXMLPP_INCLUDE_DIR = ${USR_INCLUDE_DIR}/libxml++-1.0 MODULES_DIR = ${BASE_DIR}/.. @@ -77,6 +76,9 @@ SCHEDULER_EXE = ${SCHEDULER_DIR}/tmp/scheduler VPATH = ${SRC_DIR} +LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ +LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ + TEST_RESULTS = ${DOC_DIR}/testResults.xml # the text result XSLT has to be relative to the test result file, e.g. TMP_DIR TEST_XSLT = ../etc/testResultToHtml.xsl @@ -96,13 +98,14 @@ export LD_LIBRARY_PATH=${USR_LIB_DIR} CPPFLAGS = @CPPFLAGS@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \ -pedantic -Wall -Wno-long-long \ + ${LIBXMLPP_CFLAGS} \ -I${USR_INCLUDE_DIR} \ -I${BOOST_INCLUDE_DIR} \ - -I${LIBXMLPP_INCLUDE_DIR} \ -I${CORE_INCLUDE_DIR} \ -I${AUTHENTICATION_INCLUDE_DIR} \ -I${INCLUDE_DIR} -I${TMP_DIR} LDFLAGS = @LDFLAGS@ -pthread \ + ${LIBXMLPP_LIBS} \ -L${USR_LIB_DIR} \ -L${CORE_LIB_DIR} \ -L${AUTHENTICATION_LIB_DIR} \ @@ -122,7 +125,7 @@ TEST_RUNNER_OBJS = ${TMP_DIR}/TestRunner.o \ TEST_RUNNER_LIBS = -l${SCHEDULER_CLIENT_LIB} \ -l${CORE_LIB} \ -l${AUTHENTICATION_LIB} \ - -lboost_date_time-gcc -lxml++-1.0 \ + -lboost_date_time-gcc \ -lcppunit -ldl -lxmlrpc++ -lssl diff --git a/livesupport/modules/schedulerClient/etc/acinclude.m4 b/livesupport/modules/schedulerClient/etc/acinclude.m4 new file mode 100644 index 000000000..b7f0be861 --- /dev/null +++ b/livesupport/modules/schedulerClient/etc/acinclude.m4 @@ -0,0 +1,92 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +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 Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/schedulerClient/etc/acinclude.m4,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl Macro to check for available modules using pkg-conf +dnl +dnl usage: +dnl PKG_CHECK_MODULES(GSTUFF,[gtk+-2.0 >= 1.3], action-if, action-not) +dnl +dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page +dnl also defines GSTUFF_PKG_ERRORS on error +dnl +dnl This function was taken from the glade-- project +dnl----------------------------------------------------------------------------- +AC_DEFUN(PKG_CHECK_MODULES, [ + succeeded=no + + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + AC_MSG_CHECKING(for $2) + + if $PKG_CONFIG --exists "$2" ; then + AC_MSG_RESULT(yes) + succeeded=yes + + AC_MSG_CHECKING($1_CFLAGS) + $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` + AC_MSG_RESULT($$1_CFLAGS) + + AC_MSG_CHECKING($1_LIBS) + $1_LIBS=`$PKG_CONFIG --libs "$2"` + AC_MSG_RESULT($$1_LIBS) + else + $1_CFLAGS="" + $1_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + ifelse([$4], ,echo $$1_PKG_ERRORS,) + fi + + AC_SUBST($1_CFLAGS) + AC_SUBST($1_LIBS) + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + ifelse([$3], , :, [$3]) + else + ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) + fi +]) + + + diff --git a/livesupport/modules/schedulerClient/etc/configure.ac b/livesupport/modules/schedulerClient/etc/configure.ac index c1eb30838..c538b6608 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.2 $ +dnl Version : $Revision: 1.3 $ 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.2 $) +AC_REVISION($Revision: 1.3 $) AC_CONFIG_SRCDIR(../include/LiveSupport/SchedulerClient/SchedulerClientFactory.h) @@ -44,6 +44,10 @@ AC_PROG_CXX() AC_CHECK_HEADERS(getopt.h sys/time.h) +PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.6.0]) +AC_SUBST(LIBXMLPP_CFLAGS) +AC_SUBST(LIBXMLPP_LIBS) + dnl----------------------------------------------------------------------------- dnl enable compilaton for code coverage data dnl----------------------------------------------------------------------------- diff --git a/livesupport/modules/storage/bin/autogen.sh b/livesupport/modules/storage/bin/autogen.sh index 0380421bc..82328a671 100755 --- a/livesupport/modules/storage/bin/autogen.sh +++ b/livesupport/modules/storage/bin/autogen.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.1 $ +# Version : $Revision: 1.2 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/bin/autogen.sh,v $ #------------------------------------------------------------------------------- @@ -34,19 +34,18 @@ package="Storage" # assume we're in $basedir/bin -basedir=`dirname $0`/.. +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd; cd -` test -z "$basedir" && basedir=. +usrdir=`cd $basedir/../../usr; pwd; cd -` +bindir=$basedir/bin +etcdir=$basedir/etc tmpdir=$basedir/tmp cd "$tmpdir" DIE=0 -# look at all other directories as seen from ${basedir}/tmp -tmpdir=. -bindir=../bin -etcdir=../etc - (autoheader --version) < /dev/null > /dev/null 2>&1 || { echo echo "You must have autoconf installed to compile $package." @@ -76,12 +75,20 @@ echo "Generating configuration files for $package, please wait...." configure_ac=${etcdir}/configure.ac configure=${tmpdir}/configure +aclocal_m4=${tmpdir}/aclocal.m4 -#echo " aclocal $ACLOCAL_FLAGS" -#aclocal $ACLOCAL_FLAGS +# run aclocal in etc, as it's blind, only sees files in the current directory +ACLOCAL_FLAGS="--output=${aclocal_m4}" +echo " aclocal $ACLOCAL_FLAGS" +cd ${etcdir} && aclocal $ACLOCAL_FLAGS ; cd ${tmpdir} echo " autoheader ${configure_ac}" autoheader ${configure_ac} -echo " autoconf -o ${configure} ${configure_ac}" -autoconf -o ${configure} ${configure_ac} +echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" +autoconf -I ${tmpdir} -o ${configure} ${configure_ac} + +export CPPFLAGS="-I$usrdir/include" +export LDFLAGS="-L$usrdir/lib" +export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig" +export LD_LIBRARY_PATH="$usrdir/lib" ${configure} "$@" && echo diff --git a/livesupport/modules/storage/etc/Makefile.in b/livesupport/modules/storage/etc/Makefile.in index 2dec78d51..ee8d4cee7 100644 --- a/livesupport/modules/storage/etc/Makefile.in +++ b/livesupport/modules/storage/etc/Makefile.in @@ -20,8 +20,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: fgerlits $ -# Version : $Revision: 1.9 $ +# Author : $Author: maroy $ +# Version : $Revision: 1.10 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/etc/Makefile.in,v $ # # @configure_input@ @@ -53,7 +53,6 @@ USR_DIR = ${BASE_DIR}/../../usr USR_INCLUDE_DIR = ${USR_DIR}/include USR_LIB_DIR = ${USR_DIR}/lib BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 -LIBXMLPP_INCLUDE_DIR = ${USR_INCLUDE_DIR}/libxml++-1.0 MODULES_DIR = ${BASE_DIR}/.. @@ -71,6 +70,9 @@ AUTHENTICATION_LIB_FILE = ${AUTHENTICATION_LIB_DIR}/lib${AUTHENTICATION_LIB}.a VPATH = ${SRC_DIR} +LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ +LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ + TEST_RESULTS = ${DOC_DIR}/testResults.xml # the text result XSLT has to be relative to the test result file, e.g. TMP_DIR TEST_XSLT = ../etc/testResultToHtml.xsl @@ -89,14 +91,17 @@ CPPFLAGS = @CPPFLAGS@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \ -pedantic -Wall -Wno-long-long \ -I${USR_INCLUDE_DIR} \ + ${LIBXMLPP_CFLAGS} \ -I${BOOST_INCLUDE_DIR} \ - -I${LIBXMLPP_INCLUDE_DIR} \ -I${CORE_INCLUDE_DIR} \ -I${AUTHENTICATION_INCLUDE_DIR} \ -I${INCLUDE_DIR} -I${TMP_DIR} LDFLAGS = @LDFLAGS@ -pthread \ - -L${USR_LIB_DIR} -L${CORE_LIB_DIR} \ - -L${AUTHENTICATION_LIB_DIR} -L${LIB_DIR} + ${LIBXMLPP_LIBS} \ + -L${USR_LIB_DIR} \ + -L${CORE_LIB_DIR} \ + -L${AUTHENTICATION_LIB_DIR} \ + -L${LIB_DIR} #------------------------------------------------------------------------------- @@ -112,7 +117,7 @@ TEST_RUNNER_OBJS = ${TMP_DIR}/TestRunner.o \ ${TMP_DIR}/WebStorageClientTest.o TEST_RUNNER_LIBS = -l${STORAGE_LIB} -l${CORE_LIB} -l${AUTHENTICATION_LIB} \ - -lxml++-1.0 -lcppunit -ldl -lxmlrpc++ -lssl + -lcppunit -ldl -lxmlrpc++ -lssl #------------------------------------------------------------------------------- diff --git a/livesupport/modules/storage/etc/acinclude.m4 b/livesupport/modules/storage/etc/acinclude.m4 new file mode 100644 index 000000000..d8db68544 --- /dev/null +++ b/livesupport/modules/storage/etc/acinclude.m4 @@ -0,0 +1,92 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +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 Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/etc/acinclude.m4,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl Macro to check for available modules using pkg-conf +dnl +dnl usage: +dnl PKG_CHECK_MODULES(GSTUFF,[gtk+-2.0 >= 1.3], action-if, action-not) +dnl +dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page +dnl also defines GSTUFF_PKG_ERRORS on error +dnl +dnl This function was taken from the glade-- project +dnl----------------------------------------------------------------------------- +AC_DEFUN(PKG_CHECK_MODULES, [ + succeeded=no + + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + AC_MSG_CHECKING(for $2) + + if $PKG_CONFIG --exists "$2" ; then + AC_MSG_RESULT(yes) + succeeded=yes + + AC_MSG_CHECKING($1_CFLAGS) + $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` + AC_MSG_RESULT($$1_CFLAGS) + + AC_MSG_CHECKING($1_LIBS) + $1_LIBS=`$PKG_CONFIG --libs "$2"` + AC_MSG_RESULT($$1_LIBS) + else + $1_CFLAGS="" + $1_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + ifelse([$4], ,echo $$1_PKG_ERRORS,) + fi + + AC_SUBST($1_CFLAGS) + AC_SUBST($1_LIBS) + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + ifelse([$3], , :, [$3]) + else + ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) + fi +]) + + + diff --git a/livesupport/modules/storage/etc/configure.ac b/livesupport/modules/storage/etc/configure.ac index 3d59a8599..c1e9a9bb6 100644 --- a/livesupport/modules/storage/etc/configure.ac +++ b/livesupport/modules/storage/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.3 $ +dnl Version : $Revision: 1.4 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ dnl----------------------------------------------------------------------------- AC_INIT(Storage, 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.3 $) +AC_REVISION($Revision: 1.4 $) AC_CONFIG_SRCDIR(../src/StorageClientFactory.cxx) @@ -44,6 +44,10 @@ AC_PROG_CXX() AC_CHECK_HEADERS(getopt.h) +PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.6.0]) +AC_SUBST(LIBXMLPP_CFLAGS) +AC_SUBST(LIBXMLPP_LIBS) + dnl----------------------------------------------------------------------------- dnl enable compilaton for code coverage data dnl----------------------------------------------------------------------------- diff --git a/livesupport/products/gLiveSupport/bin/autogen.sh b/livesupport/products/gLiveSupport/bin/autogen.sh index 0f3bab27f..888195e85 100755 --- a/livesupport/products/gLiveSupport/bin/autogen.sh +++ b/livesupport/products/gLiveSupport/bin/autogen.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.5 $ +# Version : $Revision: 1.6 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/bin/autogen.sh,v $ #------------------------------------------------------------------------------- @@ -80,7 +80,7 @@ aclocal_m4=${tmpdir}/aclocal.m4 # run aclocal in etc, as it's blind, only sees files in the current directory ACLOCAL_FLAGS="--output=${aclocal_m4}" echo " aclocal $ACLOCAL_FLAGS" -cd ${etcdir} && aclocal $ACLOCAL_FLAGS && cd ${tmpdir} +cd ${etcdir} && aclocal $ACLOCAL_FLAGS ; cd ${tmpdir} echo " autoheader ${configure_ac}" autoheader ${configure_ac} echo " autoconf -o ${configure} ${configure_ac}" diff --git a/livesupport/products/gLiveSupport/etc/Makefile.in b/livesupport/products/gLiveSupport/etc/Makefile.in index 8b8fc1b92..ef2368bd5 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.11 $ +# Version : $Revision: 1.12 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/etc/Makefile.in,v $ # # @configure_input@ @@ -54,7 +54,6 @@ USR_INCLUDE_DIR = ${USR_DIR}/include USR_LIB_DIR = ${USR_DIR}/lib USR_BIN_DIR = ${USR_DIR}/bin BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 -LIBXMLPP_INCLUDE_DIR = ${USR_INCLUDE_DIR}/libxml++-1.0 GENRB = ${USR_BIN_DIR}/genrb GENRBOPTS = --destdir ${TMP_DIR} \ @@ -90,6 +89,9 @@ SCHEDULER_CLIENT_LIB_DIR = ${SCHEDULER_CLIENT_DIR}/lib SCHEDULER_CLIENT_LIB = livesupport_scheduler_client SCHEDULER_CLIENT_LIB_FILE = ${SCHEDULER_CLIENT_LIB_DIR}/lib${SCHEDULER_CLIENT_LIB}.a +LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ +LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ + GTKMM_CFLAGS=@GTKMM_CFLAGS@ GTKMM_LIBS=@GTKMM_LIBS@ @@ -117,10 +119,10 @@ CPPFLAGS = @CPPFLAGS@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \ -pedantic -Wall -Wno-long-long \ ${ICU_CFLAGS} \ + ${LIBXMLPP_CFLAGS} \ ${GTKMM_CFLAGS} \ -I${USR_INCLUDE_DIR} \ -I${BOOST_INCLUDE_DIR} \ - -I${LIBXMLPP_INCLUDE_DIR} \ -I${CORE_INCLUDE_DIR} \ -I${AUTHENTICATION_INCLUDE_DIR} \ -I${STORAGE_INCLUDE_DIR} \ @@ -128,6 +130,7 @@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \ -I${TMP_DIR} LDFLAGS = @LDFLAGS@ -pthread \ ${ICU_LIBS} \ + ${LIBXMLPP_LIBS} \ ${GTKMM_LIBS} \ -L${USR_LIB_DIR} \ -L${CORE_LIB_DIR} \ @@ -161,7 +164,7 @@ G_LIVESUPPORT_EXE_LIBS = -l${AUTHENTICATION_LIB} \ -l${SCHEDULER_CLIENT_LIB} \ -l${CORE_LIB} \ -lboost_date_time-gcc \ - -lxmlrpc++ -lssl -lxml++-1.0 + -lxmlrpc++ -lssl TEST_RUNNER_OBJS = ${G_LIVESUPPORT_OBJS} \ ${TMP_DIR}/TestRunner.o diff --git a/livesupport/products/gLiveSupport/etc/configure.ac b/livesupport/products/gLiveSupport/etc/configure.ac index 7b573e41c..df4b70575 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.4 $ +dnl Version : $Revision: 1.5 $ 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.4 $) +AC_REVISION($Revision: 1.5 $) AC_CONFIG_SRCDIR(../src/main.cxx) @@ -45,6 +45,10 @@ AC_PROG_CXX() AC_CHECK_HEADERS(sys/types.h unistd.h getopt.h signal.h sys/stat.h time.h) AC_CHECK_HEADERS(stdio.h fcntl.h sys/time.h) +PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.6.0]) +AC_SUBST(LIBXMLPP_CFLAGS) +AC_SUBST(LIBXMLPP_LIBS) + PKG_CHECK_MODULES(GTKMM,[gtkmm-2.4 >= 2.4.0]) AC_SUBST(GTKMM_CFLAGS) AC_SUBST(GTKMM_LIBS) diff --git a/livesupport/products/gLiveSupport/etc/gLiveSupport.xml b/livesupport/products/gLiveSupport/etc/gLiveSupport.xml index 5b08a3945..1fae1428e 100644 --- a/livesupport/products/gLiveSupport/etc/gLiveSupport.xml +++ b/livesupport/products/gLiveSupport/etc/gLiveSupport.xml @@ -2,6 +2,7 @@ @@ -10,6 +11,12 @@ + + + + + + @@ -63,6 +70,11 @@ locale = "en" /> + + + + + diff --git a/livesupport/products/gLiveSupport/src/GLiveSupport.cxx b/livesupport/products/gLiveSupport/src/GLiveSupport.cxx index 5576979a0..4fbf2f331 100644 --- a/livesupport/products/gLiveSupport/src/GLiveSupport.cxx +++ b/livesupport/products/gLiveSupport/src/GLiveSupport.cxx @@ -22,7 +22,7 @@ Author : $Author: maroy $ - Version : $Revision: 1.5 $ + Version : $Revision: 1.6 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/GLiveSupport.cxx,v $ ------------------------------------------------------------------------------*/ @@ -40,8 +40,8 @@ #include "LiveSupport/Storage/StorageClientFactory.h" #include "LiveSupport/SchedulerClient/SchedulerClientFactory.h" +#include "GtkLocalizedObject.h" #include "MasterPanelWindow.h" -#include "LoginWindow.h" #include "GLiveSupport.h" @@ -63,6 +63,26 @@ using namespace LiveSupport::GLiveSupport; const std::string LiveSupport :: GLiveSupport :: GLiveSupport :: configElementNameStr = "gLiveSupport"; +/*------------------------------------------------------------------------------ + * The name of the config element for the list of supported languages + *----------------------------------------------------------------------------*/ +static const std::string supportedLanguagesElementName = "supportedLanguages"; + +/*------------------------------------------------------------------------------ + * The name of the config element for a supported language. + *----------------------------------------------------------------------------*/ +static const std::string languageElementName = "language"; + +/*------------------------------------------------------------------------------ + * The name of the attribute for the locale id for a supported language + *----------------------------------------------------------------------------*/ +static const std::string localeAttrName = "locale"; + +/*------------------------------------------------------------------------------ + * The name of the attribute for the name for a supported language + *----------------------------------------------------------------------------*/ +static const std::string nameAttrName = "name"; + /* =============================================== local function prototypes */ @@ -86,6 +106,13 @@ GLiveSupport :: configure(const xmlpp::Element & element) xmlpp::Node::NodeList nodes; + // read the list of supported languages + nodes = element.get_children(supportedLanguagesElementName); + if (nodes.size() < 1) { + throw std::invalid_argument("no supportedLanguages element"); + } + configSupportedLanguages(*((const xmlpp::Element*) *(nodes.begin())) ); + // configure the resource bundle nodes = element.get_children(LocalizedObject::getConfigElementName()); if (nodes.size() < 1) { @@ -130,6 +157,43 @@ GLiveSupport :: configure(const xmlpp::Element & element) } +/*------------------------------------------------------------------------------ + * Configure the list of supported languages + *----------------------------------------------------------------------------*/ +void +LiveSupport :: GLiveSupport :: +GLiveSupport :: configSupportedLanguages(const xmlpp::Element & element) + throw (std::invalid_argument) +{ + xmlpp::Node::NodeList nodes; + xmlpp::Node::NodeList::iterator begin; + xmlpp::Node::NodeList::iterator end; + + supportedLanguages.reset( + new std::map::Ref>()); + + // read the list of supported languages + nodes = element.get_children(languageElementName); + begin = nodes.begin(); + end = nodes.end(); + + while (begin != end) { + xmlpp::Element * elem = (xmlpp::Element *) *begin; + xmlpp::Attribute * localeAttr = elem->get_attribute(localeAttrName); + xmlpp::Attribute * nameAttr = elem->get_attribute(nameAttrName); + + std::string locale = localeAttr->get_value().raw(); + Ptr::Ref uName(new Glib::ustring(nameAttr->get_value())); + Ptr::Ref name = + GtkLocalizedObject::ustringToUnicodeString(uName); + + supportedLanguages->insert(std::make_pair(locale, name)); + + begin++; + } +} + + /*------------------------------------------------------------------------------ * Show the main window. *----------------------------------------------------------------------------*/ diff --git a/livesupport/products/gLiveSupport/src/GLiveSupport.h b/livesupport/products/gLiveSupport/src/GLiveSupport.h index f8b9733ff..cfcbd812f 100644 --- a/livesupport/products/gLiveSupport/src/GLiveSupport.h +++ b/livesupport/products/gLiveSupport/src/GLiveSupport.h @@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Author : $Author: fgerlits $ - Version : $Revision: 1.7 $ + Author : $Author: maroy $ + Version : $Revision: 1.8 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/GLiveSupport.h,v $ ------------------------------------------------------------------------------*/ @@ -41,6 +41,7 @@ #endif #include +#include #include #include @@ -86,8 +87,8 @@ using namespace LiveSupport::Storage; * schedulerClientFactory elements see their * respective documentation. * - * @author $Author: fgerlits $ - * @version $Revision: 1.7 $ + * @author $Author: maroy $ + * @version $Revision: 1.8 $ * @see LocalizedObject#getBundle(const xmlpp::Element &) * @see AuthenticationClientFactory * @see StorageClientFactory @@ -127,6 +128,24 @@ class GLiveSupport : public Configurable, */ Ptr::Ref sessionId; + /** + * The map of supported language. + */ + Ptr::Ref> >::Ref + supportedLanguages; + + /** + * Read a supportedLanguages configuration element, + * and fill the supportedLanguages map with its contents. + * + * @param element a supportedLanguages element + * @exception std::invalid_argument if the supplied XML element + * is wrong + */ + void + configSupportedLanguages(const xmlpp::Element & element) + throw (std::invalid_argument); + public: /** diff --git a/livesupport/products/scheduler/bin/autogen.sh b/livesupport/products/scheduler/bin/autogen.sh index 88b0f43a7..e9c7b7419 100755 --- a/livesupport/products/scheduler/bin/autogen.sh +++ b/livesupport/products/scheduler/bin/autogen.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.1 $ +# Version : $Revision: 1.2 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/bin/autogen.sh,v $ #------------------------------------------------------------------------------- @@ -34,19 +34,18 @@ package="Scheduler" # assume we're in $basedir/bin -basedir=`dirname $0`/.. +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd; cd -` test -z "$basedir" && basedir=. +usrdir=`cd $basedir/../../usr; pwd; cd -` +bindir=$basedir/bin +etcdir=$basedir/etc tmpdir=$basedir/tmp cd "$tmpdir" DIE=0 -# look at all other directories as seen from ${basedir}/tmp -tmpdir=. -bindir=../bin -etcdir=../etc - (autoheader --version) < /dev/null > /dev/null 2>&1 || { echo echo "You must have autoconf installed to compile $package." @@ -76,12 +75,21 @@ echo "Generating configuration files for $package, please wait...." configure_ac=${etcdir}/configure.ac configure=${tmpdir}/configure +aclocal_m4=${tmpdir}/aclocal.m4 -#echo " aclocal $ACLOCAL_FLAGS" -#aclocal $ACLOCAL_FLAGS +# run aclocal in etc, as it's blind, only sees files in the current directory +ACLOCAL_FLAGS="--output=${aclocal_m4}" +echo " aclocal $ACLOCAL_FLAGS" +cd ${etcdir} && aclocal $ACLOCAL_FLAGS ; cd ${tmpdir} echo " autoheader ${configure_ac}" autoheader ${configure_ac} -echo " autoconf -o ${configure} ${configure_ac}" -autoconf -o ${configure} ${configure_ac} +echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" +autoconf -I ${tmpdir} -o ${configure} ${configure_ac} + +export CPPFLAGS="-I$usrdir/include" +export LDFLAGS="-L$usrdir/lib" +export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig" +export LD_LIBRARY_PATH="$usrdir/lib" ${configure} "$@" && echo + diff --git a/livesupport/products/scheduler/etc/Makefile.in b/livesupport/products/scheduler/etc/Makefile.in index 3a5cd1df5..35471cd6e 100644 --- a/livesupport/products/scheduler/etc/Makefile.in +++ b/livesupport/products/scheduler/etc/Makefile.in @@ -20,8 +20,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: fgerlits $ -# Version : $Revision: 1.33 $ +# Author : $Author: maroy $ +# Version : $Revision: 1.34 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/Makefile.in,v $ # # @configure_input@ @@ -51,7 +51,6 @@ USR_DIR = ${BASE_DIR}/../../usr USR_INCLUDE_DIR = ${USR_DIR}/include USR_LIB_DIR = ${USR_DIR}/lib BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 -LIBXMLPP_INCLUDE_DIR = ${USR_INCLUDE_DIR}/libxml++-1.0 HELIX_LIB_DIR = ${USR_LIB_DIR}/helix HELIX_LIBS = ${HELIX_LIB_DIR}/runtlib.a \ @@ -63,6 +62,9 @@ HELIX_LIBS = ${HELIX_LIB_DIR}/runtlib.a \ VPATH = ${SRC_DIR} +LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ +LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ + MODULES_DIR = ${BASE_DIR}/../../modules CORE_DIR = ${MODULES_DIR}/core @@ -122,9 +124,9 @@ export LD_LIBRARY_PATH=${USR_LIB_DIR} CPPFLAGS = @CPPFLAGS@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \ -pedantic -Wall -Wno-long-long \ + ${LIBXMLPP_CFLAGS} \ -I${USR_INCLUDE_DIR} \ -I${BOOST_INCLUDE_DIR} \ - -I${LIBXMLPP_INCLUDE_DIR} \ -I${CORE_INCLUDE_DIR} \ -I${AUTHENTICATION_INCLUDE_DIR} \ -I${DB_INCLUDE_DIR} \ @@ -133,7 +135,9 @@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \ -I${EVENT_SCHEDULER_INCLUDE_DIR} \ -I${TMP_DIR} LDFLAGS = @LDFLAGS@ -pthread \ - -L${USR_LIB_DIR} -L${HELIX_LIB_DIR} \ + ${LIBXMLPP_LIBS} \ + -L${USR_LIB_DIR} \ + -L${HELIX_LIB_DIR} \ -L${CORE_LIB_DIR} \ -L${AUTHENTICATION_LIB_DIR} \ -L${DB_LIB_DIR} \ @@ -184,7 +188,7 @@ SCHEDULER_EXE_LIBS = -l${EVENT_SCHEDULER_LIB} -l${PLAYLIST_EXECUTOR_LIB} \ -l${CORE_LIB} \ ${HELIX_LIBS} \ -lodbc++ -lboost_date_time-gcc \ - -lxmlrpc++ -lssl -lxml++-1.0 + -lxmlrpc++ -lssl TEST_RUNNER_OBJS = ${SCHEDULER_OBJS} \ ${TMP_DIR}/TestRunner.o \ diff --git a/livesupport/products/scheduler/etc/acinclude.m4 b/livesupport/products/scheduler/etc/acinclude.m4 new file mode 100644 index 000000000..463c688a7 --- /dev/null +++ b/livesupport/products/scheduler/etc/acinclude.m4 @@ -0,0 +1,92 @@ +dnl----------------------------------------------------------------------------- +dnl Copyright (c) 2004 Media Development Loan Fund +dnl +dnl This file is part of the LiveSupport project. +dnl http://livesupport.campware.org/ +dnl To report bugs, send an e-mail to bugs@campware.org +dnl +dnl LiveSupport is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl LiveSupport is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with LiveSupport; if not, write to the Free Software +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 Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/acinclude.m4,v $ +dnl----------------------------------------------------------------------------- + +dnl----------------------------------------------------------------------------- +dnl Macro to check for available modules using pkg-conf +dnl +dnl usage: +dnl PKG_CHECK_MODULES(GSTUFF,[gtk+-2.0 >= 1.3], action-if, action-not) +dnl +dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page +dnl also defines GSTUFF_PKG_ERRORS on error +dnl +dnl This function was taken from the glade-- project +dnl----------------------------------------------------------------------------- +AC_DEFUN(PKG_CHECK_MODULES, [ + succeeded=no + + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + AC_MSG_CHECKING(for $2) + + if $PKG_CONFIG --exists "$2" ; then + AC_MSG_RESULT(yes) + succeeded=yes + + AC_MSG_CHECKING($1_CFLAGS) + $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` + AC_MSG_RESULT($$1_CFLAGS) + + AC_MSG_CHECKING($1_LIBS) + $1_LIBS=`$PKG_CONFIG --libs "$2"` + AC_MSG_RESULT($$1_LIBS) + else + $1_CFLAGS="" + $1_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + ifelse([$4], ,echo $$1_PKG_ERRORS,) + fi + + AC_SUBST($1_CFLAGS) + AC_SUBST($1_LIBS) + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + ifelse([$3], , :, [$3]) + else + ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) + fi +]) + + + diff --git a/livesupport/products/scheduler/etc/configure.ac b/livesupport/products/scheduler/etc/configure.ac index 4ab159e17..e8788eb74 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.5 $ +dnl Version : $Revision: 1.6 $ 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.5 $) +AC_REVISION($Revision: 1.6 $) AC_CONFIG_SRCDIR(../src/main.cxx) @@ -45,6 +45,10 @@ AC_PROG_CXX() AC_CHECK_HEADERS(sys/types.h unistd.h getopt.h signal.h sys/stat.h time.h) AC_CHECK_HEADERS(stdio.h fcntl.h sys/time.h) +PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.6.0]) +AC_SUBST(LIBXMLPP_CFLAGS) +AC_SUBST(LIBXMLPP_LIBS) + dnl----------------------------------------------------------------------------- dnl enable compilaton for code coverage data dnl-----------------------------------------------------------------------------