summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 8 insertions, 2 deletions
diff --git a/configure b/configure
index 1dd09ae2e..c46f31dba 100755
--- a/configure
+++ b/configure
@@ -2854,8 +2854,14 @@ fi
if test "$MYSQLCONF" != ""; then
hold_cflags="$CFLAGS"
hold_ldflags="$LDFLAGS"
- CFLAGS="$CFLAGS `$MYSQLCONF --cflags`"
- LDFLAGS="$LDFLAGS `$MYSQLCONF --libs`"
+ if test "$MYSQL_CFLAGS" = ""; then
+ MYSQL_CFLAGS="`$MYSQLCONF --cflags`"
+ fi
+ if test "$MYSQL_LDFLAGS" = ""; then
+ MYSQL_LDFLAGS="`$MYSQLCONF --libs`"
+ fi
+ CFLAGS="$CFLAGS $MYSQL_CFLAGS"
+ LDFLAGS="$LDFLAGS $MYSQL_LDFLAGS"
echo $ECHO_N "checking if mysql_config produces valid values... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */