if test "$withval" = "yes"; then
if test -f /usr/local/mysql/include/mysql/mysql.h; then
MYSQL_INCDIR=/usr/local/mysql/include/mysql
- if test -f /usr/local/mysql/lib64/mysql/libmysqlclient.a; then
+ if test -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.a; then
MYSQL_LIBDIR=/usr/local/mysql/lib64/mysql
else
MYSQL_LIBDIR=/usr/local/mysql/lib/mysql
MYSQL_BINDIR=/usr/local/mysql/bin
elif test -f /usr/include/mysql/mysql.h; then
MYSQL_INCDIR=/usr/include/mysql
- if test -f /usr/lib64/mysql/libmysqlclient.a; then
+ if test -f /usr/lib64/mysql/libmysqlclient_r.a; then
MYSQL_LIBDIR=/usr/lib64/mysql
else
MYSQL_LIBDIR=/usr/lib/mysql
MYSQL_BINDIR=/usr/bin
elif test -f /usr/include/mysql.h; then
MYSQL_INCDIR=/usr/include
- if test -f /usr/lib64/libmysqlclient.a; then
+ if test -f /usr/lib64/libmysqlclient_r.a; then
MYSQL_LIBDIR=/usr/lib64
else
MYSQL_LIBDIR=/usr/lib
MYSQL_BINDIR=/usr/bin
elif test -f /usr/local/include/mysql/mysql.h; then
MYSQL_INCDIR=/usr/local/include/mysql
- if test -f /usr/local/lib64/mysql/libmysqlclient.a; then
+ if test -f /usr/local/lib64/mysql/libmysqlclient_r.a; then
MYSQL_LIBDIR=/usr/local/lib64/mysql
else
MYSQL_LIBDIR=/usr/local/lib/mysql
MYSQL_BINDIR=/usr/local/bin
elif test -f /usr/local/include/mysql.h; then
MYSQL_INCDIR=/usr/local/include
- if test -f /usr/local/lib64/libmysqlclient.a; then
+ if test -f /usr/local/lib64/libmysqlclient_r.a; then
MYSQL_LIBDIR=/usr/local/lib64
else
MYSQL_LIBDIR=/usr/local/lib
else
if test -f $withval/include/mysql/mysql.h; then
MYSQL_INCDIR=$withval/include/mysql
- if test -f $withval/lib64/mysql/libmysqlclient.a; then
+ if test -f $withval/lib64/mysql/libmysqlclient_r.a; then
MYSQL_LIBDIR=$withval/lib64/mysql
else
MYSQL_LIBDIR=$withval/lib/mysql
# Solaris ...
- if test -f $withval/lib/libmysqlclient.so; then
+ if test -f $withval/lib/libmysqlclient_r.so; then
MYSQL_LIBDIR=$withval/lib
fi
fi
MYSQL_BINDIR=$withval/bin
elif test -f $withval/include/mysql.h; then
MYSQL_INCDIR=$withval/include
- if test -f "$withval/lib64/libmysqlclient.a"; then
+ if test -f "$withval/lib64/libmysqlclient_r.a"; then
MYSQL_LIBDIR=$withval/lib64
else
MYSQL_LIBDIR=$withval/lib
if test -f "$MYSQL_LIBDIR/libmysqlclient_r.a"; then
SQL_LFLAGS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz"
AC_DEFINE(HAVE_THREAD_SAFE_MYSQL)
- else
- SQL_LFLAGS="-L$MYSQL_LIBDIR -lmysqlclient -lz"
+ fi
+ if test -f "$MYSQL_LIBDIR/libmysqlclient_r.so"; then
+ SQL_LFLAGS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz"
+ AC_DEFINE(HAVE_THREAD_SAFE_MYSQL)
fi
SQL_BINDIR=$MYSQL_BINDIR
if test "$withval" = "yes"; then
if test -f /usr/local/mysql/include/mysql/mysql.h; then
MYSQL_INCDIR=/usr/local/mysql/include/mysql
- if test -f /usr/local/mysql/lib64/mysql/libmysqlclient.a; then
+ if test -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.a; then
MYSQL_LIBDIR=/usr/local/mysql/lib64/mysql
else
MYSQL_LIBDIR=/usr/local/mysql/lib/mysql
MYSQL_BINDIR=/usr/local/mysql/bin
elif test -f /usr/include/mysql/mysql.h; then
MYSQL_INCDIR=/usr/include/mysql
- if test -f /usr/lib64/mysql/libmysqlclient.a; then
+ if test -f /usr/lib64/mysql/libmysqlclient_r.a; then
MYSQL_LIBDIR=/usr/lib64/mysql
else
MYSQL_LIBDIR=/usr/lib/mysql
MYSQL_BINDIR=/usr/bin
elif test -f /usr/include/mysql.h; then
MYSQL_INCDIR=/usr/include
- if test -f /usr/lib64/libmysqlclient.a; then
+ if test -f /usr/lib64/libmysqlclient_r.a; then
MYSQL_LIBDIR=/usr/lib64
else
MYSQL_LIBDIR=/usr/lib
MYSQL_BINDIR=/usr/bin
elif test -f /usr/local/include/mysql/mysql.h; then
MYSQL_INCDIR=/usr/local/include/mysql
- if test -f /usr/local/lib64/mysql/libmysqlclient.a; then
+ if test -f /usr/local/lib64/mysql/libmysqlclient_r.a; then
MYSQL_LIBDIR=/usr/local/lib64/mysql
else
MYSQL_LIBDIR=/usr/local/lib/mysql
MYSQL_BINDIR=/usr/local/bin
elif test -f /usr/local/include/mysql.h; then
MYSQL_INCDIR=/usr/local/include
- if test -f /usr/local/lib64/libmysqlclient.a; then
+ if test -f /usr/local/lib64/libmysqlclient_r.a; then
MYSQL_LIBDIR=/usr/local/lib64
else
MYSQL_LIBDIR=/usr/local/lib
else
if test -f $withval/include/mysql/mysql.h; then
MYSQL_INCDIR=$withval/include/mysql
- if test -f $withval/lib64/mysql/libmysqlclient.a; then
+ if test -f $withval/lib64/mysql/libmysqlclient_r.a; then
MYSQL_LIBDIR=$withval/lib64/mysql
else
MYSQL_LIBDIR=$withval/lib/mysql
# Solaris ...
- if test -f $withval/lib/libmysqlclient.so; then
+ if test -f $withval/lib/libmysqlclient_r.so; then
MYSQL_LIBDIR=$withval/lib
fi
fi
MYSQL_BINDIR=$withval/bin
elif test -f $withval/include/mysql.h; then
MYSQL_INCDIR=$withval/include
- if test -f "$withval/lib64/libmysqlclient.a"; then
+ if test -f "$withval/lib64/libmysqlclient_r.a"; then
MYSQL_LIBDIR=$withval/lib64
else
MYSQL_LIBDIR=$withval/lib
#define HAVE_THREAD_SAFE_MYSQL 1
_ACEOF
- else
- SQL_LFLAGS="-L$MYSQL_LIBDIR -lmysqlclient -lz"
+ fi
+ if test -f "$MYSQL_LIBDIR/libmysqlclient_r.so"; then
+ SQL_LFLAGS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz"
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_THREAD_SAFE_MYSQL 1
+_ACEOF
+
fi
SQL_BINDIR=$MYSQL_BINDIR
General:
14May07
+kes Require the thread safe version of MySQL during configure. Thanks
+ to Andre Noll for pointing this out.
kes Ensure that calls to find_jobids_from_mediaid_list() check count before
continuing in migration code.
kes Apply implementation of tray-monitor font derived from gnome-console