From f0fceda7bc37ca7896c71ff064a6a638e54c7f4d Mon Sep 17 00:00:00 2001 From: antiroot Date: Fri, 2 Jul 2010 19:05:33 +0400 Subject: [PATCH] [10138] Include openssl libpath in MANGOS_LIBS for later proper lib search Also fix typo in ax_check_openssl.m4 Signed-off-by: VladimirMangos --- configure.ac | 2 +- m4/ax_check_openssl.m4 | 2 +- src/shared/revision_nr.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 7f2a0dd30..1c9435ec6 100644 --- a/configure.ac +++ b/configure.ac @@ -254,7 +254,7 @@ AM_CONDITIONAL([MANGOS_BUILD_ACE], [test X$enable_builtin_ace_support = Xyes]) ## Unify all additional includes/libs in one variable. # TODO this looks kinda ugly, but when we add m4 folder I will make it look very pritey ( by Derex ). MANGOS_INCLUDES="$ACE_INCLUDES $POSTGRE_INCLUDES $MYSQL_INCLUDES $OPENSSL_INCLUDES $MANGOS_INCLUDES" -MANGOS_LIBS="$ACE_LIBS $POSTGRE_LIBS $MYSQL_LIBS $ZLIB $COMPATLIB $OPENSSL_LIBS $MANGOS_LIBS" +MANGOS_LIBS="$ACE_LIBS $POSTGRE_LIBS $MYSQL_LIBS $ZLIB $COMPATLIB $OPENSSL_LDFLAGS $OPENSSL_LIBS $MANGOS_LIBS" ## Export defined variables AC_SUBST(DOXYGEN) diff --git a/m4/ax_check_openssl.m4 b/m4/ax_check_openssl.m4 index 7f5c3193c..8c8740d2a 100644 --- a/m4/ax_check_openssl.m4 +++ b/m4/ax_check_openssl.m4 @@ -76,7 +76,7 @@ AC_DEFUN([AX_CHECK_OPENSSL], [ AC_MSG_CHECKING([for openssl/ssl.h in $ssldir]) if test -f "$ssldir/include/openssl/ssl.h"; then OPENSSL_INCLUDES="-I$ssldir/include" - OPENSSL_LDFLAGS="-L $ssldir/lib" + OPENSSL_LDFLAGS="-L$ssldir/lib" OPENSSL_LIBS="-lssl -lcrypto" found=true AC_MSG_RESULT([yes]) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index d1e383229..c27ab58b4 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10137" + #define REVISION_NR "10138" #endif // __REVISION_NR_H__