Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

re-enabled boost and icu detection, but set the default to "no"

Browse source
This commit is contained in:
fgerlits 2005-12-20 12:19:18 +00:00
parent 497aca064f
commit c376ddcf6e
1 changed files with 5 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

19
livesupport/etc/configure.ac
View file

@ -276,7 +276,7 @@ AC_ARG_WITH([check-boost],
AC_HELP_STRING([--with-check-boost], AC_HELP_STRING([--with-check-boost],
[check for the availability of the boost library on the [check for the availability of the boost library on the
system, and use it if available (yes)]), 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}]) 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], AC_HELP_STRING([--with-check-icu],
[check for the availability of the icu library on the [check for the availability of the icu library on the
system, and use it if available (yes)]), 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}]) 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]) AC_MSG_RESULT([not found boost library of sufficient version, will compile from our own])
COMPILE_BOOST="yes" COMPILE_BOOST="yes"
else else
dnl COMPILE_BOOST="no" 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"
fi fi
else else
COMPILE_BOOST="yes" COMPILE_BOOST="yes"
@ -384,12 +379,8 @@ if test "$CHECK_ICU_LIB" = "yes" ; then
dnl check for ICU 3.0 or more recent dnl check for ICU 3.0 or more recent
AC_CHECK_ICU(3.0, AC_CHECK_ICU(3.0,
[ [
dnl AC_MSG_RESULT([using ICU found on the system]) AC_MSG_RESULT([using ICU found on the system])
dnl COMPILE_ICU="no" 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([not found ICU of sufficient version, will compile from our own]) AC_MSG_RESULT([not found ICU of sufficient version, will compile from our own])