diff options
| author | Russ Allbery <rra@stanford.edu> | 2008-08-27 00:03:22 -0700 |
|---|---|---|
| committer | Russ Allbery <rra@stanford.edu> | 2008-08-27 00:03:22 -0700 |
| commit | 608a7b4521bc23d52ba00b6d164ab248053891b8 (patch) | |
| tree | 45ae7b3ade6b4b241f09b6c933155e39827d2a63 /php | |
| parent | 327177640a3535fc35947e8a55d7154032e91ea6 (diff) | |
PHP: fix include and library search paths
Use the right variable for the include search path and also change the
library search path so that we link against the just-built client library
instead of whatever is installed on the system.
Diffstat (limited to 'php')
| -rw-r--r-- | php/config.m4 | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/php/config.m4 b/php/config.m4 index 9ee678c..1a50fa4 100644 --- a/php/config.m4 +++ b/php/config.m4 @@ -12,10 +12,11 @@ dnl See LICENSE for licensing terms. PHP_ARG_ENABLE([remctl], [whether to enable remctl PHP extension], [AC_HELP_STRING([--enable-remctl], [Enable recmtl PHP extension])], [yes]) -dnl The escaping on PHP_ADD_INCLUDE seems to work, and seems to be the only -dnl thing that works, but it makes me nervous. Needs more testing and maybe a -dnl better approach that will still work for builddir != srcdir builds. +dnl The escaping on PHP_ADD_INCLUDE and PHP_ADD_LIBPATH seems to work, and +dnl seems to be the only thing that works, but it makes me nervous. Needs +dnl more testing and maybe a better approach that will still work for builddir +dnl != srcdir builds. AS_IF([test "$PHP_REMCTL" != no], [PHP_NEW_EXTENSION([remctl], [php_remctl.c], [$ext_shared]) - PHP_ADD_INCLUDE([\${ac_top_srcdir}/..]) - LDFLAGS="$LDFLAGS -lremctl"]) + PHP_ADD_INCLUDE([\${abs_top_srcdir}/..]) + LDFLAGS="$LDFLAGS -L\${top_builddir}/../client/.libs -lremctl"]) |