diff options
| author | Sascha Schumann <sas@php.net> | 1999-12-30 02:59:53 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 1999-12-30 02:59:53 +0000 |
| commit | f2f8d38efa3ccbaa05affaf8fcab24786ef452de (patch) | |
| tree | c546807d61a77a191f89056212a4c40c63f0e83b /ext/mysql/config.m4 | |
| parent | 6bf3529919cf60389797a107cab16c826df3e68f (diff) | |
| download | php-git-f2f8d38efa3ccbaa05affaf8fcab24786ef452de.tar.gz | |
Integration of -ng changes. Changes:
- added support for externally built modules,
- improved support for in-tree shared modules,
- fixed diversion bugs,
- configure displays some informative messages,
- faster static build
(libtool isn't used anymore for compiling non-PIC objects),
- dependencies comparable to automake's without requiring GNU make or GCC,
- working make clean for non-GNU makes.
Diffstat (limited to 'ext/mysql/config.m4')
| -rw-r--r-- | ext/mysql/config.m4 | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4 index e900835359..71fa33d502 100644 --- a/ext/mysql/config.m4 +++ b/ext/mysql/config.m4 @@ -48,7 +48,7 @@ AC_ARG_WITH(mysql, fi MYSQL_INCLUDE=-I$MYSQL_INCDIR - AC_DEFINE(HAVE_MYSQL) + AC_DEFINE(HAVE_MYSQL,1,[Whether you want MySQL]) if test "$shared" = "yes"; then AC_MSG_RESULT(yes (shared)) MYSQL_LFLAGS="-L$MYSQL_LIBDIR" @@ -56,9 +56,9 @@ AC_ARG_WITH(mysql, else AC_MSG_RESULT(yes (static)) AC_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIBDIR) - AC_ADD_INCLUDE($MYSQL_INCDIR) MYSQL_STATIC="libphpext_mysql.la" fi + AC_ADD_INCLUDE($MYSQL_INCDIR) PHP_EXTENSION(mysql, $shared) dnl check for errmsg.h, which isn't installed by some versions of 3.21 @@ -68,12 +68,9 @@ AC_ARG_WITH(mysql, CPPFLAGS="$old_CPPFLAGS" else AC_MSG_RESULT(no) - AC_DEFINE(HAVE_MYSQL, 0) + AC_DEFINE(HAVE_MYSQL, 0,[Whether you want MySQL]) fi ],[ AC_MSG_RESULT(no) ]) -AC_SUBST(MYSQL_STATIC) -AC_SUBST(MYSQL_SHARED) -AC_SUBST(MYSQL_INCLUDE) -AC_SUBST(MYSQL_LFLAGS) +PHP_SUBST(MYSQL_LFLAGS) |