cvs: /php4/ext/mysql Makefile.am config.m4 mysql.c

gorgo Fri Sep 3 13:13:53 1999 EDT Modified files: /php4/ext/mysql Makefile.am config.m4 mysql.c Log: Enabled shared build of mysql module Index: php4/ext/mysql/Makefile.am diff -u php4/ext/mysql/Makefile.am:1.1 php4/ext/mysql/Makefile.am:1.2 --- php4/ext/mysql/Makefile.am:1.1 Wed Apr 21 17:22:52 1999 +++ php4/ext/mysql/Makefile.am Fri Sep 3 13:13:53 1999 @@ -1,6 +1,15 @@ -# $Id: Makefile.am,v 1.1 1999/04/21 21:22:52 ssb Exp $ +# $Id: Makefile.am,v 1.2 1999/09/03 17:13:53 gorgo Exp $ -INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_mysql.a -libphpext_mysql_a_SOURCES=mysql.c +phplibdir=$(libdir)/php +SRC=mysql.c +INCLUDES=@INCLUDES@ @MYSQL_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/libzend +noinst_LIBRARIES=@MYSQL_STATIC@ +EXTRA_LIBRARIES=libphpext_mysql.a +libphpext_mysql_a_SOURCES=$(SRC) +phplib_LTLIBRARIES=@MYSQL_SHARED@ +EXTRA_LTLIBRARIES=mysql.la +mysql_la_SOURCES=$(SRC) +mysql_la_LIBADD=@MYSQL_LFLAGS@ -lmysqlclient +mysql_la_LDFLAGS=-avoid-version -module -rpath $(phplibdir) +EXTRA_LIBS= Index: php4/ext/mysql/config.m4 diff -u php4/ext/mysql/config.m4:1.8 php4/ext/mysql/config.m4:1.9 --- php4/ext/mysql/config.m4:1.8 Wed Jul 14 15:21:43 1999 +++ php4/ext/mysql/config.m4 Fri Sep 3 13:13:53 1999 @@ -1,16 +1,35 @@ -dnl $Id: config.m4,v 1.8 1999/07/14 19:21:43 rasmus Exp $ +dnl $Id: config.m4,v 1.9 1999/09/03 17:13:53 gorgo Exp $ AC_MSG_CHECKING(for MySQL support) AC_ARG_WITH(mysql, [ --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base install directory, defaults to searching through - a number of common places for the MySQL files.], + a number of common places for the MySQL files. + Set DIR to "shared" to build as a dl, or "shared,DIR" + to build as a dl and still specify DIR.], [ + case $withval in + shared) + shared=yes + withval=yes + ;; + shared,*) + shared=yes + withval=echo $withval | sed -e 's/^shared,//' + ;; + *) + shared=no + ;; + esac if test "$withval" != "no"; then if test "$withval" = "yes"; then if test -f /usr/include/mysql/mysql.h; then MYSQL_INCDIR=/usr/include/mysql - MYSQL_LIBDIR=/usr/lib/mysql + if test -d /usr/lib/mysql; then + MYSQL_LIBDIR=/usr/lib/mysql + else + MYSQL_LIBDIR=/usr/lib + fi elif test -f /usr/include/mysql.h; then MYSQL_INCDIR=/usr/include MYSQL_LIBDIR=/usr/lib @@ -42,11 +61,17 @@ MYSQL_INCLUDE=-I$MYSQL_INCDIR AC_DEFINE(HAVE_MYSQL) - AC_MSG_RESULT(yes) - - AC_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIBDIR) - AC_ADD_INCLUDE($MYSQL_INCDIR) - PHP_EXTENSION(mysql) + if test "$shared" = "yes"; then + AC_MSG_RESULT(yes (shared)) + MYSQL_LFLAGS="-L$MYSQL_LIBDIR" + MYSQL_SHARED="mysql.la" + else + AC_MSG_RESULT(yes (static)) + AC_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIBDIR) + AC_ADD_INCLUDE($MYSQL_INCDIR) + MYSQL_STATIC="libphpext_mysql.a" + fi + PHP_EXTENSION(mysql, $shared) dnl check for errmsg.h, which isn't installed by some versions of 3.21 old_CPPFLAGS="$CPPFLAGS" @@ -60,3 +85,7 @@ ],[ AC_MSG_RESULT(no) ]) +AC_SUBST(MYSQL_STATIC) +AC_SUBST(MYSQL_SHARED) +AC_SUBST(MYSQL_INCLUDE) +AC_SUBST(MYSQL_LFLAGS) Index: php4/ext/mysql/mysql.c diff -u php4/ext/mysql/mysql.c:1.20 php4/ext/mysql/mysql.c:1.21 --- php4/ext/mysql/mysql.c:1.20 Tue Aug 17 18:06:55 1999 +++ php4/ext/mysql/mysql.c Fri Sep 3 13:13:53 1999 @@ -16,13 +16,17 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysql.c,v 1.20 1999/08/17 22:06:55 zeev Exp $ */ +/* $Id: mysql.c,v 1.21 1999/09/03 17:13:53 gorgo Exp $ */ /* TODO: * * ? Safe mode implementation */ + +#ifdef PIC +# define COMPILE_DL 1 +#endif #if COMPILE_DL #include "dl/phpdl.h"