Changeset 675

Show
Ignore:
Timestamp:
03/16/07 00:47:13 (2 years ago)
Author:
alo
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • cherokee/trunk/ChangeLog

    r674 r675  
    112007-03-15  Alvaro Lopez Ortega  <alvaro@alobbs.com> 
     2 
     3        * configure.in (CRYPT_LIBS): Tries to fix crypt() on MacOS X. 
    24 
    35        * qa/run-tests.py: Adds a new "Deps" line. 

  • cherokee/trunk/configure.in

    r673 r675  
    821821 
    822822dnl 
    823 dnl crypt() and crypt_r() 
    824 dnl 
    825 AC_CHECK_HEADERS(crypt.h, have_crypt_include=yes, have_crypt_include=no) 
    826  
    827 AC_CHECK_LIB(crypt, crypt, have_crypt_lib="yes") 
    828 AM_CONDITIONAL(HAVE_CRYPT, test "$have_crypt_lib $have_crypt_include" = "yes yes") 
    829 if test "$have_crypt_lib" = "yes"; then 
    830         AC_DEFINE(HAVE_CRYPT, 1, [Have crypt function]) 
    831 fi 
    832  
    833 AC_CHECK_LIB(crypt, crypt_r, have_crypt_r_lib="yes") 
    834 AM_CONDITIONAL(HAVE_CRYPT_R, test "$have_crypt_r_lib $have_crypt_include" = "yes yes") 
    835 if test "$have_crypt_r_lib" = "yes"; then 
    836         AC_DEFINE(HAVE_CRYPT_R, 1, [Have crypt_r function]) 
    837 fi 
    838  
     823dnl crypt() 
     824dnl 
     825AC_CHECK_HEADERS(crypt.h) 
     826 
     827AC_CHECK_FUNC(crypt, system_crypt="yes", system_crypt="no") 
     828AC_CHECK_LIB(crypt, crypt, have_crypt_lib="yes", have_crypt_lib="no") 
    839829if test "x$have_crypt_lib" = "xyes"; then 
    840830        CRYPT_LIBS="-lcrypt" 
    …… 
    842832fi 
    843833 
     834use_crypt="no" 
     835if test "$system_crypt $have_crypt_lib" != "no no"; then 
     836   use_crypt="yes" 
     837   AC_DEFINE(HAVE_CRYPT, 1, [Have crypt function]) 
     838fi 
     839AM_CONDITIONAL(HAVE_CRYPT, test "$use_crypt" = "yes") 
     840 
     841 
     842dnl 
     843dnl crypt_r() 
     844dnl 
     845AC_CHECK_FUNC(crypt_r, system_crypt_r="yes", system_crypt_r="no") 
     846AC_CHECK_LIB(crypt, crypt_r, have_crypt_r_lib="yes", have_crypt_r_lib="no") 
     847 
     848use_crypt_r="no" 
     849if test "$system_crypt_r $have_crypt_lib_r" != "no no"; then 
     850   use_crypt_r="yes" 
     851   AC_DEFINE(HAVE_CRYPT_R, 1, [Have crypt_r function]) 
     852fi 
     853 
     854 
    844855dnl 
    845856dnl crypt_r and pthread  
    846857dnl 
    847 if test "$have_crypt_r_lib" = "yes"; then 
     858if test "$use_crypt_r" = "yes"; then 
    848859        dnl 
    849860        dnl struct crypt_data