Changeset 4010

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

Sync

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trackerd/trunk/configure

    r3493 r4010  
    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" 
    …… 
    42964302_ACEOF 
    42974303 
    4298         echo "$as_me:$LINENO: checking for main in -lcrypto" >&5 
    4299 echo $ECHO_N "checking for main in -lcrypto... $ECHO_C" >&6 
    4300 if test "${ac_cv_lib_crypto_main+set}" = set; then 
     4304        echo "$as_me:$LINENO: checking for MD5_Init in -lcrypto" >&5 
     4305echo $ECHO_N "checking for MD5_Init in -lcrypto... $ECHO_C" >&6 
     4306if test "${ac_cv_lib_crypto_MD5_Init+set}" = set; then 
    43014307  echo $ECHO_N "(cached) $ECHO_C" >&6 
    43024308else 
    …… 
    43104316/* end confdefs.h.  */ 
    43114317 
    4312  
     4318/* Override any gcc2 internal prototype to avoid an error.  */ 
     4319#ifdef __cplusplus 
     4320extern "C" 
     4321#endif 
     4322/* We use char because int might match the return type of a gcc2 
     4323   builtin and then its argument prototype would still apply.  */ 
     4324char MD5_Init (); 
    43134325int 
    43144326main () 
    43154327{ 
    4316 main (); 
     4328MD5_Init (); 
    43174329  ; 
    43184330  return 0; 
    …… 
    43414353  echo "$as_me:$LINENO: \$? = $ac_status" >&5 
    43424354  (exit $ac_status); }; }; then 
    4343   ac_cv_lib_crypto_main=yes 
     4355  ac_cv_lib_crypto_MD5_Init=yes 
    43444356else 
    43454357  echo "$as_me: failed program was:" >&5 
    43464358sed 's/^/| /' conftest.$ac_ext >&5 
    43474359 
    4348 ac_cv_lib_crypto_main=no 
     4360ac_cv_lib_crypto_MD5_Init=no 
    43494361fi 
    43504362rm -f conftest.err conftest.$ac_objext \ 
    …… 
    43524364LIBS=$ac_check_lib_save_LIBS 
    43534365fi 
    4354 echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_main" >&5 
    4355 echo "${ECHO_T}$ac_cv_lib_crypto_main" >&6 
    4356 if test $ac_cv_lib_crypto_main = yes; then 
     4366echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_MD5_Init" >&5 
     4367echo "${ECHO_T}$ac_cv_lib_crypto_MD5_Init" >&6 
     4368if test $ac_cv_lib_crypto_MD5_Init = yes; then 
    43574369 
    43584370                LIBS="$LIBS -lcrypto" 
    …… 
    45464558_ACEOF 
    45474559 
    4548         echo "$as_me:$LINENO: checking for main in -lssl" >&5 
    4549 echo $ECHO_N "checking for main in -lssl... $ECHO_C" >&6 
    4550 if test "${ac_cv_lib_ssl_main+set}" = set; then 
     4560        echo "$as_me:$LINENO: checking for SSL_library_init in -lssl" >&5 
     4561echo $ECHO_N "checking for SSL_library_init in -lssl... $ECHO_C" >&6 
     4562if test "${ac_cv_lib_ssl_SSL_library_init+set}" = set; then 
    45514563  echo $ECHO_N "(cached) $ECHO_C" >&6 
    45524564else 
    …… 
    45604572/* end confdefs.h.  */ 
    45614573 
    4562  
     4574/* Override any gcc2 internal prototype to avoid an error.  */ 
     4575#ifdef __cplusplus 
     4576extern "C" 
     4577#endif 
     4578/* We use char because int might match the return type of a gcc2 
     4579   builtin and then its argument prototype would still apply.  */ 
     4580char SSL_library_init (); 
    45634581int 
    45644582main () 
    45654583{ 
    4566 main (); 
     4584SSL_library_init (); 
    45674585  ; 
    45684586  return 0; 
    …… 
    45914609  echo "$as_me:$LINENO: \$? = $ac_status" >&5 
    45924610  (exit $ac_status); }; }; then 
    4593   ac_cv_lib_ssl_main=yes 
     4611  ac_cv_lib_ssl_SSL_library_init=yes 
    45944612else 
    45954613  echo "$as_me: failed program was:" >&5 
    45964614sed 's/^/| /' conftest.$ac_ext >&5 
    45974615 
    4598 ac_cv_lib_ssl_main=no 
     4616ac_cv_lib_ssl_SSL_library_init=no 
    45994617fi 
    46004618rm -f conftest.err conftest.$ac_objext \ 
    …… 
    46024620LIBS=$ac_check_lib_save_LIBS 
    46034621fi 
    4604 echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_main" >&5 
    4605 echo "${ECHO_T}$ac_cv_lib_ssl_main" >&6 
    4606 if test $ac_cv_lib_ssl_main = yes; then 
     4622echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_library_init" >&5 
     4623echo "${ECHO_T}$ac_cv_lib_ssl_SSL_library_init" >&6 
     4624if test $ac_cv_lib_ssl_SSL_library_init = yes; then 
    46074625 
    46084626                LIBS="$LIBS -lssl" 

  • trackerd/trunk/configure.in

    r3493 r4010  
    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        ]) 
    …… 
    242242# Check for the OpenSSL crypto library 
    243243AC_CHECK_HEADERS([openssl/sha.h], [ 
    244         AC_CHECK_LIB([crypto], [main], [ 
     244        AC_CHECK_LIB([crypto], [MD5_Init], [ 
    245245                LIBS="$LIBS -lcrypto" 
    246246        ], [ 
    …… 
    254254# Check for the OpenSSL ssl library 
    255255AC_CHECK_HEADERS([openssl/ssl.h], [ 
    256         AC_CHECK_LIB([ssl], [main], [ 
     256        AC_CHECK_LIB([ssl], [SSL_library_init], [ 
    257257                LIBS="$LIBS -lssl" 
    258258        ], [