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

sas Tue May 2 05:29:45 2000 EDT Modified files: /php4/ext/mhash Makefile.in config.m4 mhash.c Log: Make mhash builable as shared module Index: php4/ext/mhash/Makefile.in diff -u php4/ext/mhash/Makefile.in:1.6 php4/ext/mhash/Makefile.in:1.7 --- php4/ext/mhash/Makefile.in:1.6 Tue May 2 00:38:29 2000 +++ php4/ext/mhash/Makefile.in Tue May 2 05:29:45 2000 @@ -1,5 +1,7 @@ LTLIBRARY_NAME = libmhash.la LTLIBRARY_SOURCES = mhash.c +LTLIBRARY_SHARED_NAME = mhash.la +LTLIBRARY_SHARED_LIBADD = $(MHASH_SHARED_LIBADD) include $(top_srcdir)/build/dynlib.mk Index: php4/ext/mhash/config.m4 diff -u php4/ext/mhash/config.m4:1.7 php4/ext/mhash/config.m4:1.8 --- php4/ext/mhash/config.m4:1.7 Tue Mar 28 01:43:00 2000 +++ php4/ext/mhash/config.m4 Tue May 2 05:29:45 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.7 2000/03/27 23:43:00 sas Exp $ +dnl $Id: config.m4,v 1.8 2000/05/02 03:29:45 sas Exp $ dnl config.m4 for extension mhash dnl don't forget to call PHP_EXTENSION(mhash) @@ -17,9 +17,14 @@ AC_MSG_ERROR(Please reinstall libmhash - I cannot find mhash.h) fi AC_ADD_INCLUDE($MHASH_DIR/include) - AC_ADD_LIBRARY_WITH_PATH(mhash, $MHASH_DIR/lib) + if test "$ext_shared" = "yes"; then + MHASH_SHARED_LIBADD="-R$MHASH_DIR/lib -L$MHASH_DIR/lib -lmhash" + PHP_SUBST(MHASH_SHARED_LIBADD) + else + AC_ADD_LIBRARY_WITH_PATH(mhash, $MHASH_DIR/lib) + fi AC_DEFINE(HAVE_LIBMHASH,1,[ ]) - PHP_EXTENSION(mhash) + PHP_EXTENSION(mhash, $ext_shared) fi Index: php4/ext/mhash/mhash.c diff -u php4/ext/mhash/mhash.c:1.14 php4/ext/mhash/mhash.c:1.15 --- php4/ext/mhash/mhash.c:1.14 Sun Feb 20 00:40:05 2000 +++ php4/ext/mhash/mhash.c Tue May 2 05:29:45 2000 @@ -43,6 +43,10 @@ STANDARD_MODULE_PROPERTIES, }; +#ifdef COMPILE_DL_MHASH +ZEND_GET_MODULE(mhash) +#endif + #define MHASH_FAILED_MSG "mhash initialization failed" static PHP_MINIT_FUNCTION(mhash)