owl (2.2.2-1.1) configure.in

Summary

 configure.in |   34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

    
download this patch

Patch contents

--- owl-2.2.2.orig/configure.in
+++ owl-2.2.2/configure.in
@@ -30,13 +30,21 @@
 
 dnl Check for kerberosIV include
 AC_MSG_CHECKING(for /usr/include/kerberosIV)
-if test -d /usr/include/kerberosIV; then
-        CFLAGS=${CFLAGS}\ -I/usr/include/kerberosIV
-        CPPFLAGS=${CPPFLAGS}\ -I/usr/include/kerberosIV
-        AC_MSG_RESULT(yes)
+dnl per debbugs#517019
+AC_MSG_RESULT(DEPRECATED)
+dnl if test -d /usr/include/kerberosIV; then
+dnl         CFLAGS=${CFLAGS}\ -I/usr/include/kerberosIV
+dnl         CPPFLAGS=${CPPFLAGS}\ -I/usr/include/kerberosIV
+dnl         AC_MSG_RESULT(yes)
+dnl el
+if test -d /usr/include/openssl; then
+        CFLAGS=${CFLAGS}\ -I/usr/include/openssl
+        CPPFLAGS=${CPPFLAGS}\ -I/usr/include/openssl
+        AC_MSG_RESULT(OpenSSL DES found instead)
 else
         AC_MSG_RESULT(no)
 fi
+dnl openssl stanza per debbugs#517019
 
 dnl check for stack-protector
 PROTECT_CFLAGS=${PROTECT_CFLAGS-"-fstack-protector"}
@@ -54,18 +62,24 @@
 AC_CHECK_LIB(com_err, com_err)
 AC_CHECK_LIB(nsl, gethostbyname)
 AC_CHECK_LIB(socket, socket)
-AC_CHECK_LIB(k5crypto, krb5_derive_key)
+dnl per debbugs#517019
+dnl AC_CHECK_LIB(k5crypto, krb5_derive_key)
 dnl AC_CHECK_LIB(des425, req_act_vno)
-AC_CHECK_LIB(des425, des_cbc_encrypt)
+dnl AC_CHECK_LIB(des425, des_cbc_encrypt)
+dnl AC_CHECK_LIB(des425, des_cbc_encrypt,,AC_CHECK_LIB(crypto,DES_cbc_encrypt))
+AC_CHECK_LIB(crypto,DES_cbc_encrypt)
 dnl AC_CHECK_LIB(des, des_quad_cksum)
 AC_CHECK_LIB(resolv, res_search)
-AC_CHECK_LIB(krb5, krb5_get_credentials)
-AC_CHECK_LIB(krb4, krb_sendauth,,
-   AC_CHECK_LIB(krb, krb_sendauth))
+dnl per debbugs#517019
+dnl AC_CHECK_LIB(krb5, krb5_get_credentials)
+dnl AC_CHECK_LIB(krb4, krb_sendauth,,
+dnl   AC_CHECK_LIB(krb, krb_sendauth))
 dnl AC_CHECK_LIB(zephyr, ZGetSender,, AC_MSG_ERROR(No zephyr library found.))
 AC_CHECK_LIB(zephyr, ZGetSender)
 AC_CHECK_LIB(zephyr, ZInitLocationInfo, AC_DEFINE([HAVE_LIBZEPHYR_ZINITLOCATIONINFO], [], [Have ZInitLocationInfo]),)
 
+dnl per debbugs#517019
+AC_CHECK_FUNCS(DES_string_to_key  DES_ecb_encrypt DES_key_sched)
 AC_CHECK_FUNCS(use_default_colors resizeterm des_string_to_key des_key_sched des_ecb_encrypt)
 
 AC_MSG_CHECKING(for des_ecb_encrypt prototype)
@@ -107,7 +121,7 @@
 fi
 
 dnl Add LDFLAGS for embeded perl
-FOO=`perl -MExtUtils::Embed -e ldopts | sed 's/,-E//' | sed 's/-liconv//'`
+FOO=`perl -MExtUtils::Embed -e ldopts | sed 's/-Wl,-E//' | sed 's/-liconv//'`
 echo Adding perl LDFLAGS ${FOO}
 LDFLAGS=${LDFLAGS}\ ${FOO}