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)
This commit is contained in:
parent
74e4bbd594
commit
c7c7a4a679
8 changed files with 17 additions and 14 deletions
|
@ -69,8 +69,7 @@ GENRBOPTS = --destdir ${TMP_DIR} \
|
||||||
|
|
||||||
VPATH = ${SRC_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_CFLAGS=@LIBXMLPP_CFLAGS@
|
||||||
LIBXMLPP_LIBS=@LIBXMLPP_LIBS@
|
LIBXMLPP_LIBS=@LIBXMLPP_LIBS@
|
||||||
|
|
|
@ -95,6 +95,7 @@ BaseTestMethod :: getCwd(void) throw ()
|
||||||
return cwd;
|
return cwd;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#include <iostream> #### remove me ####
|
||||||
|
|
||||||
/*------------------------------------------------------------------------------
|
/*------------------------------------------------------------------------------
|
||||||
* Return the full path for a configuration file.
|
* Return the full path for a configuration file.
|
||||||
|
@ -107,6 +108,15 @@ BaseTestMethod :: getConfigFile(const std::string configFileName)
|
||||||
std::ifstream file;
|
std::ifstream file;
|
||||||
|
|
||||||
// first, try with ~/.livesupport/configFileName
|
// 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());
|
struct passwd * pwd = getpwnam(getlogin());
|
||||||
if (pwd) {
|
if (pwd) {
|
||||||
fileName += pwd->pw_dir;
|
fileName += pwd->pw_dir;
|
||||||
|
|
|
@ -67,8 +67,7 @@ CORE_LIB_FILE = ${CORE_LIB_DIR}/lib${CORE_LIB}.a
|
||||||
|
|
||||||
VPATH = ${SRC_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_CFLAGS=@LIBXMLPP_CFLAGS@
|
||||||
LIBXMLPP_LIBS=@LIBXMLPP_LIBS@
|
LIBXMLPP_LIBS=@LIBXMLPP_LIBS@
|
||||||
|
|
|
@ -78,8 +78,7 @@ GST_REAL_LIB_DIR=${REAL_BASE_DIR}/modules/gstreamerElements/lib
|
||||||
|
|
||||||
VPATH = ${SRC_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_CFLAGS=@LIBXMLPP_CFLAGS@
|
||||||
LIBXMLPP_LIBS=@LIBXMLPP_LIBS@
|
LIBXMLPP_LIBS=@LIBXMLPP_LIBS@
|
||||||
|
|
|
@ -79,8 +79,7 @@ SCHEDULER_EXE = ${SCHEDULER_DIR}/tmp/scheduler
|
||||||
|
|
||||||
VPATH = ${SRC_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_CFLAGS=@LIBXMLPP_CFLAGS@
|
||||||
LIBXMLPP_LIBS=@LIBXMLPP_LIBS@
|
LIBXMLPP_LIBS=@LIBXMLPP_LIBS@
|
||||||
|
|
|
@ -79,8 +79,7 @@ GENRBOPTS = --destdir ${TMP_DIR} \
|
||||||
|
|
||||||
VPATH = ${SRC_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_CFLAGS=@LIBXMLPP_CFLAGS@
|
||||||
LIBXMLPP_LIBS=@LIBXMLPP_LIBS@
|
LIBXMLPP_LIBS=@LIBXMLPP_LIBS@
|
||||||
|
|
|
@ -164,8 +164,7 @@ WIDGETS_LIB_DIR = ${WIDGETS_DIR}/lib
|
||||||
WIDGETS_LIB = livesupport_widgets
|
WIDGETS_LIB = livesupport_widgets
|
||||||
WIDGETS_LIB_FILE = ${WIDGETS_LIB_DIR}/lib${WIDGETS_LIB}.a
|
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_CFLAGS=@LIBXMLPP_CFLAGS@
|
||||||
LIBXMLPP_LIBS=@LIBXMLPP_LIBS@
|
LIBXMLPP_LIBS=@LIBXMLPP_LIBS@
|
||||||
|
|
|
@ -102,8 +102,7 @@ REPLACE_SED_STRING="s/ls_lib_dir/${USR_LIB_DIR_S}/; \
|
||||||
|
|
||||||
VPATH = ${SRC_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_CFLAGS=@LIBXMLPP_CFLAGS@
|
||||||
LIBXMLPP_LIBS=@LIBXMLPP_LIBS@
|
LIBXMLPP_LIBS=@LIBXMLPP_LIBS@
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue