Merge pull request #9329 from stanley-cheung/php-fix-config-m4

PHP: use a macro to specify extension src dir
8 years ago · 03b22ecbe6
parent 468690fa92 fe71d7fc5f
commit 03b22ecbe6
2 changed files with 6 additions and 6 deletions
--- a/config.m4
+++ b/config.m4
@ -5,9 +5,9 @@ if test "$PHP_GRPC" != "no"; then
  dnl Write more examples of tests here...

  dnl # --with-grpc -> add include path
-  PHP_ADD_INCLUDE(../../grpc/include)
-  PHP_ADD_INCLUDE(../../grpc/src/php/ext/grpc)
-  PHP_ADD_INCLUDE(../../grpc/third_party/boringssl/include)
+  PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/include)
+  PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/src/php/ext/grpc)
+  PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/third_party/boringssl/include)

  LIBS="-lpthread $LIBS"

--- a/templates/config.m4.template
+++ b/templates/config.m4.template
@ -7,9 +7,9 @@
    dnl Write more examples of tests here...

    dnl # --with-grpc -> add include path
-    PHP_ADD_INCLUDE(../../grpc/include)
-    PHP_ADD_INCLUDE(../../grpc/src/php/ext/grpc)
-    PHP_ADD_INCLUDE(../../grpc/third_party/boringssl/include)
+    PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/include)
+    PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/src/php/ext/grpc)
+    PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/third_party/boringssl/include)

    LIBS="-lpthread $LIBS"