cvs: /php4/ext/dba Makefile.in config.m4 dba.c

sas Tue May 2 05:38:26 2000 EDT Modified files: /php4/ext/dba Makefile.in config.m4 dba.c Log: Make dba compilable as shared module Index: php4/ext/dba/Makefile.in diff -u php4/ext/dba/Makefile.in:1.7 php4/ext/dba/Makefile.in:1.8 --- php4/ext/dba/Makefile.in:1.7 Tue May 2 00:38:27 2000 +++ php4/ext/dba/Makefile.in Tue May 2 05:38:26 2000 @@ -2,5 +2,7 @@ LTLIBRARY_NAME = libdba.la LTLIBRARY_SOURCES = dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c \ dba_ndbm.c dba_db3.c +LTLIBRARY_SHARED_NAME = dba.la +LTLIBRARY_SHARED_LIBADD = $(DBA_SHARED_LIBADD) include $(top_srcdir)/build/dynlib.mk Index: php4/ext/dba/config.m4 diff -u php4/ext/dba/config.m4:1.7 php4/ext/dba/config.m4:1.8 --- php4/ext/dba/config.m4:1.7 Tue Mar 28 00:40:27 2000 +++ php4/ext/dba/config.m4 Tue May 2 05:38:26 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.7 2000/03/27 22:40:27 sas Exp $ +dnl $Id: config.m4,v 1.8 2000/05/02 03:38:26 sas Exp $ dnl config.m4 for extension dba dnl don't forget to call PHP_EXTENSION(dba) @@ -33,7 +33,15 @@ dnl Attach THIS_x to DBA_x AC_DEFUN(AC_DBA_STD_ATTACH,[ AC_ADD_INCLUDE($THIS_INCLUDE) - AC_ADD_LIBRARY_WITH_PATH($THIS_LIBS, $THIS_LFLAGS) + if test "$ext_shared" = "yes"; then + if test -z "$THIS_LFLAGS"; then + DBA_SHARED_LIBADD="$DBA_SHARED_LIBADD -l$THIS_LIBS" + else + DBA_SHARED_LIBADD="$DBA_SHARED_LIBADD -R$THIS_LFLAGS -L$THIS_LFLAGS -l$THIS_LIBS" + fi + else + AC_ADD_LIBRARY_WITH_PATH($THIS_LIBS, $THIS_LFLAGS) + fi THIS_INCLUDE="" THIS_LIBS="" @@ -51,8 +59,9 @@ fi THIS_RESULT="" ]) - +PHP_ARG_ENABLE(dba,whether to enable DBA, +[ --enable-dba=shared Build DBA as a shared module]) AC_ARG_WITH(gdbm, [ --with-gdbm[=DIR] Include GDBM support],[ @@ -230,7 +239,8 @@ if test "$HAVE_DBA" = "1"; then AC_MSG_RESULT(yes) AC_DEFINE(HAVE_DBA, 1, [ ]) - PHP_EXTENSION(dba) + PHP_EXTENSION(dba,$ext_shared) + PHP_SUBST(DBA_SHARED_LIBADD) else AC_MSG_RESULT(no) AC_DEFINE(HAVE_DBA, 0, [ ]) Index: php4/ext/dba/dba.c diff -u php4/ext/dba/dba.c:1.15 php4/ext/dba/dba.c:1.16 --- php4/ext/dba/dba.c:1.15 Thu Apr 6 14:26:16 2000 +++ php4/ext/dba/dba.c Tue May 2 05:38:26 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba.c,v 1.15 2000/04/06 12:26:16 riffraff Exp $ */ +/* $Id: dba.c,v 1.16 2000/05/02 03:38:26 sas Exp $ */ #include "php.h" @@ -72,6 +72,10 @@ STANDARD_MODULE_PROPERTIES }; +#ifdef COMPILE_DL_DBA +ZEND_GET_MODULE(dba) +#endif + typedef struct dba_handler { char *name; int (*open)(dba_info *); @@ -202,7 +206,7 @@ dba_handler *hptr; php_info_print_box_start(0); - PUTS("V1 ($Id: dba.c,v 1.15 2000/04/06 12:26:16 riffraff Exp $)"); + PUTS("V1 ($Id: dba.c,v 1.16 2000/05/02 03:38:26 sas Exp $)"); for(hptr = handler; hptr->name; hptr++) { PUTS(" "); PUTS(hptr->name);