Skip to content
Snippets Groups Projects
Commit f246b7a5 authored by David Bigagli's avatar David Bigagli
Browse files

Update the mysql_config to use the --include option instead

of --cflags. See #1066.
parent c4404daf
No related branches found
No related tags found
No related merge requests found
...@@ -46,7 +46,7 @@ AC_DEFUN([X_AC_DATABASES], ...@@ -46,7 +46,7 @@ AC_DEFUN([X_AC_DATABASES],
else else
# mysql_config puts -I on the front of the dir. We don't # mysql_config puts -I on the front of the dir. We don't
# want that so we remove it. # want that so we remove it.
MYSQL_CFLAGS=`$HAVEMYSQLCONFIG --cflags` MYSQL_CFLAGS=`$HAVEMYSQLCONFIG --include`
MYSQL_LIBS=`$HAVEMYSQLCONFIG --libs_r` MYSQL_LIBS=`$HAVEMYSQLCONFIG --libs_r`
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS" save_LIBS="$LIBS"
...@@ -67,7 +67,7 @@ AC_DEFUN([X_AC_DATABASES], ...@@ -67,7 +67,7 @@ AC_DEFUN([X_AC_DATABASES],
AC_SUBST(MYSQL_CFLAGS) AC_SUBST(MYSQL_CFLAGS)
AC_DEFINE(HAVE_MYSQL, 1, [Define to 1 if using MySQL libaries]) AC_DEFINE(HAVE_MYSQL, 1, [Define to 1 if using MySQL libaries])
else else
MYSQL_CFLAGS=`$HAVEMYSQLCONFIG --cflags` MYSQL_CFLAGS=`$HAVEMYSQLCONFIG --include`
MYSQL_LIBS=`$HAVEMYSQLCONFIG --libs` MYSQL_LIBS=`$HAVEMYSQLCONFIG --libs`
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS" save_LIBS="$LIBS"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment