Make mcrypt buildable as shared module

diff --git a/ext/mcrypt/Makefile.in b/ext/mcrypt/Makefile.in
index 8eaf83ae22f646438fa13880bba9517828974c72..5212cc69b701c25f5ec34230cac51583a47f9118 100644 (file)
--- a/ext/mcrypt/Makefile.in
+++ b/ext/mcrypt/Makefile.in
@@ -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

diff --git a/ext/mcrypt/config.m4 b/ext/mcrypt/config.m4
index 7bd7c7314dea45a216e1e741ae8a32f11405fdc6..5dcfc33a1b4cdb84bac6c3fe31c633d9e0de9bcd 100644 (file)
--- a/ext/mcrypt/config.m4
+++ b/ext/mcrypt/config.m4
@@ -18,9 +18,14 @@ if test "$PHP_MCRYPT" != "no"; then
   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

diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c
index aa45f6e413b6828f697fba6a7763eeeb185b79eb..fba013cd37c033d6202a9cdac2d156d046aa9af6 100644 (file)
--- a/ext/mcrypt/mcrypt.c
+++ b/ext/mcrypt/mcrypt.c
@@ -50,6 +50,10 @@ zend_module_entry mcrypt_module_entry = {
        STANDARD_MODULE_PROPERTIES,
 };
 
+#ifdef COMPILE_DL_MCRYPT
+ZEND_GET_MODULE(mcrypt)
+#endif
+
 #if 0
 
 typedef struct mcrypt_global_struct {