]> git.pld-linux.org Git - packages/ntp.git/blob - ntp-openssl_check.patch
- trigger
[packages/ntp.git] / ntp-openssl_check.patch
1 --- ntp-4.2.4p7/configure.ac.orig       2009-05-19 10:22:32.000000000 +0200
2 +++ ntp-4.2.4p7/configure.ac    2009-05-19 10:29:41.000000000 +0200
3 @@ -3126,7 +3126,6 @@
4  AC_SUBST(OPENSSL_INC)
5  AC_SUBST(OPENSSL_LIB)
6  
7 -AC_MSG_CHECKING([for openssl library directory])
8  AC_ARG_WITH(openssl-libdir,
9         AC_HELP_STRING([--with-openssl-libdir], [+ =/something/reasonable]),
10  [ans=$withval],
11 @@ -3136,39 +3135,14 @@
12  esac])
13  case "$ans" in
14   no) ;;
15 - yes) # Look in:
16 -    ans="/usr/lib /usr/lib/openssl /usr/sfw/lib /usr/local/lib /usr/local/ssl/lib"
17 -    ;;
18 - *) # Look where they said
19 -    ;;
20 -esac
21 -case "$ans" in
22 - no) ;;
23 - *) # Look for libcrypto.a and libssl.a:
24 -    for i in $ans no
25 -    do
26 -       case "$host" in
27 -        *-*-darwin*)
28 -           test -f $i/libcrypto.dylib -a -f $i/libssl.dylib && break
29 -           ;;
30 -        *)
31 -           test -f $i/libcrypto.so -a -f $i/libssl.so && break
32 -           test -f $i/libcrypto.a -a -f $i/libssl.a && break
33 -           ;;
34 -       esac
35 -    done
36 -    case "$i" in
37 -     no)
38 -       ans=no
39 -       OPENSSL_LIB=
40 -       ;;
41 -     *) ans=$i
42 -       OPENSSL_LIB=$ans
43 -       ;;
44 -    esac
45 +  *)
46 +   if test "$ans" != "yes" ; then
47 +       LDFLAGS="$LDFLAGS -L$ans"
48 +   fi
49 +   AC_CHECK_LIB([crypto],[DES_crypt],[AC_SUBST(LCRYPTO,[-lcrypto])])
50 +   AC_CHECK_LIB([ssl],[SSL_CTX_new],[AC_SUBST(LSSL,[-lssl])])
51      ;;
52  esac
53 -AC_MSG_RESULT([$ans])
54  
55  AC_MSG_CHECKING([for openssl include directory])
56  AC_ARG_WITH(openssl-incdir,
57 @@ -3212,19 +3186,17 @@
58  case "$ans" in
59   no) ;;
60   yes|openssl)
61 -    if test -z "$OPENSSL_LIB" -o -z "$OPENSSL_INC"
62 +    if test -z "$LCRYPTO" -o -z "$OPENSSL_INC"
63      then
64         ans=no
65      else
66         # We have OpenSSL inc/lib - use them.
67         ans=openssl
68         CPPFLAGS="$CPPFLAGS -I$OPENSSL_INC"
69 -       LDFLAGS="$LDFLAGS -L$OPENSSL_LIB"
70         case "$need_dash_r" in
71          1) LDFLAGS="$LDFLAGS -R$OPENSSL_LIB"
72             ;;
73         esac
74 -       AC_SUBST(LCRYPTO, [-lcrypto])
75         AC_DEFINE(OPENSSL, , [Use OpenSSL?])
76         AC_CHECK_FUNCS(EVP_md2 EVP_mdc2)
77      fi
This page took 0.055792 seconds and 3 git commands to generate.