Is this patch help?
diff --git a/m4/ax_check_openssl.m4 b/m4/ax_check_openssl.m4
index 7f5c319..cf5bfff 100644
--- a/m4/ax_check_openssl.m4
+++ b/m4/ax_check_openssl.m4
@@ -31,6 +31,10 @@
# permitted in any medium without royalty provided the copyright notice
# and this notice are preserved. This file is offered as-is, without any
# warranty.
+#
+# MaNGOS local changes: OPENSSL_INCLUDES replaced by OPENSSL_CPPFLAGS for better
+# compatibility with PKG_CONFIG way work
+#
AU_ALIAS([CHECK_SSL], [AX_CHECK_OPENSSL])
AC_DEFUN([AX_CHECK_OPENSSL], [
@@ -54,7 +58,7 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
OPENSSL_LDFLAGS=`$PKG_CONFIG openssl --libs-only-L 2>/dev/null`
if test $? = 0; then
OPENSSL_LIBS=`$PKG_CONFIG openssl --libs-only-l 2>/dev/null`
- OPENSSL_INCLUDES=`$PKG_CONFIG openssl --cflags-only-I 2>/dev/null`
+ OPENSSL_CPPFLAGS=`$PKG_CONFIG openssl --cflags-only-I 2>/dev/null`
found=true
fi
fi
@@ -71,11 +75,11 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
# an 'openssl' subdirectory
if ! $found; then
- OPENSSL_INCLUDES=
+ OPENSSL_CPPFLAGS=
for ssldir in $ssldirs; do
AC_MSG_CHECKING([for openssl/ssl.h in $ssldir])
if test -f "$ssldir/include/openssl/ssl.h"; then
- OPENSSL_INCLUDES="-I$ssldir/include"
+ OPENSSL_CPPFLAGS="-I$ssldir/include"
OPENSSL_LDFLAGS="-L $ssldir/lib"
OPENSSL_LIBS="-lssl -lcrypto"
found=true
@@ -95,14 +99,14 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
AC_MSG_CHECKING([whether compiling and linking against OpenSSL works])
echo "Trying link with OPENSSL_LDFLAGS=$OPENSSL_LDFLAGS;" \\
- "OPENSSL_LIBS=$OPENSSL_LIBS; OPENSSL_INCLUDES=$OPENSSL_INCLUDES" >&AS_MESSAGE_LOG_FD
+ "OPENSSL_LIBS=$OPENSSL_LIBS; OPENSSL_CPPFLAGS=$OPENSSL_CPPFLAGS" >&AS_MESSAGE_LOG_FD
save_LIBS="$LIBS"
save_LDFLAGS="$LDFLAGS"
save_CPPFLAGS="$CPPFLAGS"
LDFLAGS="$LDFLAGS $OPENSSL_LDFLAGS"
LIBS="$OPENSSL_LIBS $LIBS"
- CPPFLAGS="$OPENSSL_INCLUDES $CPPFLAGS"
+ CPPFLAGS="$OPENSSL_CPPFLAGS $CPPFLAGS"
AC_LINK_IFELSE(
AC_LANG_PROGRAM([#include <openssl/ssl.h>], [sSL_new(NULL)]),
[
@@ -116,7 +120,7 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
LDFLAGS="$save_LDFLAGS"
LIBS="$save_LIBS"
- AC_SUBST([OPENSSL_INCLUDES])
+ AC_SUBST([OPENSSL_CPPFLAGS])
AC_SUBST([OPENSSL_LIBS])
AC_SUBST([OPENSSL_LDFLAGS])
])
Can someone with problems build mangos after SSL detection chnages check this?