diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/configure.in b/configure.in index 6a041852..16e22a68 100644 --- a/configure.in +++ b/configure.in | |||
| @@ -269,7 +269,7 @@ AC_ARG_WITH(mysql, | |||
| 269 | if test -n "$MYSQL"; then | 269 | if test -n "$MYSQL"; then |
| 270 | MYSQLLIBDIR=$MYSQL/lib/mysql | 270 | MYSQLLIBDIR=$MYSQL/lib/mysql |
| 271 | CPPFLAGS="-I$MYSQL/include" | 271 | CPPFLAGS="-I$MYSQL/include" |
| 272 | AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz" check_mysql_LDFLAGS="-L$MYSQLLIBDIR ",,-L$MYSQLLIBDIR -lz) | 272 | AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz" check_mysql_LDFLAGS="-L$MYSQLLIBDIR " check_mysql_query_LDFLAGS="-L$MYSQLLIBDIR ",,-L$MYSQLLIBDIR -lz) |
| 273 | AC_CHECK_LIB(mysqlclient,mysql_close,MYSQLLIBS="-lmysqlclient") | 273 | AC_CHECK_LIB(mysqlclient,mysql_close,MYSQLLIBS="-lmysqlclient") |
| 274 | elif test -f /usr/lib/libmysqlclient.so; then | 274 | elif test -f /usr/lib/libmysqlclient.so; then |
| 275 | AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz",,-lz) | 275 | AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz",,-lz) |
| @@ -278,11 +278,11 @@ elif test -f /usr/lib/libmysqlclient.a; then | |||
| 278 | AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz",,-lz) | 278 | AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz",,-lz) |
| 279 | AC_CHECK_LIB(mysqlclient,mysql_close,MYSQLLIBS="-lmysqlclient") | 279 | AC_CHECK_LIB(mysqlclient,mysql_close,MYSQLLIBS="-lmysqlclient") |
| 280 | elif test -f /usr/lib/mysql/libmysqlclient.so; then | 280 | elif test -f /usr/lib/mysql/libmysqlclient.so; then |
| 281 | AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz" check_mysql_LDFLAGS="-L/usr/lib/mysql",,-L/usr/lib/mysql -lz) | 281 | AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz" check_mysql_LDFLAGS="-L/usr/lib/mysql" check_mysql_query_LDFLAGS="-L/usr/lib/mysql",,-L/usr/lib/mysql -lz) |
| 282 | AC_CHECK_LIB(mysqlclient,mysql_close,MYSQLLIBS="-lmysqlclient" check_mysql_LDFLAGS="-L/usr/lib/mysql",,-L/usr/lib/mysql) | 282 | AC_CHECK_LIB(mysqlclient,mysql_close,MYSQLLIBS="-lmysqlclient" check_mysql_LDFLAGS="-L/usr/lib/mysql" check_mysql_query_LDFLAGS="-L/usr/lib/mysql",,-L/usr/lib/mysql) |
| 283 | elif test -f /usr/lib/mysql/libmysqlclient.a; then | 283 | elif test -f /usr/lib/mysql/libmysqlclient.a; then |
| 284 | AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz" check_mysql_LDFLAGS="-L/usr/lib/mysql",,-L/usr/lib/mysql -lz) | 284 | AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz" check_mysql_LDFLAGS="-L/usr/lib/mysql" check_mysql_query_LDFLAGS="-L/usr/lib/mysql",,-L/usr/lib/mysql -lz) |
| 285 | AC_CHECK_LIB(mysqlclient,mysql_close,MYSQLLIBS="-lmysqlclient" check_mysql_LDFLAGS="-L/usr/lib/mysql",,-L/usr/lib/mysql) | 285 | AC_CHECK_LIB(mysqlclient,mysql_close,MYSQLLIBS="-lmysqlclient" check_mysql_LDFLAGS="-L/usr/lib/mysql" check_mysql_query_LDFLAGS="-L/usr/lib/mysql",,-L/usr/lib/mysql) |
| 286 | fi | 286 | fi |
| 287 | if test "$ac_cv_lib_mysqlclient_mysql_init" = "yes" -o "$ac_cv_lib_mysqlclient_mysql_close" = "yes"; then | 287 | if test "$ac_cv_lib_mysqlclient_mysql_init" = "yes" -o "$ac_cv_lib_mysqlclient_mysql_close" = "yes"; then |
| 288 | AC_CHECK_HEADERS(mysql/mysql.h mysql/errmsg.h, MYSQLINCLUDE="-I$MYSQL/include" ) | 288 | AC_CHECK_HEADERS(mysql/mysql.h mysql/errmsg.h, MYSQLINCLUDE="-I$MYSQL/include" ) |
| @@ -291,6 +291,7 @@ if test "$ac_cv_lib_mysqlclient_mysql_init" = "yes" -o "$ac_cv_lib_mysqlclient_m | |||
| 291 | AC_SUBST(MYSQLINCLUDE) | 291 | AC_SUBST(MYSQLINCLUDE) |
| 292 | AC_SUBST(MYSQLLIBS) | 292 | AC_SUBST(MYSQLLIBS) |
| 293 | AC_SUBST(check_mysql_LDFLAGS) | 293 | AC_SUBST(check_mysql_LDFLAGS) |
| 294 | AC_SUBST(check_mysql_query_LDFLAGS) | ||
| 294 | else | 295 | else |
| 295 | AC_MSG_WARN([Skipping mysql plugin]) | 296 | AC_MSG_WARN([Skipping mysql plugin]) |
| 296 | AC_MSG_WARN([install mysql client headers to compile this plugin (see REQUIREMENTS).]) | 297 | AC_MSG_WARN([install mysql client headers to compile this plugin (see REQUIREMENTS).]) |
