Stop checking for ext/apc in php 7

igbinary · Nov 20, 2016 · 121c552 · 121c552
1 parent fe3dc71
commit 121c552
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/config.m4 b/config.m4
@@ -47,7 +47,7 @@ if test "$PHP_IGBINARY" != "no"; then
     apc_inc_path="$phpincludedir"
     AC_MSG_RESULT([APC in $apc_inc_path])
     AC_DEFINE(HAVE_APC_SUPPORT,1,[Whether to enable apc support])
-  elif test -f "${srcdir}/$subdir/apc_serializer.h"; then
+  elif test "$subdir" == src/php5 && test -f "${srcdir}/$subdir/apc_serializer.h"; then
     AC_MSG_RESULT([apc_serializer.h bundled])
     AC_DEFINE(HAVE_APC_SUPPORT,1,[Whether to enable apc support])
     AC_DEFINE(USE_BUNDLED_APC,1,[Whether to use bundled apc includes])

diff --git a/config.w32 b/config.w32
@@ -4,28 +4,33 @@
 ARG_ENABLE("igbinary", "whether to enable igbinary support", "no");
 
 if (PHP_IGBINARY == "yes") {
+  var dll = get_define('PHPDLL');
+  var is_php5 = null != dll.match(/^php5/);
+  var is_php7 = !is_php5 && null != dll.match(/^php7/)
+
   if (CHECK_HEADER_ADD_INCLUDE("apc_serializer.h", "CFLAGS_IGBINARY", "..\\pecl\\apcu;ext\\apcu")) {
     AC_DEFINE('HAVE_APCU_SUPPORT', 1, "Whether to enable apcu support");
     if (!CHECK_HEADER_ADD_INCLUDE("apc_serializer.h", "CFLAGS_IGBINARY", "ext\\apcu")) {
       // Workaround to allow configuring and making apcu and igbinary at the same time.
       // If they aren't available in ext/apcu, expect them in ../pecl/apcu
       AC_DEFINE('HAVE_APCU_HEADERS_IN_PECL', 1, "Whether or not apcu headers exist only in pecl folder")
     }
-  } else if (CHECK_HEADER_ADD_INCLUDE("apc_serializer.h", "CFLAGS_IGBINARY", "..\\pecl\\apc;ext\\apc")) {
+  } else if (is_php5 && CHECK_HEADER_ADD_INCLUDE("apc_serializer.h", "CFLAGS_IGBINARY", "..\\pecl\\apc;ext\\apc")) {
+	// Don't try ext/apc unless this is a php 5 build.
+	// For some reason, the header files still exist for pecl.php.net 7.0 builds.
     AC_DEFINE('HAVE_APC_SUPPORT', 1, 'Whether to enable apc support')
   }
-  var dll = get_define('PHPDLL');
   var old_conf_dir = configure_module_dirname;
   var php_igbinary_src_files;
   var subdir;
 
   /* Copied from solr config.w32 */
   /* XXX tricky job here, override configure_module_dirname, define the basic extension,
      then set it back*/
-  if (null != dll.match(/^php5/)) {
+  if (is_php5) {
     subdir = "src\\php5"
     php_igbinary_src_files = "igbinary.c hash_si.c hash_si_ptr.c"
-  } else if (null != dll.match(/^php7/)) {
+  } else if (is_php7) {
     subdir = "src\\php7";
     php_igbinary_src_files = "igbinary.c hash_si.c hash_si_ptr.c"
   } else {