Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 624858 | Differences between
and this patch

Collapse All | Expand All

(-)Mail-SpamAssassin-3.4.1-orig/spamc/configure (-50 / +81 lines)
Lines 943-949 Link Here
943
    else
943
    else
944
      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
944
      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
945
    fi
945
    fi
946
    cd "$ac_popdir"
946
    cd $ac_popdir
947
  done
947
  done
948
fi
948
fi
949
949
Lines 1874-1880 Link Here
1874
  cat conftest.err >&5
1874
  cat conftest.err >&5
1875
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1875
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1876
  (exit $ac_status); } &&
1876
  (exit $ac_status); } &&
1877
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
1877
	 { ac_try='test -z "$ac_c_werror_flag"
1878
			 || test ! -s conftest.err'
1878
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1879
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1879
  (eval $ac_try) 2>&5
1880
  (eval $ac_try) 2>&5
1880
  ac_status=$?
1881
  ac_status=$?
Lines 1932-1938 Link Here
1932
  cat conftest.err >&5
1933
  cat conftest.err >&5
1933
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1934
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1934
  (exit $ac_status); } &&
1935
  (exit $ac_status); } &&
1935
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
1936
	 { ac_try='test -z "$ac_c_werror_flag"
1937
			 || test ! -s conftest.err'
1936
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1938
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1937
  (eval $ac_try) 2>&5
1939
  (eval $ac_try) 2>&5
1938
  ac_status=$?
1940
  ac_status=$?
Lines 2048-2054 Link Here
2048
  cat conftest.err >&5
2050
  cat conftest.err >&5
2049
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2051
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2050
  (exit $ac_status); } &&
2052
  (exit $ac_status); } &&
2051
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
2053
	 { ac_try='test -z "$ac_c_werror_flag"
2054
			 || test ! -s conftest.err'
2052
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2055
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2053
  (eval $ac_try) 2>&5
2056
  (eval $ac_try) 2>&5
2054
  ac_status=$?
2057
  ac_status=$?
Lines 2102-2108 Link Here
2102
  cat conftest.err >&5
2105
  cat conftest.err >&5
2103
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2106
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2104
  (exit $ac_status); } &&
2107
  (exit $ac_status); } &&
2105
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
2108
	 { ac_try='test -z "$ac_c_werror_flag"
2109
			 || test ! -s conftest.err'
2106
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2110
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2107
  (eval $ac_try) 2>&5
2111
  (eval $ac_try) 2>&5
2108
  ac_status=$?
2112
  ac_status=$?
Lines 2147-2153 Link Here
2147
  cat conftest.err >&5
2151
  cat conftest.err >&5
2148
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2152
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2149
  (exit $ac_status); } &&
2153
  (exit $ac_status); } &&
2150
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
2154
	 { ac_try='test -z "$ac_c_werror_flag"
2155
			 || test ! -s conftest.err'
2151
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2156
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2152
  (eval $ac_try) 2>&5
2157
  (eval $ac_try) 2>&5
2153
  ac_status=$?
2158
  ac_status=$?
Lines 2191-2197 Link Here
2191
  cat conftest.err >&5
2196
  cat conftest.err >&5
2192
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2197
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2193
  (exit $ac_status); } &&
2198
  (exit $ac_status); } &&
2194
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
2199
	 { ac_try='test -z "$ac_c_werror_flag"
2200
			 || test ! -s conftest.err'
2195
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2201
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2196
  (eval $ac_try) 2>&5
2202
  (eval $ac_try) 2>&5
2197
  ac_status=$?
2203
  ac_status=$?
Lines 2523-2529 Link Here
2523
  cat conftest.err >&5
2529
  cat conftest.err >&5
2524
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2530
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2525
  (exit $ac_status); } &&
2531
  (exit $ac_status); } &&
2526
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
2532
	 { ac_try='test -z "$ac_c_werror_flag"
2533
			 || test ! -s conftest.err'
2527
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2534
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2528
  (eval $ac_try) 2>&5
2535
  (eval $ac_try) 2>&5
2529
  ac_status=$?
2536
  ac_status=$?
Lines 2693-2699 Link Here
2693
  cat conftest.err >&5
2700
  cat conftest.err >&5
2694
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2701
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2695
  (exit $ac_status); } &&
2702
  (exit $ac_status); } &&
2696
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
2703
	 { ac_try='test -z "$ac_c_werror_flag"
2704
			 || test ! -s conftest.err'
2697
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2705
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2698
  (eval $ac_try) 2>&5
2706
  (eval $ac_try) 2>&5
2699
  ac_status=$?
2707
  ac_status=$?
Lines 2764-2770 Link Here
2764
  cat conftest.err >&5
2772
  cat conftest.err >&5
2765
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2773
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2766
  (exit $ac_status); } &&
2774
  (exit $ac_status); } &&
2767
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
2775
	 { ac_try='test -z "$ac_c_werror_flag"
2776
			 || test ! -s conftest.err'
2768
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2777
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2769
  (eval $ac_try) 2>&5
2778
  (eval $ac_try) 2>&5
2770
  ac_status=$?
2779
  ac_status=$?
Lines 2917-2923 Link Here
2917
  cat conftest.err >&5
2926
  cat conftest.err >&5
2918
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2927
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2919
  (exit $ac_status); } &&
2928
  (exit $ac_status); } &&
2920
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
2929
	 { ac_try='test -z "$ac_c_werror_flag"
2930
			 || test ! -s conftest.err'
2921
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2931
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2922
  (eval $ac_try) 2>&5
2932
  (eval $ac_try) 2>&5
2923
  ac_status=$?
2933
  ac_status=$?
Lines 3069-3075 Link Here
3069
  cat conftest.err >&5
3079
  cat conftest.err >&5
3070
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3080
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3071
  (exit $ac_status); } &&
3081
  (exit $ac_status); } &&
3072
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
3082
	 { ac_try='test -z "$ac_c_werror_flag"
3083
			 || test ! -s conftest.err'
3073
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3084
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3074
  (eval $ac_try) 2>&5
3085
  (eval $ac_try) 2>&5
3075
  ac_status=$?
3086
  ac_status=$?
Lines 3260-3266 Link Here
3260
  cat conftest.err >&5
3271
  cat conftest.err >&5
3261
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3272
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3262
  (exit $ac_status); } &&
3273
  (exit $ac_status); } &&
3263
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
3274
	 { ac_try='test -z "$ac_c_werror_flag"
3275
			 || test ! -s conftest.err'
3264
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3276
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3265
  (eval $ac_try) 2>&5
3277
  (eval $ac_try) 2>&5
3266
  ac_status=$?
3278
  ac_status=$?
Lines 3323-3329 Link Here
3323
  cat conftest.err >&5
3335
  cat conftest.err >&5
3324
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3336
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3325
  (exit $ac_status); } &&
3337
  (exit $ac_status); } &&
3326
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
3338
	 { ac_try='test -z "$ac_c_werror_flag"
3339
			 || test ! -s conftest.err'
3327
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3340
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3328
  (eval $ac_try) 2>&5
3341
  (eval $ac_try) 2>&5
3329
  ac_status=$?
3342
  ac_status=$?
Lines 3388-3394 Link Here
3388
  cat conftest.err >&5
3401
  cat conftest.err >&5
3389
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3402
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3390
  (exit $ac_status); } &&
3403
  (exit $ac_status); } &&
3391
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
3404
	 { ac_try='test -z "$ac_c_werror_flag"
3405
			 || test ! -s conftest.err'
3392
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3406
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3393
  (eval $ac_try) 2>&5
3407
  (eval $ac_try) 2>&5
3394
  ac_status=$?
3408
  ac_status=$?
Lines 3491-3497 Link Here
3491
  cat conftest.err >&5
3505
  cat conftest.err >&5
3492
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3506
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3493
  (exit $ac_status); } &&
3507
  (exit $ac_status); } &&
3494
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
3508
	 { ac_try='test -z "$ac_c_werror_flag"
3509
			 || test ! -s conftest.err'
3495
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3510
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3496
  (eval $ac_try) 2>&5
3511
  (eval $ac_try) 2>&5
3497
  ac_status=$?
3512
  ac_status=$?
Lines 3557-3563 Link Here
3557
  cat conftest.err >&5
3572
  cat conftest.err >&5
3558
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3573
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3559
  (exit $ac_status); } &&
3574
  (exit $ac_status); } &&
3560
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
3575
	 { ac_try='test -z "$ac_c_werror_flag"
3576
			 || test ! -s conftest.err'
3561
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3577
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3562
  (eval $ac_try) 2>&5
3578
  (eval $ac_try) 2>&5
3563
  ac_status=$?
3579
  ac_status=$?
Lines 3628-3634 Link Here
3628
  cat conftest.err >&5
3644
  cat conftest.err >&5
3629
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3645
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3630
  (exit $ac_status); } &&
3646
  (exit $ac_status); } &&
3631
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
3647
	 { ac_try='test -z "$ac_c_werror_flag"
3648
			 || test ! -s conftest.err'
3632
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3649
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3633
  (eval $ac_try) 2>&5
3650
  (eval $ac_try) 2>&5
3634
  ac_status=$?
3651
  ac_status=$?
Lines 3666-3674 Link Here
3666
SSLLIBS=""
3683
SSLLIBS=""
3667
SSLCFLAGS=""
3684
SSLCFLAGS=""
3668
if test yes = "$sa_ssl_enabled"; then
3685
if test yes = "$sa_ssl_enabled"; then
3669
	echo "$as_me:$LINENO: checking for CRYPTO_lock in -lcrypto" >&5
3686
	echo "$as_me:$LINENO: checking for CRYPTO_malloc in -lcrypto" >&5
3670
echo $ECHO_N "checking for CRYPTO_lock in -lcrypto... $ECHO_C" >&6
3687
echo $ECHO_N "checking for CRYPTO_malloc in -lcrypto... $ECHO_C" >&6
3671
if test "${ac_cv_lib_crypto_CRYPTO_lock+set}" = set; then
3688
if test "${ac_cv_lib_crypto_CRYPTO_malloc+set}" = set; then
3672
  echo $ECHO_N "(cached) $ECHO_C" >&6
3689
  echo $ECHO_N "(cached) $ECHO_C" >&6
3673
else
3690
else
3674
  ac_check_lib_save_LIBS=$LIBS
3691
  ac_check_lib_save_LIBS=$LIBS
Lines 3686-3696 Link Here
3686
#endif
3703
#endif
3687
/* We use char because int might match the return type of a gcc2
3704
/* We use char because int might match the return type of a gcc2
3688
   builtin and then its argument prototype would still apply.  */
3705
   builtin and then its argument prototype would still apply.  */
3689
char CRYPTO_lock ();
3706
char CRYPTO_malloc ();
3690
int
3707
int
3691
main ()
3708
main ()
3692
{
3709
{
3693
CRYPTO_lock ();
3710
CRYPTO_malloc ();
3694
  ;
3711
  ;
3695
  return 0;
3712
  return 0;
3696
}
3713
}
Lines 3704-3710 Link Here
3704
  cat conftest.err >&5
3721
  cat conftest.err >&5
3705
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3722
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3706
  (exit $ac_status); } &&
3723
  (exit $ac_status); } &&
3707
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
3724
	 { ac_try='test -z "$ac_c_werror_flag"
3725
			 || test ! -s conftest.err'
3708
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3726
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3709
  (eval $ac_try) 2>&5
3727
  (eval $ac_try) 2>&5
3710
  ac_status=$?
3728
  ac_status=$?
Lines 3716-3735 Link Here
3716
  ac_status=$?
3734
  ac_status=$?
3717
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3735
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3718
  (exit $ac_status); }; }; then
3736
  (exit $ac_status); }; }; then
3719
  ac_cv_lib_crypto_CRYPTO_lock=yes
3737
  ac_cv_lib_crypto_CRYPTO_malloc=yes
3720
else
3738
else
3721
  echo "$as_me: failed program was:" >&5
3739
  echo "$as_me: failed program was:" >&5
3722
sed 's/^/| /' conftest.$ac_ext >&5
3740
sed 's/^/| /' conftest.$ac_ext >&5
3723
3741
3724
ac_cv_lib_crypto_CRYPTO_lock=no
3742
ac_cv_lib_crypto_CRYPTO_malloc=no
3725
fi
3743
fi
3726
rm -f conftest.err conftest.$ac_objext \
3744
rm -f conftest.err conftest.$ac_objext \
3727
      conftest$ac_exeext conftest.$ac_ext
3745
      conftest$ac_exeext conftest.$ac_ext
3728
LIBS=$ac_check_lib_save_LIBS
3746
LIBS=$ac_check_lib_save_LIBS
3729
fi
3747
fi
3730
echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_lock" >&5
3748
echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_malloc" >&5
3731
echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_lock" >&6
3749
echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_malloc" >&6
3732
if test $ac_cv_lib_crypto_CRYPTO_lock = yes; then
3750
if test $ac_cv_lib_crypto_CRYPTO_malloc = yes; then
3733
  SSLLIBS="-lcrypto $SSLLIBS"
3751
  SSLLIBS="-lcrypto $SSLLIBS"
3734
fi
3752
fi
3735
3753
Lines 3771-3777 Link Here
3771
  cat conftest.err >&5
3789
  cat conftest.err >&5
3772
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3790
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3773
  (exit $ac_status); } &&
3791
  (exit $ac_status); } &&
3774
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
3792
	 { ac_try='test -z "$ac_c_werror_flag"
3793
			 || test ! -s conftest.err'
3775
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3794
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3776
  (eval $ac_try) 2>&5
3795
  (eval $ac_try) 2>&5
3777
  ac_status=$?
3796
  ac_status=$?
Lines 3804-3810 Link Here
3804
	# before defining SPAMC_SSL check that all its requirements are
3823
	# before defining SPAMC_SSL check that all its requirements are
3805
	# actually available
3824
	# actually available
3806
	if test yes = "$ac_cv_header_openssl_crypto_h" && \
3825
	if test yes = "$ac_cv_header_openssl_crypto_h" && \
3807
	   test yes = "$ac_cv_lib_crypto_CRYPTO_lock" && \
3826
	   test yes = "$ac_cv_lib_crypto_CRYPTO_malloc" && \
3808
	   test yes = "$ac_cv_lib_ssl_SSL_CTX_free"; then
3827
	   test yes = "$ac_cv_lib_ssl_SSL_CTX_free"; then
3809
		SSLCFLAGS="-DSPAMC_SSL"
3828
		SSLCFLAGS="-DSPAMC_SSL"
3810
	else
3829
	else
Lines 3854-3860 Link Here
3854
  cat conftest.err >&5
3873
  cat conftest.err >&5
3855
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3874
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3856
  (exit $ac_status); } &&
3875
  (exit $ac_status); } &&
3857
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
3876
	 { ac_try='test -z "$ac_c_werror_flag"
3877
			 || test ! -s conftest.err'
3858
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3878
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3859
  (eval $ac_try) 2>&5
3879
  (eval $ac_try) 2>&5
3860
  ac_status=$?
3880
  ac_status=$?
Lines 3927-3933 Link Here
3927
  cat conftest.err >&5
3947
  cat conftest.err >&5
3928
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3948
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3929
  (exit $ac_status); } &&
3949
  (exit $ac_status); } &&
3930
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
3950
	 { ac_try='test -z "$ac_c_werror_flag"
3951
			 || test ! -s conftest.err'
3931
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3952
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3932
  (eval $ac_try) 2>&5
3953
  (eval $ac_try) 2>&5
3933
  ac_status=$?
3954
  ac_status=$?
Lines 4000-4006 Link Here
4000
  cat conftest.err >&5
4021
  cat conftest.err >&5
4001
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4022
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4002
  (exit $ac_status); } &&
4023
  (exit $ac_status); } &&
4003
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
4024
	 { ac_try='test -z "$ac_c_werror_flag"
4025
			 || test ! -s conftest.err'
4004
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4026
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4005
  (eval $ac_try) 2>&5
4027
  (eval $ac_try) 2>&5
4006
  ac_status=$?
4028
  ac_status=$?
Lines 4073-4079 Link Here
4073
  cat conftest.err >&5
4095
  cat conftest.err >&5
4074
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4096
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4075
  (exit $ac_status); } &&
4097
  (exit $ac_status); } &&
4076
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
4098
	 { ac_try='test -z "$ac_c_werror_flag"
4099
			 || test ! -s conftest.err'
4077
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4100
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4078
  (eval $ac_try) 2>&5
4101
  (eval $ac_try) 2>&5
4079
  ac_status=$?
4102
  ac_status=$?
Lines 4182-4188 Link Here
4182
  cat conftest.err >&5
4205
  cat conftest.err >&5
4183
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4206
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4184
  (exit $ac_status); } &&
4207
  (exit $ac_status); } &&
4185
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
4208
	 { ac_try='test -z "$ac_c_werror_flag"
4209
			 || test ! -s conftest.err'
4186
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4210
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4187
  (eval $ac_try) 2>&5
4211
  (eval $ac_try) 2>&5
4188
  ac_status=$?
4212
  ac_status=$?
Lines 4246-4252 Link Here
4246
  cat conftest.err >&5
4270
  cat conftest.err >&5
4247
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4271
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4248
  (exit $ac_status); } &&
4272
  (exit $ac_status); } &&
4249
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
4273
	 { ac_try='test -z "$ac_c_werror_flag"
4274
			 || test ! -s conftest.err'
4250
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4275
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4251
  (eval $ac_try) 2>&5
4276
  (eval $ac_try) 2>&5
4252
  ac_status=$?
4277
  ac_status=$?
Lines 4311-4317 Link Here
4311
  cat conftest.err >&5
4336
  cat conftest.err >&5
4312
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4337
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4313
  (exit $ac_status); } &&
4338
  (exit $ac_status); } &&
4314
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
4339
	 { ac_try='test -z "$ac_c_werror_flag"
4340
			 || test ! -s conftest.err'
4315
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4341
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4316
  (eval $ac_try) 2>&5
4342
  (eval $ac_try) 2>&5
4317
  ac_status=$?
4343
  ac_status=$?
Lines 4368-4374 Link Here
4368
  cat conftest.err >&5
4394
  cat conftest.err >&5
4369
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4395
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4370
  (exit $ac_status); } &&
4396
  (exit $ac_status); } &&
4371
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
4397
	 { ac_try='test -z "$ac_c_werror_flag"
4398
			 || test ! -s conftest.err'
4372
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4399
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4373
  (eval $ac_try) 2>&5
4400
  (eval $ac_try) 2>&5
4374
  ac_status=$?
4401
  ac_status=$?
Lines 4435-4441 Link Here
4435
  cat conftest.err >&5
4462
  cat conftest.err >&5
4436
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4463
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4437
  (exit $ac_status); } &&
4464
  (exit $ac_status); } &&
4438
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
4465
	 { ac_try='test -z "$ac_c_werror_flag"
4466
			 || test ! -s conftest.err'
4439
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4467
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4440
  (eval $ac_try) 2>&5
4468
  (eval $ac_try) 2>&5
4441
  ac_status=$?
4469
  ac_status=$?
Lines 4500-4506 Link Here
4500
  cat conftest.err >&5
4528
  cat conftest.err >&5
4501
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4529
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4502
  (exit $ac_status); } &&
4530
  (exit $ac_status); } &&
4503
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
4531
	 { ac_try='test -z "$ac_c_werror_flag"
4532
			 || test ! -s conftest.err'
4504
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4533
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4505
  (eval $ac_try) 2>&5
4534
  (eval $ac_try) 2>&5
4506
  ac_status=$?
4535
  ac_status=$?
Lines 4564-4570 Link Here
4564
  cat conftest.err >&5
4593
  cat conftest.err >&5
4565
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4594
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4566
  (exit $ac_status); } &&
4595
  (exit $ac_status); } &&
4567
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
4596
	 { ac_try='test -z "$ac_c_werror_flag"
4597
			 || test ! -s conftest.err'
4568
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4598
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4569
  (eval $ac_try) 2>&5
4599
  (eval $ac_try) 2>&5
4570
  ac_status=$?
4600
  ac_status=$?
Lines 4628-4634 Link Here
4628
  cat conftest.err >&5
4658
  cat conftest.err >&5
4629
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4659
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4630
  (exit $ac_status); } &&
4660
  (exit $ac_status); } &&
4631
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
4661
	 { ac_try='test -z "$ac_c_werror_flag"
4662
			 || test ! -s conftest.err'
4632
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4663
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4633
  (eval $ac_try) 2>&5
4664
  (eval $ac_try) 2>&5
4634
  ac_status=$?
4665
  ac_status=$?
Lines 4692-4698 Link Here
4692
  cat conftest.err >&5
4723
  cat conftest.err >&5
4693
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4724
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4694
  (exit $ac_status); } &&
4725
  (exit $ac_status); } &&
4695
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
4726
	 { ac_try='test -z "$ac_c_werror_flag"
4727
			 || test ! -s conftest.err'
4696
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4728
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4697
  (eval $ac_try) 2>&5
4729
  (eval $ac_try) 2>&5
4698
  ac_status=$?
4730
  ac_status=$?
Lines 5527-5532 Link Here
5527
5559
5528
5560
5529
5561
5562
  if test x"$ac_file" != x-; then
5563
    { echo "$as_me:$LINENO: creating $ac_file" >&5
5564
echo "$as_me: creating $ac_file" >&6;}
5565
    rm -f "$ac_file"
5566
  fi
5530
  # Let's still pretend it is `configure' which instantiates (i.e., don't
5567
  # Let's still pretend it is `configure' which instantiates (i.e., don't
5531
  # use $as_me), people would be surprised to read:
5568
  # use $as_me), people would be surprised to read:
5532
  #    /* config.h.  Generated by config.status.  */
5569
  #    /* config.h.  Generated by config.status.  */
Lines 5565-5576 Link Here
5565
	 fi;;
5602
	 fi;;
5566
      esac
5603
      esac
5567
    done` || { (exit 1); exit 1; }
5604
    done` || { (exit 1); exit 1; }
5568
5569
  if test x"$ac_file" != x-; then
5570
    { echo "$as_me:$LINENO: creating $ac_file" >&5
5571
echo "$as_me: creating $ac_file" >&6;}
5572
    rm -f "$ac_file"
5573
  fi
5574
_ACEOF
5605
_ACEOF
5575
cat >>$CONFIG_STATUS <<_ACEOF
5606
cat >>$CONFIG_STATUS <<_ACEOF
5576
  sed "$ac_vpsub
5607
  sed "$ac_vpsub
(-)Mail-SpamAssassin-3.4.1-orig/spamc/configure.in (-2 / +2 lines)
Lines 64-76 Link Here
64
SSLLIBS=""
64
SSLLIBS=""
65
SSLCFLAGS=""
65
SSLCFLAGS=""
66
if test yes = "$sa_ssl_enabled"; then
66
if test yes = "$sa_ssl_enabled"; then
67
	AC_CHECK_LIB(crypto, CRYPTO_lock,[SSLLIBS="-lcrypto $SSLLIBS"])
67
	AC_CHECK_LIB(crypto, CRYPTO_malloc,[SSLLIBS="-lcrypto $SSLLIBS"])
68
	AC_CHECK_LIB(ssl, SSL_CTX_free,[SSLLIBS="-lssl $SSLLIBS"],,-lcrypto)
68
	AC_CHECK_LIB(ssl, SSL_CTX_free,[SSLLIBS="-lssl $SSLLIBS"],,-lcrypto)
69
69
70
	# before defining SPAMC_SSL check that all its requirements are
70
	# before defining SPAMC_SSL check that all its requirements are
71
	# actually available
71
	# actually available
72
	if test yes = "$ac_cv_header_openssl_crypto_h" && \
72
	if test yes = "$ac_cv_header_openssl_crypto_h" && \
73
	   test yes = "$ac_cv_lib_crypto_CRYPTO_lock" && \
73
	   test yes = "$ac_cv_lib_crypto_CRYPTO_malloc" && \
74
	   test yes = "$ac_cv_lib_ssl_SSL_CTX_free"; then
74
	   test yes = "$ac_cv_lib_ssl_SSL_CTX_free"; then
75
		SSLCFLAGS="-DSPAMC_SSL"
75
		SSLCFLAGS="-DSPAMC_SSL"
76
	else
76
	else

Return to bug 624858