diff options
| author | Stig Bakken <ssb@php.net> | 1999-04-21 21:34:57 +0000 |
|---|---|---|
| committer | Stig Bakken <ssb@php.net> | 1999-04-21 21:34:57 +0000 |
| commit | 7d013383e9ba148bdc4bf49979028d118262c5b2 (patch) | |
| tree | e8ac37562677632da051383c7dd048eb2e884531 /ext | |
| parent | 5d75ccdcff767d5992e4a9bd2ec1ecb60763cb69 (diff) | |
| download | php-git-7d013383e9ba148bdc4bf49979028d118262c5b2.tar.gz | |
mysql should work again now, can someone with mysql installed test it?
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/mysql/config.m4 | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4 index c36f4b6479..a6ba195a0e 100644 --- a/ext/mysql/config.m4 +++ b/ext/mysql/config.m4 @@ -1,6 +1,4 @@ dnl $Id$ -dnl config.m4 for extension mysql -dnl don't forget to call PHP_EXTENSION(mysql) AC_MSG_CHECKING(for MySQL support) AC_ARG_WITH(mysql, @@ -8,43 +6,45 @@ AC_ARG_WITH(mysql, install directory, defaults to /usr/local.], [ if test "$withval" != "no"; then - if test "$withval" = "yes"; then - MYSQL_INCDIR=/usr/local/include/mysql - MYSQL_LIBDIR=/usr/local/lib/mysql - else - if test -f $withval/include/mysql/mysql.h; then - MYSQL_INCDIR=$withval/include/mysql - MYSQL_LIBDIR=$withval/lib/mysql - elif test -f $withval/include/mysql.h; then - MYSQL_INCDIR=$withval/include - MYSQL_LIBDIR=$withval/lib - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(Invalid MySQL directory - unable to find mysql.h under $withval) - fi - fi + if test "$withval" = "yes"; then + MYSQL_INCDIR=/usr/local/include/mysql + MYSQL_LIBDIR=/usr/local/lib/mysql + else + if test -f $withval/include/mysql/mysql.h; then + MYSQL_INCDIR=$withval/include/mysql + MYSQL_LIBDIR=$withval/lib/mysql + elif test -f $withval/include/mysql.h; then + MYSQL_INCDIR=$withval/include + MYSQL_LIBDIR=$withval/lib + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(Invalid MySQL directory - unable to find mysql.h under $withval) + fi + fi MYSQL_INCLUDE=-I$MYSQL_INCDIR - if test -n "$APXS"; then - MYSQL_LFLAGS="'${apxs_runpath_switch}$MYSQL_LIBDIR' -L$MYSQL_LIBDIR" - else - MYSQL_LFLAGS="${ld_runpath_switch}$MYSQL_LIBDIR -L$MYSQL_LIBDIR" - fi + if test -n "$APXS"; then + MYSQL_LFLAGS="'${apxs_runpath_switch}$MYSQL_LIBDIR' -L$MYSQL_LIBDIR" + else + MYSQL_LFLAGS="${ld_runpath_switch}$MYSQL_LIBDIR -L$MYSQL_LIBDIR" + fi MYSQL_LIBS=-lmysqlclient AC_DEFINE(HAVE_MYSQL) AC_MSG_RESULT(yes) + EXTRA_LIBS="$EXTRA_LIBS $MYSQL_LFLAGS $MYSQL_LIBS" + INCLUDES="$INCLUDES $MYSQL_INCLUDE" + PHP_EXTENSION(mysql) + 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" else - AC_MSG_RESULT(no) - AC_DEFINE(HAVE_MYSQL, 0) + AC_MSG_RESULT(no) + AC_DEFINE(HAVE_MYSQL, 0) fi ],[ AC_MSG_RESULT(no) ]) -EXTRA_LIBS="$EXTRA_LIBS $MYSQL_LFLAGS $MYSQL_LIBS" -INCLUDES="$INCLUDES $MYSQL_INCLUDE" |