From c376ddcf6e52b9f69fc43d215bf086799b97c534 Mon Sep 17 00:00:00 2001 From: fgerlits Date: Tue, 20 Dec 2005 12:19:18 +0000 Subject: [PATCH] re-enabled boost and icu detection, but set the default to "no" --- livesupport/etc/configure.ac | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/livesupport/etc/configure.ac b/livesupport/etc/configure.ac index dfdd47a77..4e76d2016 100644 --- a/livesupport/etc/configure.ac +++ b/livesupport/etc/configure.ac @@ -276,7 +276,7 @@ AC_ARG_WITH([check-boost], AC_HELP_STRING([--with-check-boost], [check for the availability of the boost library on the system, and use it if available (yes)]), - [CHECK_BOOST_LIB=${withval}], [CHECK_BOOST_LIB=yes]) + [CHECK_BOOST_LIB=${withval}], [CHECK_BOOST_LIB=no]) AC_MSG_RESULT([checking for boost library on system: ${CHECK_BOOST_LIB}]) @@ -311,7 +311,7 @@ AC_ARG_WITH([check-icu], AC_HELP_STRING([--with-check-icu], [check for the availability of the icu library on the system, and use it if available (yes)]), - [CHECK_ICU_LIB=${withval}], [CHECK_ICU_LIB=yes]) + [CHECK_ICU_LIB=${withval}], [CHECK_ICU_LIB=no]) AC_MSG_RESULT([checking for icu library on system: ${CHECK_ICU_LIB}]) @@ -336,12 +336,7 @@ if test "$CHECK_BOOST_LIB" = "yes" ; then AC_MSG_RESULT([not found boost library of sufficient version, will compile from our own]) COMPILE_BOOST="yes" else -dnl COMPILE_BOOST="no" -dnl force compilation of boost, as recognizing a pre-existing version -dnl does not seem to work -- fgerlits, 2005-08-08 - AC_MSG_RESULT([found boost library, but recompiling anyway]) - BOOST_DATE_TIME_LIB="" - COMPILE_BOOST="yes" + COMPILE_BOOST="no" fi else COMPILE_BOOST="yes" @@ -384,12 +379,8 @@ if test "$CHECK_ICU_LIB" = "yes" ; then dnl check for ICU 3.0 or more recent AC_CHECK_ICU(3.0, [ -dnl AC_MSG_RESULT([using ICU found on the system]) -dnl COMPILE_ICU="no" -dnl force compilation of ICU, as recognizing a pre-existing version -dnl does not seem to work -- fgerlits, 2005-08-08 - AC_MSG_RESULT([found ICU on the system, but recompiling anyway]) - COMPILE_ICU="yes" + AC_MSG_RESULT([using ICU found on the system]) + COMPILE_ICU="no" ], [ AC_MSG_RESULT([not found ICU of sufficient version, will compile from our own])