summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorgeniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2006-10-17 19:08:23 +0000
committergeniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2006-10-17 19:08:23 +0000
commitb84de63e7217a9a46db3be92d3a33936d722eea6 (patch)
tree59e6f2f03b556373fd33189a88e8d1ce983676be /configure
parent4d638356f53eb466eaed8592ada0dee9633b9f95 (diff)
BUILD : 1.7.16 (1181) BUGS : NOTES : Fixed MySQL detection in configure.in; it should now always work correctly if mysql_config is found
git-svn-id: svn://svn.anope.org/anope/trunk@1181 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@902 5417fbe8-f217-4b02-8779-1006273d7864
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. */