Changeset 903

Show
Ignore:
Timestamp:
09/03/07 15:43:26 (1 year ago)
Author:
alo
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • cherokee/trunk/ChangeLog

    r902 r903  
     12007-09-03  Alvaro Lopez Ortega  <alvaro@alobbs.com> 
     2 
     3        * configure.in: Added new --enable-internal-pcre parameter to the 
     4        configure script. It forces the use of the internal PCRE copy 
     5        rather than the system-wide one. 
     6 
    172007-08-02  Juan Badia  <jubapa@gmail.com> 
    28 

  • cherokee/trunk/configure.in

    r873 r903  
    814814dnl Check for pcre library 
    815815dnl 
    816 AC_CHECK_LIB(pcre, pcre_compile, have_pcre_lib=yes, have_pcre_lib=no) 
    817 AC_CHECK_HEADER(pcre.h, have_pcre_include=yes, have_pcre_include=no) 
    818 if test "$have_pcre_lib $have_pcre_include" = "yes yes"; then 
    819    have_pcre="yes" 
    820 else 
    821    have_pcre="built-in" 
    822 fi 
     816have_pcre="built-in" 
     817 
     818AC_ARG_ENABLE(internal_pcre,  
     819                    AC_HELP_STRING([--enable-internal-pcre],[Enable internal PCRE]),  
     820                    use_internal_pcre="$enableval", use_internal_pcre="no") 
     821 
     822if test "x$use_internal_pcre" != "xyes"; then 
     823  AC_CHECK_LIB(pcre, pcre_compile, have_pcre_lib=yes, have_pcre_lib=no) 
     824  AC_CHECK_HEADER(pcre.h, have_pcre_include=yes, have_pcre_include=no) 
     825  if test "$have_pcre_lib $have_pcre_include" = "yes yes"; then 
     826     have_pcre="yes" 
     827  fi 
     828fi 
     829 
    823830AM_CONDITIONAL(USE_INTERNAL_PCRE, test $have_pcre = "built-in") 
    824  
    825831 
    826832dnl