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

sas Tue May 2 05:29:29 2000 EDT Modified files: /php4/ext/mcrypt Makefile.in config.m4 mcrypt.c Log: Make mcrypt buildable as shared module Index: php4/ext/mcrypt/Makefile.in diff -u php4/ext/mcrypt/Makefile.in:1.6 php4/ext/mcrypt/Makefile.in:1.7 --- php4/ext/mcrypt/Makefile.in:1.6 Tue May 2 00:38:29 2000 +++ php4/ext/mcrypt/Makefile.in Tue May 2 05:29:28 2000 @@ -1,5 +1,7 @@ LTLIBRARY_NAME = libmcrypt.la LTLIBRARY_SOURCES = mcrypt.c +LTLIBRARY_SHARED_NAME = mcrypt.la +LTLIBRARY_SHARED_LIBADD = $(MCRYPT_SHARED_LIBADD) include $(top_srcdir)/build/dynlib.mk Index: php4/ext/mcrypt/config.m4 diff -u php4/ext/mcrypt/config.m4:1.7 php4/ext/mcrypt/config.m4:1.8 --- php4/ext/mcrypt/config.m4:1.7 Tue Mar 28 01:43:00 2000 +++ php4/ext/mcrypt/config.m4 Tue May 2 05:29:28 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:28 sas Exp $ dnl config.m4 for extension mcrypt dnl don't forget to call PHP_EXTENSION(mcrypt) @@ -18,9 +18,14 @@ fi AC_ADD_INCLUDE($MCRYPT_DIR/include) - AC_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/lib) + if test "$ext_shared" = "yes"; then + MCRYPT_SHARED_LIBADD="-R$MCRYPT_DIR/lib -L$MCRYPT_DIR/lib -lmcrypt" + PHP_SUBST(MCRYPT_SHARED_LIBADD) + else + AC_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/lib) + fi AC_DEFINE(HAVE_LIBMCRYPT,1,[ ]) - PHP_EXTENSION(mcrypt) + PHP_EXTENSION(mcrypt, $ext_shared) fi Index: php4/ext/mcrypt/mcrypt.c diff -u php4/ext/mcrypt/mcrypt.c:1.25 php4/ext/mcrypt/mcrypt.c:1.26 --- php4/ext/mcrypt/mcrypt.c:1.25 Sun Feb 20 00:40:05 2000 +++ php4/ext/mcrypt/mcrypt.c Tue May 2 05:29:28 2000 @@ -50,6 +50,10 @@ STANDARD_MODULE_PROPERTIES, }; +#ifdef COMPILE_DL_MCRYPT +ZEND_GET_MODULE(mcrypt) +#endif + #if 0 typedef struct mcrypt_global_struct {