From c7c7a4a67936f55d01a158de5dbfa3dd9be13d30 Mon Sep 17 00:00:00 2001 From: fgerlits Date: Tue, 10 Jan 2006 17:00:29 +0000 Subject: [PATCH] re-enabling boost library variable setting from configure.ac (why was this disabled? -- I have a feeling I'll find out soon... but maybe not) --- livesupport/src/modules/core/etc/Makefile.in | 3 +-- livesupport/src/modules/core/src/BaseTestMethod.cxx | 10 ++++++++++ livesupport/src/modules/eventScheduler/etc/Makefile.in | 3 +-- .../src/modules/playlistExecutor/etc/Makefile.in | 3 +-- .../src/modules/schedulerClient/etc/Makefile.in | 3 +-- livesupport/src/modules/widgets/etc/Makefile.in | 3 +-- livesupport/src/products/gLiveSupport/etc/Makefile.in | 3 +-- livesupport/src/products/scheduler/etc/Makefile.in | 3 +-- 8 files changed, 17 insertions(+), 14 deletions(-) diff --git a/livesupport/src/modules/core/etc/Makefile.in b/livesupport/src/modules/core/etc/Makefile.in index 36177775c..8973c2f4e 100644 --- a/livesupport/src/modules/core/etc/Makefile.in +++ b/livesupport/src/modules/core/etc/Makefile.in @@ -69,8 +69,7 @@ GENRBOPTS = --destdir ${TMP_DIR} \ VPATH = ${SRC_DIR} -# BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ -BOOST_DATE_TIME_LIB = boost_date_time-gcc +BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ diff --git a/livesupport/src/modules/core/src/BaseTestMethod.cxx b/livesupport/src/modules/core/src/BaseTestMethod.cxx index c50ca4b43..e091b5dd8 100644 --- a/livesupport/src/modules/core/src/BaseTestMethod.cxx +++ b/livesupport/src/modules/core/src/BaseTestMethod.cxx @@ -95,6 +95,7 @@ BaseTestMethod :: getCwd(void) throw () return cwd; } +#include #### remove me #### /*------------------------------------------------------------------------------ * Return the full path for a configuration file. @@ -107,6 +108,15 @@ BaseTestMethod :: getConfigFile(const std::string configFileName) std::ifstream file; // first, try with ~/.livesupport/configFileName +std::cerr << "login: "; +char * loginString = getlogin(); +if (loginString == 0) { + std::cerr << "zero"; +} else { + std::cerr << "non-zero: ---"; + std::cerr << *loginString << "---\n"; +} +std::cerr << "< " << loginString << ">" << std::endl; struct passwd * pwd = getpwnam(getlogin()); if (pwd) { fileName += pwd->pw_dir; diff --git a/livesupport/src/modules/eventScheduler/etc/Makefile.in b/livesupport/src/modules/eventScheduler/etc/Makefile.in index f8aff5e00..f93179518 100644 --- a/livesupport/src/modules/eventScheduler/etc/Makefile.in +++ b/livesupport/src/modules/eventScheduler/etc/Makefile.in @@ -67,8 +67,7 @@ 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-gcc +BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ diff --git a/livesupport/src/modules/playlistExecutor/etc/Makefile.in b/livesupport/src/modules/playlistExecutor/etc/Makefile.in index 53443c6fd..3e04e325e 100644 --- a/livesupport/src/modules/playlistExecutor/etc/Makefile.in +++ b/livesupport/src/modules/playlistExecutor/etc/Makefile.in @@ -78,8 +78,7 @@ 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-gcc +BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ diff --git a/livesupport/src/modules/schedulerClient/etc/Makefile.in b/livesupport/src/modules/schedulerClient/etc/Makefile.in index 629c3b070..6357e8d28 100644 --- a/livesupport/src/modules/schedulerClient/etc/Makefile.in +++ b/livesupport/src/modules/schedulerClient/etc/Makefile.in @@ -79,8 +79,7 @@ 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 +BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ diff --git a/livesupport/src/modules/widgets/etc/Makefile.in b/livesupport/src/modules/widgets/etc/Makefile.in index 1f7bd1a25..4dad46626 100644 --- a/livesupport/src/modules/widgets/etc/Makefile.in +++ b/livesupport/src/modules/widgets/etc/Makefile.in @@ -79,8 +79,7 @@ GENRBOPTS = --destdir ${TMP_DIR} \ VPATH = ${SRC_DIR} -# BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ -BOOST_DATE_TIME_LIB = boost_date_time-gcc +BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ diff --git a/livesupport/src/products/gLiveSupport/etc/Makefile.in b/livesupport/src/products/gLiveSupport/etc/Makefile.in index 39b0ccf18..c1927b9dc 100644 --- a/livesupport/src/products/gLiveSupport/etc/Makefile.in +++ b/livesupport/src/products/gLiveSupport/etc/Makefile.in @@ -164,8 +164,7 @@ 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-gcc +BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ diff --git a/livesupport/src/products/scheduler/etc/Makefile.in b/livesupport/src/products/scheduler/etc/Makefile.in index 234f39aa9..fb038eb09 100644 --- a/livesupport/src/products/scheduler/etc/Makefile.in +++ b/livesupport/src/products/scheduler/etc/Makefile.in @@ -102,8 +102,7 @@ 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-gcc +BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@