1 diff -dur -x '*.orig' ntp-4.2.6p1.orig/configure.ac ntp-4.2.6p1/configure.ac
2 --- ntp-4.2.6p1.orig/configure.ac 2010-05-24 20:26:21.000000000 +0200
3 +++ ntp-4.2.6p1/configure.ac 2010-05-24 20:32:57.000000000 +0200
8 -AC_MSG_CHECKING([for openssl library directory])
9 AC_ARG_WITH(openssl-libdir,
10 AC_HELP_STRING([--with-openssl-libdir], [+ =/something/reasonable]),
12 @@ -3257,39 +3256,14 @@
17 - ans="/usr/lib /usr/lib/openssl /usr/sfw/lib /usr/local/lib /usr/local/ssl/lib /lib"
19 - *) # Look where they said
24 - *) # Look for libcrypto.a and libssl.a:
29 - test -f $i/libcrypto.dylib -a -f $i/libssl.dylib && break
32 - test -f $i/libcrypto.so -a -f $i/libssl.so && break
33 - test -f $i/libcrypto.a -a -f $i/libssl.a && break
48 + if test "$ans" != "yes" ; then
49 + LDFLAGS="$LDFLAGS -L$ans"
51 + AC_CHECK_LIB([crypto],[DES_crypt],[AC_SUBST(LCRYPTO,[-lcrypto])])
52 + AC_CHECK_LIB([ssl],[SSL_CTX_new],[AC_SUBST(LSSL,[-lssl])])
55 -AC_MSG_RESULT([$ans])
57 AC_MSG_CHECKING([for openssl include directory])
58 AC_ARG_WITH(openssl-incdir,
59 @@ -3301,14 +3275,6 @@
64 - ans="/usr/include /usr/sfw/include /usr/local/include /usr/local/ssl/include"
66 - *) # Look where they said
71 *) # look for openssl/opensslconf.h:
78 - if test -z "$OPENSSL_LIB" -o -z "$OPENSSL_INC"
79 + if test -z "$LCRYPTO" -o -z "$OPENSSL_INC"
83 @@ -3349,11 +3315,9 @@
85 # We have OpenSSL inc/lib - use them.
86 CPPFLAGS="$CPPFLAGS -I$OPENSSL_INC"
87 - LDFLAGS="$LDFLAGS -L$OPENSSL_LIB"
88 case "$need_dash_r" in
89 1) LDFLAGS="$LDFLAGS -R$OPENSSL_LIB"
91 - AC_SUBST(LCRYPTO, [-lcrypto])
92 AC_DEFINE(OPENSSL, , [Use OpenSSL?])
95 Only in ntp-4.2.6p1: configure.ac~