From 608a7b4521bc23d52ba00b6d164ab248053891b8 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Wed, 27 Aug 2008 00:03:22 -0700 Subject: 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. --- php/config.m4 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'php') 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"]) -- cgit v1.2.3