Changeset 1721
- Timestamp:
- 02/17/05 20:33:47 (4 years ago)
- Files:
-
- wire/trunk/configure (modified) (10 diffs)
- wire/trunk/configure.in (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
wire/trunk/configure
r1720 r1721 2391 2391 2392 2392 ####################################################################### 2393 # Checks for libraries2393 # Checks for additional paths 2394 2394 2395 2395 # Check if we need /usr/local/{include,lib}/ … … 2410 2410 if test -d /usr/local/ssl/lib; then 2411 2411 LDFLAGS="$LDFLAGS -L/usr/local/ssl/lib" 2412 fi 2413 2414 2415 # Check if we need /usr/kerberos/include 2416 if test -d /usr/kerberos/include; then 2417 CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include" 2418 fi 2419 2420 2421 ####################################################################### 2422 # Checks for libraries 2423 2424 # Check that we have a libzanka in this directory 2425 if ! test -f libzanka/configure; then 2426 2427 { { echo "$as_me:$LINENO: error: could not locate libzanka 2428 2429 You need to download a version of libzanka and place it in the same directory as this configure script" >&5 2430 echo "$as_me: error: could not locate libzanka 2431 2432 You need to download a version of libzanka and place it in the same directory as this configure script" >&2;} 2433 { (exit 1); exit 1; }; } 2434 2412 2435 fi 2413 2436 … … 2694 2717 fi 2695 2718 rm -f conftest.err conftest.$ac_ext 2696 2697 2698 # Check that we have a libzanka in this directory2699 if ! test -f libzanka/configure; then2700 2701 { { echo "$as_me:$LINENO: error: could not locate libzanka2702 2703 You need to download a version of libzanka and place it in the same directory as this configure script" >&52704 echo "$as_me: error: could not locate libzanka2705 2706 You need to download a version of libzanka and place it in the same directory as this configure script" >&2;}2707 { (exit 1); exit 1; }; }2708 2709 fi2710 2719 2711 2720 … … 3272 3281 3273 3282 3274 # Check for the OpenSSL ssllibrary3283 # Check for the OpenSSL crypto library 3275 3284 echo "$as_me:$LINENO: checking for egrep" >&5 3276 3285 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 … … 3512 3521 3513 3522 3514 for ac_header in openssl/s sl.h3523 for ac_header in openssl/sha.h 3515 3524 do 3516 3525 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` … … 3649 3658 _ACEOF 3650 3659 3651 echo "$as_me:$LINENO: checking for main in -l ssl" >&53652 echo $ECHO_N "checking for main in -l ssl... $ECHO_C" >&63653 if test "${ac_cv_lib_ ssl_main+set}" = set; then3660 echo "$as_me:$LINENO: checking for main in -lcrypto" >&5 3661 echo $ECHO_N "checking for main in -lcrypto... $ECHO_C" >&6 3662 if test "${ac_cv_lib_crypto_main+set}" = set; then 3654 3663 echo $ECHO_N "(cached) $ECHO_C" >&6 3655 3664 else 3656 3665 ac_check_lib_save_LIBS=$LIBS 3657 LIBS="-l ssl$LIBS"3666 LIBS="-lcrypto $LIBS" 3658 3667 cat >conftest.$ac_ext <<_ACEOF 3659 3668 #line $LINENO "configure" … … 3685 3694 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3686 3695 (exit $ac_status); }; }; then 3687 ac_cv_lib_ ssl_main=yes3696 ac_cv_lib_crypto_main=yes 3688 3697 else 3689 3698 echo "$as_me: failed program was:" >&5 3690 3699 sed 's/^/| /' conftest.$ac_ext >&5 3691 3700 3692 ac_cv_lib_ ssl_main=no3701 ac_cv_lib_crypto_main=no 3693 3702 fi 3694 3703 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 3695 3704 LIBS=$ac_check_lib_save_LIBS 3696 3705 fi 3697 echo "$as_me:$LINENO: result: $ac_cv_lib_ ssl_main" >&53698 echo "${ECHO_T}$ac_cv_lib_ ssl_main" >&63699 if test $ac_cv_lib_ ssl_main = yes; then3700 3701 LIBS="$LIBS -l ssl"3706 echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_main" >&5 3707 echo "${ECHO_T}$ac_cv_lib_crypto_main" >&6 3708 if test $ac_cv_lib_crypto_main = yes; then 3709 3710 LIBS="$LIBS -lcrypto" 3702 3711 3703 3712 else … … 3742 3751 3743 3752 3744 # Check for the OpenSSL cryptolibrary3745 3746 for ac_header in openssl/s ha.h3753 # Check for the OpenSSL ssl library 3754 3755 for ac_header in openssl/ssl.h 3747 3756 do 3748 3757 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` … … 3881 3890 _ACEOF 3882 3891 3883 echo "$as_me:$LINENO: checking for main in -l crypto" >&53884 echo $ECHO_N "checking for main in -l crypto... $ECHO_C" >&63885 if test "${ac_cv_lib_ crypto_main+set}" = set; then3892 echo "$as_me:$LINENO: checking for main in -lssl" >&5 3893 echo $ECHO_N "checking for main in -lssl... $ECHO_C" >&6 3894 if test "${ac_cv_lib_ssl_main+set}" = set; then 3886 3895 echo $ECHO_N "(cached) $ECHO_C" >&6 3887 3896 else 3888 3897 ac_check_lib_save_LIBS=$LIBS 3889 LIBS="-l crypto$LIBS"3898 LIBS="-lssl $LIBS" 3890 3899 cat >conftest.$ac_ext <<_ACEOF 3891 3900 #line $LINENO "configure" … … 3917 3926 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3918 3927 (exit $ac_status); }; }; then 3919 ac_cv_lib_ crypto_main=yes3928 ac_cv_lib_ssl_main=yes 3920 3929 else 3921 3930 echo "$as_me: failed program was:" >&5 3922 3931 sed 's/^/| /' conftest.$ac_ext >&5 3923 3932 3924 ac_cv_lib_ crypto_main=no3933 ac_cv_lib_ssl_main=no 3925 3934 fi 3926 3935 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 3927 3936 LIBS=$ac_check_lib_save_LIBS 3928 3937 fi 3929 echo "$as_me:$LINENO: result: $ac_cv_lib_ crypto_main" >&53930 echo "${ECHO_T}$ac_cv_lib_ crypto_main" >&63931 if test $ac_cv_lib_ crypto_main = yes; then3932 3933 LIBS="$LIBS -l crypto"3938 echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_main" >&5 3939 echo "${ECHO_T}$ac_cv_lib_ssl_main" >&6 3940 if test $ac_cv_lib_ssl_main = yes; then 3941 3942 LIBS="$LIBS -lssl" 3934 3943 3935 3944 else wire/trunk/configure.in
r1720 r1721 53 53 54 54 ####################################################################### 55 # Checks for libraries55 # Checks for additional paths 56 56 57 57 # Check if we need /usr/local/{include,lib}/ … … 72 72 if test -d /usr/local/ssl/lib; then 73 73 LDFLAGS="$LDFLAGS -L/usr/local/ssl/lib" 74 fi 75 76 77 # Check if we need /usr/kerberos/include 78 if test -d /usr/kerberos/include; then 79 CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include" 80 fi 81 82 83 ####################################################################### 84 # Checks for libraries 85 86 # Check that we have a libzanka in this directory 87 if ! test -f libzanka/configure; then 88 WR_MSG_LIBZANKA_ERROR 74 89 fi 75 90 … … 87 102 88 103 89 # Check that we have a libzanka in this directory90 if ! test -f libzanka/configure; then91 WR_MSG_LIBZANKA_ERROR92 fi93 94 95 104 # Check if we need the math library 96 105 AC_CHECK_FUNC([pow], [], [ … … 125 134 126 135 136 # Check for the OpenSSL crypto library 137 AC_CHECK_HEADERS([openssl/sha.h], [ 138 AC_CHECK_LIB([crypto], [main], [ 139 LIBS="$LIBS -lcrypto" 140 ], [ 141 WR_MSG_LIB_ERROR([OpenSSL]) 142 ]) 143 ], [ 144 WR_MSG_LIB_ERROR([OpenSSL]) 145 ]) 146 147 127 148 # Check for the OpenSSL ssl library 128 149 AC_CHECK_HEADERS([openssl/ssl.h], [ 129 150 AC_CHECK_LIB([ssl], [main], [ 130 151 LIBS="$LIBS -lssl" 131 ], [132 WR_MSG_LIB_ERROR([OpenSSL])133 ])134 ], [135 WR_MSG_LIB_ERROR([OpenSSL])136 ])137 138 139 # Check for the OpenSSL crypto library140 AC_CHECK_HEADERS([openssl/sha.h], [141 AC_CHECK_LIB([crypto], [main], [142 LIBS="$LIBS -lcrypto"143 152 ], [ 144 153 WR_MSG_LIB_ERROR([OpenSSL])
