Changeset 1868

Show
Ignore:
Timestamp:
Tue Dec 20 13:19:18 2005
Author:
fgerlits
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
  • trunk/livesupport/etc/configure.ac

    r1842 r1868  
    277 277                [check for the availability of the boost library on the  
    278 278                 system, and use it if available (yes)]),  
    279               [CHECK_BOOST_LIB=${withval}], [CHECK_BOOST_LIB=yes])  
      279             [CHECK_BOOST_LIB=${withval}], [CHECK_BOOST_LIB=no])  
    279 279  
    280 280 AC_MSG_RESULT([checking for boost library on system: ${CHECK_BOOST_LIB}])  
     
    312 312                [check for the availability of the icu library on the  
    313 313                 system, and use it if available (yes)]),  
    314               [CHECK_ICU_LIB=${withval}], [CHECK_ICU_LIB=yes])  
      314             [CHECK_ICU_LIB=${withval}], [CHECK_ICU_LIB=no])  
    314 314  
    315 315 AC_MSG_RESULT([checking for icu library on system: ${CHECK_ICU_LIB}])  
     
    337 337         COMPILE_BOOST="yes"  
    338 338     else  
    339   dnl     COMPILE_BOOST="no"  
    340   dnl force compilation of boost, as recognizing a pre-existing version  
    341   dnl does not seem to work -- fgerlits, 2005-08-08  
    342           AC_MSG_RESULT([found boost library, but recompiling anyway])  
    343           BOOST_DATE_TIME_LIB=""  
    344           COMPILE_BOOST="yes"  
      339         COMPILE_BOOST="no"  
    345 340     fi  
    346 341 else  
    385 380     AC_CHECK_ICU(3.0,  
    386 381     [  
    387   dnl     AC_MSG_RESULT([using ICU found on the system])  
    388   dnl     COMPILE_ICU="no"  
    389   dnl force compilation of ICU, as recognizing a pre-existing version  
    390   dnl does not seem to work -- fgerlits, 2005-08-08  
    391       AC_MSG_RESULT([found ICU on the system, but recompiling anyway])  
    392       COMPILE_ICU="yes"  
      382         AC_MSG_RESULT([using ICU found on the system])  
      383         COMPILE_ICU="no"  
    393 384     ],  
    394 385     [