mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-17 07:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10138] Include openssl libpath in MANGOS_LIBS for later proper lib search

Browse source 
Also fix typo in ax_check_openssl.m4

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
antiroot 2010-07-02 19:05:33 +04:00 • committed by VladimirMangos
parent f3049e6dd7
commit f0fceda7bc
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -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)

2
m4/ax_check_openssl.m4
View file

@ -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])

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "10137"
#define REVISION_NR "10138"
#endif // __REVISION_NR_H__