Browse Source

respect withval for mysql_config

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-merge-1.4.x@542 152afb58-edef-0310-8abb-c4023f1b3aa9
svn/tags/lighttpd-1.4.2
Jan Kneschke 17 years ago
parent
commit
5ef3dc822c
  1. 43
      configure.in

43
configure.in

@ -89,34 +89,35 @@ AC_ARG_WITH(mysql,
AC_HELP_STRING([--with-mysql@<:@=PATH@:>@],[Include MySQL support. PATH is the path to 'mysql_config']),
[
if test "$withval" != "no"; then
if test "$withval" = "yes"; then
if test "$withval" != "yes"; then
withval=$MYSQLCONFIG
fi
if test \! -x $withval; then
echo "--with-mysql=path-to-mysql_config"
fi
if $withval | grep -- '--include' > /dev/null ; then
MYSQL_INCLUDE="`$withval --include | sed s/\'//g`"
else
MYSQL_INCLUDE="`$withval --cflags | sed s/\'//g`"
fi
MYSQL_LIBS="`$withval --libs | sed s/\'//g`"
if test -e $withval; then
if $withval | grep -- '--include' > /dev/null ; then
MYSQL_INCLUDE="`$withval --include | sed s/\'//g`"
else
MYSQL_INCLUDE="`$withval --cflags | sed s/\'//g`"
fi
MYSQL_LIBS="`$withval --libs | sed s/\'//g`"
AC_MSG_RESULT(yes)
AC_MSG_RESULT(yes)
AC_MSG_CHECKING(for MySQL includes at)
AC_MSG_RESULT($MYSQL_INCLUDE)
AC_MSG_CHECKING(for MySQL includes at)
AC_MSG_RESULT($MYSQL_INCLUDE)
AC_MSG_CHECKING(for MySQL libraries at)
AC_MSG_RESULT($MYSQL_LIBS)
dnl check for errmsg.h, which isn't installed by some versions of 3.21
old_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $MYSQL_INCLUDE"
AC_CHECK_HEADERS(errmsg.h mysql.h)
CPPFLAGS="$old_CPPFLAGS"
AC_MSG_CHECKING(for MySQL libraries at)
AC_MSG_RESULT($MYSQL_LIBS)
dnl check for errmsg.h, which isn't installed by some versions of 3.21
old_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $MYSQL_INCLUDE"
AC_CHECK_HEADERS(errmsg.h mysql.h)
CPPFLAGS="$old_CPPFLAGS"
AC_DEFINE([HAVE_MYSQL], [1], [mysql support])
AC_DEFINE([HAVE_MYSQL], [1], [mysql support])
else
AC_MSG_RESULT(no)
fi
else
AC_MSG_RESULT(no)
fi

Loading…
Cancel
Save