[Box Backup-dev] RC3 Solaris testing

[Martin Ebourne]

--=-/E/FaWeP88ExV0t5x3o1
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

On Mon, 2006-02-20 at 00:55 +0000, Martin Ebourne wrote:
> On Sat, 2006-02-18 at 15:19 +0000, Chris Wilson wrote:
> > Hi all,
> > 
> > On Sat, 18 Feb 2006, Chris Wilson wrote:
> > 
> > > If I export LIBS=-ldl first, then it works.
> > 
> > Same on sparc-sun-solaris2.9.
> 
> Can yourself, Gary, and anyone else having any configure problems with
> ssl please try the attached patch.
> 
> You'll need to rerun ./bootstrap after applying (need autoconf installed
> for this).

Has anyone been able to try the second version of the patch I sent out
for this fix? (Reattached here for convenience.)

Cheers,

Martin.

--=-/E/FaWeP88ExV0t5x3o1
Content-Description: 
Content-Disposition: inline; filename=box-ssl-conf.patch
Content-Type: text/x-patch; charset=UTF-8
Content-Transfer-Encoding: 7bit

Index: infrastructure/m4/ax_check_ssl.m4
===================================================================
--- infrastructure/m4/ax_check_ssl.m4	(revision 474)
+++ infrastructure/m4/ax_check_ssl.m4	(working copy)
@@ -27,7 +27,14 @@
 
   ax_check_ssl_found=yes
   AC_CHECK_HEADERS([openssl/ssl.h],, [ax_check_ssl_found=no])
-  AC_CHECK_LIB([ssl], [SSL_read],, [ax_check_ssl_found=no], [-lcrypto])
+  AC_CHECK_LIB([ssl], [SSL_read], [LIBS="-lssl $LIBS"], [
+    unset ac_cv_lib_ssl_SSL_read
+    AC_CHECK_LIB([ssl],
+                 [SSL_read],
+                 [LIBS="-lssl -lcrypto -ldl $LIBS"],
+                 [ax_check_ssl_found=no],
+                 [-lcrypto -ldl])
+    ],)
 
   if test "x$ax_check_ssl_found" = "xyes"; then
     AC_DEFINE([HAVE_SSL], 1, [Define to 1 if SSL is available])
Index: configure.ac
===================================================================
--- configure.ac	(revision 474)
+++ configure.ac	(working copy)
@@ -59,9 +59,9 @@
   [old-ssl],
   [AC_HELP_STRING([--enable-old-ssl],
                   [Allow use of pre-0.9.7 Open SSL - NOT RECOMMENDED, read the documentation])])
-AC_CHECK_LIB(
-  [crypto],
-  [EVP_CipherInit_ex],, [
+AC_SEARCH_LIBS(
+  [EVP_CipherInit_ex],
+  [crypto],, [
   if test "x$enable_old_ssl" = "xyes"; then
     AC_DEFINE([HAVE_OLD_SSL], 1, [Define to 1 if SSL is pre-0.9.7])
   else
@@ -179,7 +179,6 @@
   [static-bin],
   [AC_HELP_STRING([--enable-static-bin], [Link binaries with static libraries])])
 if test "x$enable_static_bin" = "xyes"; then
-  AC_CHECK_LIB([ssl],[SSL_read],,, [crypto])
   LIBS="-Wl,-Bstatic $LIBS -Wl,-Bdynamic"
 fi
 

--=-/E/FaWeP88ExV0t5x3o1--