From 9568514e7665c24802ded843b631df105e13f2f8 Mon Sep 17 00:00:00 2001 From: fgerlits Date: Mon, 8 Aug 2005 11:57:53 +0000 Subject: [PATCH] disabled boost library detection to use our own boost library instead --- livesupport/modules/core/etc/Makefile.in | 7 ++++--- livesupport/modules/eventScheduler/etc/Makefile.in | 7 ++++--- livesupport/modules/playlistExecutor/etc/Makefile.in | 7 ++++--- livesupport/modules/schedulerClient/etc/Makefile.in | 9 ++++++--- livesupport/modules/widgets/etc/Makefile.in | 7 ++++--- livesupport/products/gLiveSupport/etc/Makefile.in | 5 +++-- livesupport/products/scheduler/etc/Makefile.in | 5 +++-- 7 files changed, 28 insertions(+), 19 deletions(-) diff --git a/livesupport/modules/core/etc/Makefile.in b/livesupport/modules/core/etc/Makefile.in index 916a66d2d..6abf7d237 100644 --- a/livesupport/modules/core/etc/Makefile.in +++ b/livesupport/modules/core/etc/Makefile.in @@ -20,8 +20,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: maroy $ -# Version : $Revision: 1.33 $ +# Author : $Author: fgerlits $ +# Version : $Revision: 1.34 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/etc/Makefile.in,v $ # # @configure_input@ @@ -67,7 +67,8 @@ GENRBOPTS = --destdir ${TMP_DIR} \ VPATH = ${SRC_DIR} -BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ +# BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ +BOOST_DATE_TIME_LIB = boost_date_time-gcc LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ diff --git a/livesupport/modules/eventScheduler/etc/Makefile.in b/livesupport/modules/eventScheduler/etc/Makefile.in index 84a1f88e9..d5401bda9 100644 --- a/livesupport/modules/eventScheduler/etc/Makefile.in +++ b/livesupport/modules/eventScheduler/etc/Makefile.in @@ -20,8 +20,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: maroy $ -# Version : $Revision: 1.9 $ +# Author : $Author: fgerlits $ +# Version : $Revision: 1.10 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/eventScheduler/etc/Makefile.in,v $ # # @configure_input@ @@ -65,7 +65,8 @@ CORE_LIB_FILE = ${CORE_LIB_DIR}/lib${CORE_LIB}.a VPATH = ${SRC_DIR} -BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ +# BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ +BOOST_DATE_TIME_LIB = boost_date_time-gcc LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ diff --git a/livesupport/modules/playlistExecutor/etc/Makefile.in b/livesupport/modules/playlistExecutor/etc/Makefile.in index e5cd2bd00..25c071ba4 100644 --- a/livesupport/modules/playlistExecutor/etc/Makefile.in +++ b/livesupport/modules/playlistExecutor/etc/Makefile.in @@ -20,8 +20,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: maroy $ -# Version : $Revision: 1.20 $ +# Author : $Author: fgerlits $ +# Version : $Revision: 1.21 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/etc/Makefile.in,v $ # # @configure_input@ @@ -76,7 +76,8 @@ GST_REAL_LIB_DIR=${REAL_BASE_DIR}/modules/gstreamerElements/lib VPATH = ${SRC_DIR} -BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ +# BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ +BOOST_DATE_TIME_LIB = boost_date_time-gcc LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ diff --git a/livesupport/modules/schedulerClient/etc/Makefile.in b/livesupport/modules/schedulerClient/etc/Makefile.in index 8ac4e0bf7..3f2af67a7 100644 --- a/livesupport/modules/schedulerClient/etc/Makefile.in +++ b/livesupport/modules/schedulerClient/etc/Makefile.in @@ -20,8 +20,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: maroy $ -# Version : $Revision: 1.9 $ +# Author : $Author: fgerlits $ +# Version : $Revision: 1.10 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/schedulerClient/etc/Makefile.in,v $ # # @configure_input@ @@ -77,6 +77,9 @@ SCHEDULER_EXE = ${SCHEDULER_DIR}/tmp/scheduler VPATH = ${SRC_DIR} +# BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ +BOOST_DATE_TIME_LIB = boost_date_time-gcc + LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ @@ -133,7 +136,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 \ + -l${BOOST_DATE_TIME_LIB} \ -lcppunit -ldl -lxmlrpc++ -lssl diff --git a/livesupport/modules/widgets/etc/Makefile.in b/livesupport/modules/widgets/etc/Makefile.in index d8da9f5c0..8529e3ae5 100644 --- a/livesupport/modules/widgets/etc/Makefile.in +++ b/livesupport/modules/widgets/etc/Makefile.in @@ -20,8 +20,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: maroy $ -# Version : $Revision: 1.22 $ +# Author : $Author: fgerlits $ +# Version : $Revision: 1.23 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/etc/Makefile.in,v $ # # @configure_input@ @@ -77,7 +77,8 @@ GENRBOPTS = --destdir ${TMP_DIR} \ VPATH = ${SRC_DIR} -BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ +# BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ +BOOST_DATE_TIME_LIB = boost_date_time-gcc LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ diff --git a/livesupport/products/gLiveSupport/etc/Makefile.in b/livesupport/products/gLiveSupport/etc/Makefile.in index cbc2203dd..6690ab9fb 100644 --- a/livesupport/products/gLiveSupport/etc/Makefile.in +++ b/livesupport/products/gLiveSupport/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: fgerlits $ -# Version : $Revision: 1.50 $ +# Version : $Revision: 1.51 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/etc/Makefile.in,v $ # # @configure_input@ @@ -165,7 +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@ +# BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ +BOOST_DATE_TIME_LIB = boost_date_time-gcc LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ diff --git a/livesupport/products/scheduler/etc/Makefile.in b/livesupport/products/scheduler/etc/Makefile.in index eaa4dfdc6..f7ba2a184 100644 --- a/livesupport/products/scheduler/etc/Makefile.in +++ b/livesupport/products/scheduler/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: fgerlits $ -# Version : $Revision: 1.67 $ +# Version : $Revision: 1.68 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/Makefile.in,v $ # # @configure_input@ @@ -100,7 +100,8 @@ REPLACE_SED_STRING="s/ls_lib_dir/${USR_LIB_DIR_S}/; \ VPATH = ${SRC_DIR} -BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ +# BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ +BOOST_DATE_TIME_LIB = boost_date_time-gcc LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@