Changeset 1722

Show
Ignore:
Timestamp:
02/17/05 20:34:02 (4 years ago)
Author:
morris
Message:

-lcrypto before -lssl. Fixes #37.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trackerd/trunk/configure

    r1697 r1722  
    26012601 
    26022602####################################################################### 
    2603 # Checks for libraries 
     2603# Checks for additional paths 
    26042604 
    26052605# Check if we need /usr/local/{include,lib}/ 
    …… 
    26222622fi 
    26232623 
     2624 
     2625# Check if we need /usr/kerberos/include 
     2626if test -d /usr/kerberos/include; then 
     2627        CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include" 
     2628fi 
     2629 
     2630 
     2631####################################################################### 
     2632# Checks for libraries 
    26242633 
    26252634# Check that we have a libzanka in this directory 
    …… 
    33393348 
    33403349 
    3341 # Check for the OpenSSL ssl library 
     3350# Check for the OpenSSL crypto library 
    33423351echo "$as_me:$LINENO: checking for egrep" >&5 
    33433352echo $ECHO_N "checking for egrep... $ECHO_C" >&6 
    …… 
    35793588 
    35803589 
    3581 for ac_header in openssl/ssl.h 
     3590for ac_header in openssl/sha.h 
    35823591do 
    35833592as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 
    …… 
    37163725_ACEOF 
    37173726 
    3718         echo "$as_me:$LINENO: checking for main in -lssl" >&5 
    3719 echo $ECHO_N "checking for main in -lssl... $ECHO_C" >&6 
    3720 if test "${ac_cv_lib_ssl_main+set}" = set; then 
     3727        echo "$as_me:$LINENO: checking for main in -lcrypto" >&5 
     3728echo $ECHO_N "checking for main in -lcrypto... $ECHO_C" >&6 
     3729if test "${ac_cv_lib_crypto_main+set}" = set; then 
    37213730  echo $ECHO_N "(cached) $ECHO_C" >&6 
    37223731else 
    37233732  ac_check_lib_save_LIBS=$LIBS 
    3724 LIBS="-lssl  $LIBS" 
     3733LIBS="-lcrypto  $LIBS" 
    37253734cat >conftest.$ac_ext <<_ACEOF 
    37263735#line $LINENO "configure" 
    …… 
    37523761  echo "$as_me:$LINENO: \$? = $ac_status" >&5 
    37533762  (exit $ac_status); }; }; then 
    3754   ac_cv_lib_ssl_main=yes 
     3763  ac_cv_lib_crypto_main=yes 
    37553764else 
    37563765  echo "$as_me: failed program was:" >&5 
    37573766sed 's/^/| /' conftest.$ac_ext >&5 
    37583767 
    3759 ac_cv_lib_ssl_main=no 
     3768ac_cv_lib_crypto_main=no 
    37603769fi 
    37613770rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 
    37623771LIBS=$ac_check_lib_save_LIBS 
    37633772fi 
    3764 echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_main" >&5 
    3765 echo "${ECHO_T}$ac_cv_lib_ssl_main" >&6 
    3766 if test $ac_cv_lib_ssl_main = yes; then 
    3767  
    3768                 LIBS="$LIBS -lssl" 
     3773echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_main" >&5 
     3774echo "${ECHO_T}$ac_cv_lib_crypto_main" >&6 
     3775if test $ac_cv_lib_crypto_main = yes; then 
     3776 
     3777                LIBS="$LIBS -lcrypto" 
    37693778 
    37703779else 
    …… 
    38093818 
    38103819 
    3811 # Check for the OpenSSL crypto library 
    3812  
    3813 for ac_header in openssl/sha.h 
     3820# Check for the OpenSSL ssl library 
     3821 
     3822for ac_header in openssl/ssl.h 
    38143823do 
    38153824as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 
    …… 
    39483957_ACEOF 
    39493958 
    3950         echo "$as_me:$LINENO: checking for main in -lcrypto" >&5 
    3951 echo $ECHO_N "checking for main in -lcrypto... $ECHO_C" >&6 
    3952 if test "${ac_cv_lib_crypto_main+set}" = set; then 
     3959        echo "$as_me:$LINENO: checking for main in -lssl" >&5 
     3960echo $ECHO_N "checking for main in -lssl... $ECHO_C" >&6 
     3961if test "${ac_cv_lib_ssl_main+set}" = set; then 
    39533962  echo $ECHO_N "(cached) $ECHO_C" >&6 
    39543963else 
    39553964  ac_check_lib_save_LIBS=$LIBS 
    3956 LIBS="-lcrypto  $LIBS" 
     3965LIBS="-lssl  $LIBS" 
    39573966cat >conftest.$ac_ext <<_ACEOF 
    39583967#line $LINENO "configure" 
    …… 
    39843993  echo "$as_me:$LINENO: \$? = $ac_status" >&5 
    39853994  (exit $ac_status); }; }; then 
    3986   ac_cv_lib_crypto_main=yes 
     3995  ac_cv_lib_ssl_main=yes 
    39873996else 
    39883997  echo "$as_me: failed program was:" >&5 
    39893998sed 's/^/| /' conftest.$ac_ext >&5 
    39903999 
    3991 ac_cv_lib_crypto_main=no 
     4000ac_cv_lib_ssl_main=no 
    39924001fi 
    39934002rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 
    39944003LIBS=$ac_check_lib_save_LIBS 
    39954004fi 
    3996 echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_main" >&5 
    3997 echo "${ECHO_T}$ac_cv_lib_crypto_main" >&6 
    3998 if test $ac_cv_lib_crypto_main = yes; then 
    3999  
    4000                 LIBS="$LIBS -lcrypto" 
     4005echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_main" >&5 
     4006echo "${ECHO_T}$ac_cv_lib_ssl_main" >&6 
     4007if test $ac_cv_lib_ssl_main = yes; then 
     4008 
     4009                LIBS="$LIBS -lssl" 
    40014010 
    40024011else 

  • trackerd/trunk/configure.in

    r1697 r1722  
    137137 
    138138####################################################################### 
    139 # Checks for libraries 
     139# Checks for additional paths 
    140140 
    141141# Check if we need /usr/local/{include,lib}/ 
    …… 
    158158fi 
    159159 
     160 
     161# Check if we need /usr/kerberos/include 
     162if test -d /usr/kerberos/include; then 
     163        CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include" 
     164fi 
     165 
     166 
     167####################################################################### 
     168# Checks for libraries 
    160169 
    161170# Check that we have a libzanka in this directory 
    …… 
    201210 
    202211 
    203 # Check for the OpenSSL ssl library 
    204 AC_CHECK_HEADERS([openssl/ssl.h], [ 
    205         AC_CHECK_LIB([ssl], [main], [ 
    206                 LIBS="$LIBS -lssl" 
     212# Check for the OpenSSL crypto library 
     213AC_CHECK_HEADERS([openssl/sha.h], [ 
     214        AC_CHECK_LIB([crypto], [main], [ 
     215                LIBS="$LIBS -lcrypto" 
    207216        ], [ 
    208217                WT_MSG_LIB_ERROR([OpenSSL]) 
    …… 
    213222 
    214223 
    215 # Check for the OpenSSL crypto library 
    216 AC_CHECK_HEADERS([openssl/sha.h], [ 
    217         AC_CHECK_LIB([crypto], [main], [ 
    218                 LIBS="$LIBS -lcrypto" 
     224# Check for the OpenSSL ssl library 
     225AC_CHECK_HEADERS([openssl/ssl.h], [ 
     226        AC_CHECK_LIB([ssl], [main], [ 
     227                LIBS="$LIBS -lssl" 
    219228        ], [ 
    220229                WT_MSG_LIB_ERROR([OpenSSL])