cvs: php4 /ext/msql/ Makefile.in config.m4

sas Wed May 24 01:24:05 2000 EDT Modified files: /php4/ext/msql Makefile.in config.m4 Log: Make msql extension buildable as shared module. Index: php4/ext/msql/Makefile.in diff -u php4/ext/msql/Makefile.in:1.6 php4/ext/msql/Makefile.in:1.7 --- php4/ext/msql/Makefile.in:1.6 Tue May 2 00:38:30 2000 +++ php4/ext/msql/Makefile.in Wed May 24 01:24:04 2000 @@ -1,5 +1,7 @@ LTLIBRARY_NAME = libmsql.la LTLIBRARY_SOURCES = php_msql.c +LTLIBRARY_SHARED_NAME = msql.la +LTLIBRARY_SHARED_LIBADD = $(MSQL_SHARED_LIBADD) include $(top_srcdir)/build/dynlib.mk Index: php4/ext/msql/config.m4 diff -u php4/ext/msql/config.m4:1.6 php4/ext/msql/config.m4:1.7 --- php4/ext/msql/config.m4:1.6 Thu Dec 30 05:52:08 1999 +++ php4/ext/msql/config.m4 Wed May 24 01:24:04 2000 @@ -1,9 +1,9 @@ -dnl $Id: config.m4,v 1.6 1999/12/30 04:52:08 sas Exp $ +dnl $Id: config.m4,v 1.7 2000/05/23 23:24:04 sas Exp $ dnl dnl Test mSQL version by checking if msql.h has "IDX_TYPE" defined. dnl -AC_DEFUN(AC_MSQL_VERSION,[ +AC_DEFUN(PHP_MSQL_VERSION,[ AC_MSG_CHECKING([mSQL version]) ac_php_oldcflags=$CFLAGS CFLAGS="$INCLUDES $CFLAGS" @@ -19,28 +19,22 @@ AC_MSG_RESULT($MSQL_VERSION) ]) -AC_MSG_CHECKING(for mSQL support) -AC_ARG_WITH(msql, +PHP_ARG_WITH(msql,for mSQL support, [ --with-msql[=DIR] Include mSQL support. DIR is the mSQL base - install directory, defaults to /usr/local/Hughes.], -[ - if test "$withval" != "no"; then - if test "$withval" = "yes"; then + install directory, defaults to /usr/local/Hughes.]) + + if test "$PHP_MSQL" != "no"; then + if test "$PHP_MSQL" = "yes"; then MSQL_INCDIR=/usr/local/Hughes/include MSQL_LIBDIR=/usr/local/Hughes/lib else - MSQL_INCDIR=$withval/include - MSQL_LIBDIR=$withval/lib + MSQL_INCDIR=$PHP_MSQL/include + MSQL_LIBDIR=$PHP_MSQL/lib fi - AC_ADD_LIBRARY_WITH_PATH(msql, $MSQL_LIBDIR) + AC_ADD_LIBRARY_WITH_PATH(msql, $MSQL_LIBDIR, MSQL_SHARED_LIBADD) AC_ADD_INCLUDE($MSQL_INCDIR) AC_DEFINE(HAVE_MSQL,1,[ ]) - AC_MSG_RESULT(yes) - PHP_EXTENSION(msql) - AC_MSQL_VERSION - else - AC_MSG_RESULT(no) + PHP_SUBST(MSQL_SHARED_LIBADD) + PHP_EXTENSION(msql,$ext_shared) + PHP_MSQL_VERSION fi -],[ - AC_MSG_RESULT(no) -])