update config.m4 for libmonetra 4.0 compatability.

Library no longer has MCVE_ symbols, the header file has #define\'s to
convert MCVE_ -> M_ to reflect the Monetra name change from MCVE.
More updates to follow.

diff --git a/ext/mcve/config.m4 b/ext/mcve/config.m4
index ba99e500ab94d73be87c47d36a0506cd72aa65f3..d6a52415733b2f351857b10093939ab4bc2dac57 100644 (file)
--- a/ext/mcve/config.m4
+++ b/ext/mcve/config.m4
@@ -1,7 +1,7 @@
 dnl config.m4 for PHP4 MCVE Extension
 
 PHP_ARG_WITH(mcve, for MCVE support,
-[  --with-mcve[=DIR]       Include MCVE support. libmcve >= 3.2.2 required])
+[  --with-mcve[=DIR]       Include MCVE support. libmcve >= 3.2.2 or libmonetra >= 4.0 required])
 
 PHP_ARG_WITH(openssl-dir,OpenSSL dir for MCVE,
 [  --with-openssl-dir[=DIR]  MCVE: openssl install prefix.], no, no)
@@ -53,16 +53,41 @@ yes
   PHP_ADD_INCLUDE($MCVE_DIR/include)
   PHP_ADD_LIBRARY_WITH_PATH(mcve, $MCVE_DIR/lib, MCVE_SHARED_LIBADD)
 
-  dnl Build test
+  dnl Build test. Check for libmcve or libmonetra
+  dnl libmonetra_compat.h handle's MCVE_ -> M_ conversion
+  dnl so it is API compatible
+
+  has_mcve=0
+  dnl check for libmcve
   PHP_CHECK_LIBRARY(mcve, MCVE_DestroyEngine,
   [
-    AC_DEFINE(HAVE_MCVE, 1, [ ])
+    has_mcve=1
   ], [
-    AC_MSG_ERROR([MCVE: Sanity check failed. Please check config.log for more information.])
+    has_mcve=0
   ], [
     $MCVE_SHARED_LIBADD
   ])
 
+  dnl check for libmonetra if no proper libmcve
+  dnl symlink named libmcve is created to libmonetra
+  dnl during libmonetra install, so this is valid
+  if test "$has_mcve" = "0" ; then
+    PHP_CHECK_LIBRARY(mcve, M_DestroyEngine,
+    [
+      has_mcve=1
+    ], [
+      has_mcve=0
+    ], [
+      $MCVE_SHARED_LIBADD
+    ])
+  fi
+
+  if test "$has_mcve" = "1" ; then
+    AC_DEFINE(HAVE_MCVE, 1, [ ])
+  else
+    AC_MSG_ERROR([MCVE: Sanity check failed. Please check config.log for more information.])
+  fi
+
   PHP_NEW_EXTENSION(mcve, mcve.c, $ext_shared)
   PHP_SUBST(MCVE_SHARED_LIBADD)
 fi