Backout ssl/ssl.h change for now. Trying to support "odd" 3rd

repackagers is a can of worms.

diff --git a/configure b/configure
index 74d1b37859855cb4cb86047af402df7d2938542b..7c88e31f8d0c30c1dd4cf892fc23a970969718f0 100755 (executable)
--- a/configure
+++ b/configure
@@ -4154,7 +4154,7 @@ fi
 ol_link_tls=no
 if test $ol_with_tls != no ; then
        
-       for ac_hdr in ssl.h ssl/ssl.h
+       for ac_hdr in ssl.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -4195,7 +4195,7 @@ fi
 done
 
        
-       if test $ac_cv_header_ssl_h = yes -o $ac_cv_header_ssl_ssl_h = yes ; then
+       if test $ac_cv_header_ssl_h = yes ; then
                echo $ac_n "checking for SSLeay_add_ssl_algorithms in -lssl""... $ac_c" 1>&6
 echo "configure:4201: checking for SSLeay_add_ssl_algorithms in -lssl" >&5
 ac_lib_var=`echo ssl'_'SSLeay_add_ssl_algorithms | sed 'y%./+-%__p_%'`

diff --git a/configure.in b/configure.in
index 508e1dc60245d9e45adcd711401cb9760b1746d1..3e59d8ad011c78db8e6eb0458b6f1796ed639ded 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -530,9 +530,9 @@ dnl
 ol_link_tls=no
 if test $ol_with_tls != no ; then
        
-       AC_CHECK_HEADERS(ssl.h ssl/ssl.h)
+       AC_CHECK_HEADERS(ssl.h)
        
-       if test $ac_cv_header_ssl_h = yes -o $ac_cv_header_ssl_ssl_h = yes ; then
+       if test $ac_cv_header_ssl_h = yes ; then
                AC_CHECK_LIB(ssl, SSLeay_add_ssl_algorithms, 
                        [have_ssleay=yes
                        need_rsaref=no],

diff --git a/include/portable.h.in b/include/portable.h.in
index a7fa967975eaf0f874e4453013c06d9336f65fde..05a6f1f4bc5625500eada1a566e141dbcb5ca461 100644 (file)
--- a/include/portable.h.in
+++ b/include/portable.h.in
@@ -603,6 +603,12 @@
 /* Define if you have the socket library (-lsocket).  */
 #undef HAVE_LIBSOCKET
 
+/* Name of package */
+#undef PACKAGE
+
+/* Version number of package */
+#undef VERSION
+
 /* define if you have -lxttp */
 #undef HAVE_XTPP