[cvslog] [CVS] Module eggdrop1.8: Change committed

cvs at eggheads.org cvs at eggheads.org
Sun Oct 24 07:42:03 CST 2010


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.8
Commit time: 2010-10-24 13:42:03 UTC
Committer  : Rumen Stoyanov <pseudo at egg6.net>

Modified files:
     aclocal.m4 configure doc/Changes1.8

Log message:

Added -lcrypto when probing for -lssl in --with-ssllib

---------------------- diff included ----------------------
Index: eggdrop1.8/aclocal.m4
diff -u eggdrop1.8/aclocal.m4:1.10 eggdrop1.8/aclocal.m4:1.11
--- eggdrop1.8/aclocal.m4:1.10	Wed Oct 20 07:07:13 2010
+++ eggdrop1.8/aclocal.m4	Sun Oct 24 07:41:53 2010
@@ -16,7 +16,7 @@
 dnl along with this program; if not, write to the Free Software
 dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 dnl
-dnl $Id: aclocal.m4,v 1.10 2010/10/20 13:07:13 pseudo Exp $
+dnl $Id: aclocal.m4,v 1.11 2010/10/24 13:41:53 pseudo Exp $
 dnl
 
 
@@ -1958,8 +1958,8 @@
   [
     if test "$enable_tls" != "no"; then
       if test -d "$withval"; then
-        AC_CHECK_LIB(ssl, SSL_accept, , [havessllib="no"], [-L$withval])
-        AC_CHECK_LIB(crypto, X509_digest, , [havessllib="no"], [-L$withval])
+        AC_CHECK_LIB(ssl, SSL_accept, , [havessllib="no"], [-L$withval -lcrypto])
+        AC_CHECK_LIB(crypto, X509_digest, , [havessllib="no"], [-L$withval -lssl])
         if test "$havessllib" = "no"; then
           AC_MSG_WARN([Invalid path to OpenSSL libs. $withval doesn't contain the required files.])
         else
Index: eggdrop1.8/configure
diff -u eggdrop1.8/configure:1.11 eggdrop1.8/configure:1.12
--- eggdrop1.8/configure:1.11	Wed Oct 20 07:07:13 2010
+++ eggdrop1.8/configure	Sun Oct 24 07:41:53 2010
@@ -8281,7 +8281,7 @@
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lssl -L$withval $LIBS"
+LIBS="-lssl -L$withval -lcrypto $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -8328,7 +8328,7 @@
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcrypto -L$withval $LIBS"
+LIBS="-lcrypto -L$withval -lssl $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
Index: eggdrop1.8/doc/Changes1.8
diff -u eggdrop1.8/doc/Changes1.8:1.25 eggdrop1.8/doc/Changes1.8:1.26
--- eggdrop1.8/doc/Changes1.8:1.25	Sun Oct 24 07:22:39 2010
+++ eggdrop1.8/doc/Changes1.8	Sun Oct 24 07:41:53 2010
@@ -1,4 +1,4 @@
-$Id: Changes1.8,v 1.25 2010/10/24 13:22:39 pseudo Exp $
+$Id: Changes1.8,v 1.26 2010/10/24 13:41:53 pseudo Exp $
 
 Eggdrop Changes (since version 1.8.0)
 
@@ -6,6 +6,9 @@
 
 1.8.0 (CVS):
 
+  - Added -lcrypto when probing for -lssl in --with-ssllib
+    Patch by: pseudo
+
   - Removed the never-give-up, sort-users and kick-fun/ban-fun variables.
     Sorting users shouldn't be a challenge for CPUs nowadays. The rest are
     rarely used and can be scripted.
----------------------- End of diff -----------------------


More information about the Changes mailing list