Changeset 4009

Show
Ignore:
Timestamp:
04/01/06 01:40:31 (3 years ago)
Author:
morris
Message:

Sync

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • wired/trunk/configure

    r3849 r4009  
    32523252else 
    32533253 
    3254         echo "$as_me:$LINENO: checking for main in -lm" >&5 
    3255 echo $ECHO_N "checking for main in -lm... $ECHO_C" >&6 
    3256 if test "${ac_cv_lib_m_main+set}" = set; then 
     3254        echo "$as_me:$LINENO: checking for sqrt in -lm" >&5 
     3255echo $ECHO_N "checking for sqrt in -lm... $ECHO_C" >&6 
     3256if test "${ac_cv_lib_m_sqrt+set}" = set; then 
    32573257  echo $ECHO_N "(cached) $ECHO_C" >&6 
    32583258else 
    …… 
    32663266/* end confdefs.h.  */ 
    32673267 
    3268  
     3268/* Override any gcc2 internal prototype to avoid an error.  */ 
     3269#ifdef __cplusplus 
     3270extern "C" 
     3271#endif 
     3272/* We use char because int might match the return type of a gcc2 
     3273   builtin and then its argument prototype would still apply.  */ 
     3274char sqrt (); 
    32693275int 
    32703276main () 
    32713277{ 
    3272 main (); 
     3278sqrt (); 
    32733279  ; 
    32743280  return 0; 
    …… 
    32973303  echo "$as_me:$LINENO: \$? = $ac_status" >&5 
    32983304  (exit $ac_status); }; }; then 
    3299   ac_cv_lib_m_main=yes 
     3305  ac_cv_lib_m_sqrt=yes 
    33003306else 
    33013307  echo "$as_me: failed program was:" >&5 
    33023308sed 's/^/| /' conftest.$ac_ext >&5 
    33033309 
    3304 ac_cv_lib_m_main=no 
     3310ac_cv_lib_m_sqrt=no 
    33053311fi 
    33063312rm -f conftest.err conftest.$ac_objext \ 
    …… 
    33083314LIBS=$ac_check_lib_save_LIBS 
    33093315fi 
    3310 echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5 
    3311 echo "${ECHO_T}$ac_cv_lib_m_main" >&6 
    3312 if test $ac_cv_lib_m_main = yes; then 
     3316echo "$as_me:$LINENO: result: $ac_cv_lib_m_sqrt" >&5 
     3317echo "${ECHO_T}$ac_cv_lib_m_sqrt" >&6 
     3318if test $ac_cv_lib_m_sqrt = yes; then 
    33133319 
    33143320                LIBS="$LIBS -lm" 
    …… 
    44664472_ACEOF 
    44674473 
    4468         echo "$as_me:$LINENO: checking for main in -lcrypto" >&5 
    4469 echo $ECHO_N "checking for main in -lcrypto... $ECHO_C" >&6 
    4470 if test "${ac_cv_lib_crypto_main+set}" = set; then 
     4474        echo "$as_me:$LINENO: checking for MD5_Init in -lcrypto" >&5 
     4475echo $ECHO_N "checking for MD5_Init in -lcrypto... $ECHO_C" >&6 
     4476if test "${ac_cv_lib_crypto_MD5_Init+set}" = set; then 
    44714477  echo $ECHO_N "(cached) $ECHO_C" >&6 
    44724478else 
    …… 
    44804486/* end confdefs.h.  */ 
    44814487 
    4482  
     4488/* Override any gcc2 internal prototype to avoid an error.  */ 
     4489#ifdef __cplusplus 
     4490extern "C" 
     4491#endif 
     4492/* We use char because int might match the return type of a gcc2 
     4493   builtin and then its argument prototype would still apply.  */ 
     4494char MD5_Init (); 
    44834495int 
    44844496main () 
    44854497{ 
    4486 main (); 
     4498MD5_Init (); 
    44874499  ; 
    44884500  return 0; 
    …… 
    45114523  echo "$as_me:$LINENO: \$? = $ac_status" >&5 
    45124524  (exit $ac_status); }; }; then 
    4513   ac_cv_lib_crypto_main=yes 
     4525  ac_cv_lib_crypto_MD5_Init=yes 
    45144526else 
    45154527  echo "$as_me: failed program was:" >&5 
    45164528sed 's/^/| /' conftest.$ac_ext >&5 
    45174529 
    4518 ac_cv_lib_crypto_main=no 
     4530ac_cv_lib_crypto_MD5_Init=no 
    45194531fi 
    45204532rm -f conftest.err conftest.$ac_objext \ 
    …… 
    45224534LIBS=$ac_check_lib_save_LIBS 
    45234535fi 
    4524 echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_main" >&5 
    4525 echo "${ECHO_T}$ac_cv_lib_crypto_main" >&6 
    4526 if test $ac_cv_lib_crypto_main = yes; then 
     4536echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_MD5_Init" >&5 
     4537echo "${ECHO_T}$ac_cv_lib_crypto_MD5_Init" >&6 
     4538if test $ac_cv_lib_crypto_MD5_Init = yes; then 
    45274539 
    45284540                LIBS="$LIBS -lcrypto" 
    …… 
    47164728_ACEOF 
    47174729 
    4718         echo "$as_me:$LINENO: checking for main in -lssl" >&5 
    4719 echo $ECHO_N "checking for main in -lssl... $ECHO_C" >&6 
    4720 if test "${ac_cv_lib_ssl_main+set}" = set; then 
     4730        echo "$as_me:$LINENO: checking for SSL_library_init in -lssl" >&5 
     4731echo $ECHO_N "checking for SSL_library_init in -lssl... $ECHO_C" >&6 
     4732if test "${ac_cv_lib_ssl_SSL_library_init+set}" = set; then 
    47214733  echo $ECHO_N "(cached) $ECHO_C" >&6 
    47224734else 
    …… 
    47304742/* end confdefs.h.  */ 
    47314743 
    4732  
     4744/* Override any gcc2 internal prototype to avoid an error.  */ 
     4745#ifdef __cplusplus 
     4746extern "C" 
     4747#endif 
     4748/* We use char because int might match the return type of a gcc2 
     4749   builtin and then its argument prototype would still apply.  */ 
     4750char SSL_library_init (); 
    47334751int 
    47344752main () 
    47354753{ 
    4736 main (); 
     4754SSL_library_init (); 
    47374755  ; 
    47384756  return 0; 
    …… 
    47614779  echo "$as_me:$LINENO: \$? = $ac_status" >&5 
    47624780  (exit $ac_status); }; }; then 
    4763   ac_cv_lib_ssl_main=yes 
     4781  ac_cv_lib_ssl_SSL_library_init=yes 
    47644782else 
    47654783  echo "$as_me: failed program was:" >&5 
    47664784sed 's/^/| /' conftest.$ac_ext >&5 
    47674785 
    4768 ac_cv_lib_ssl_main=no 
     4786ac_cv_lib_ssl_SSL_library_init=no 
    47694787fi 
    47704788rm -f conftest.err conftest.$ac_objext \ 
    …… 
    47724790LIBS=$ac_check_lib_save_LIBS 
    47734791fi 
    4774 echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_main" >&5 
    4775 echo "${ECHO_T}$ac_cv_lib_ssl_main" >&6 
    4776 if test $ac_cv_lib_ssl_main = yes; then 
     4792echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_library_init" >&5 
     4793echo "${ECHO_T}$ac_cv_lib_ssl_SSL_library_init" >&6 
     4794if test $ac_cv_lib_ssl_SSL_library_init = yes; then 
    47774795 
    47784796                LIBS="$LIBS -lssl" 

  • wired/trunk/configure.in

    r3849 r4009  
    218218# Check if we need the math library 
    219219AC_CHECK_FUNC([pow], [], [ 
    220         AC_CHECK_LIB([m], [main], [ 
     220        AC_CHECK_LIB([m], [sqrt], [ 
    221221                LIBS="$LIBS -lm" 
    222222        ]) 
    …… 
    250250# Check for the OpenSSL crypto library 
    251251AC_CHECK_HEADERS([openssl/sha.h], [ 
    252         AC_CHECK_LIB([crypto], [main], [ 
     252        AC_CHECK_LIB([crypto], [MD5_Init], [ 
    253253                LIBS="$LIBS -lcrypto" 
    254254        ], [ 
    …… 
    262262# Check for the OpenSSL ssl library 
    263263AC_CHECK_HEADERS([openssl/ssl.h], [ 
    264         AC_CHECK_LIB([ssl], [main], [ 
     264        AC_CHECK_LIB([ssl], [SSL_library_init], [ 
    265265                LIBS="$LIBS -lssl" 
    266266        ], [