[8289] Fixed build problem with some old mysql versions at Unix/Linux.

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
Derex 2009-08-01 21:15:59 +04:00 committed by VladimirMangos
parent 3150ae9cbc
commit 7af48902f1
2 changed files with 6 additions and 1 deletions

View file

@ -138,6 +138,11 @@ AC_PATH_PROGS(MYSQL_CONFIG, mysql_config, mysql_config, $PATH)
MYSQL_INCLUDES="`$MYSQL_CONFIG --cflags`" MYSQL_INCLUDES="`$MYSQL_CONFIG --cflags`"
MYSQL_LIBS="`$MYSQL_CONFIG --libs_r`" MYSQL_LIBS="`$MYSQL_CONFIG --libs_r`"
CXXFLAGS="-DDO_MYSQL $CXXFLAGS" CXXFLAGS="-DDO_MYSQL $CXXFLAGS"
# Workaround for --as-needed linker flag that comes sometimes from mysql
if echo $MYSQL_LIBS|grep "\-Wl,--as-needed" > /dev/null; then
MYSQL_LIBS=`echo $MYSQL_LIBS|sed -e "s/-Wl,--as-needed//"`;
AC_MSG_WARN([Your mysql libs contains -Wl,--as-needed, this is not good, problem fixed in more recent mysql versions])
fi
fi fi
else else
AC_MSG_RESULT($DO_MYSQL) AC_MSG_RESULT($DO_MYSQL)

View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "8288" #define REVISION_NR "8289"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__