commit bc29d801594989b6cb6093ecff9ad78f31223e63
author Craig Tiller <ctiller@google.com> Fri Jan 16 14:55:49 2015 -0800
committer Craig Tiller <ctiller@google.com> Fri Jan 16 14:55:49 2015 -0800
tree d4373b188a26d3cc14d03e296eb099c2bb6cbcc5
parent c80530920b3a955f8ff410a2b8d6322602916008

Better GRPC_LIBDIR config

src/php/ext/grpc/config.m4

diff --git a/src/php/ext/grpc/config.m4 b/src/php/ext/grpc/config.m4
index 7652ca7..27c6778 100755
--- a/src/php/ext/grpc/config.m4
+++ b/src/php/ext/grpc/config.m4
@@ -38,11 +38,7 @@
   PHP_ADD_LIBRARY(rt,,GRPC_SHARED_LIBADD)
   PHP_ADD_LIBRARY(rt)
 
-  if test -e $GRPC_DIR/libs/opt; then
-    GRPC_LIBDIR=$GRPC_DIR/libs/opt
-  else
-    GRPC_LIBDIR=$GRPC_DIR/lib
-  fi
+  GRPC_LIBDIR=$GRPC_DIR/${GRPC_LIB_SUBDIR-lib}
 
   PHP_ADD_LIBPATH($GRPC_LIBDIR)
 

tools/run_tests/build_php.sh

diff --git a/tools/run_tests/build_php.sh b/tools/run_tests/build_php.sh
index de89974..6841656 100755
--- a/tools/run_tests/build_php.sh
+++ b/tools/run_tests/build_php.sh
@@ -6,6 +6,7 @@
 cd $(dirname $0)/../..
 
 root=`pwd`
+export GRPC_LIB_SUBDIR=libs/opt
 
 # make the libraries
 make -j static_c