diff options
| author | Russ Allbery <rra@stanford.edu> | 2008-09-12 15:36:53 -0700 |
|---|---|---|
| committer | Russ Allbery <rra@stanford.edu> | 2008-09-12 15:36:53 -0700 |
| commit | 3786840efc18999b07ab7d021441c19846e89211 (patch) | |
| tree | 61e0c9632217a9c228c7282f95f130925c9d3168 /php | |
| parent | baeec5b5bba7aab9aba5e05a3c3d5fcbf5848ed1 (diff) | |
Switch to configuring PHP at build time
Handling the PHP directory as an Autoconf subdirectory just doesn't work
with srcdir != builddir builds. The ordering is all wrong. Switch to
running configure at build time, which also has the nice advantage that
we can generate config.m4 with Autoconf and substitute in the correct
link paths.
Diffstat (limited to 'php')
| -rw-r--r-- | php/config.m4.in (renamed from php/config.m4) | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/php/config.m4 b/php/config.m4.in index 1a50fa4..c26d82b 100644 --- a/php/config.m4 +++ b/php/config.m4.in @@ -1,4 +1,4 @@ -dnl remctl PECL extension for PHP configuration +dnl remctl PECL extension for PHP configuration -*- autoconf -*- dnl dnl Provides additional configuration hooks for the PHP module build system. dnl This file is used by the phpize frameowrk. @@ -12,11 +12,9 @@ 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 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. +dnl The @...@ variables are substituted by the top-level configure. Yes, this +dnl is a little odd, but it seems to work. AS_IF([test "$PHP_REMCTL" != no], [PHP_NEW_EXTENSION([remctl], [php_remctl.c], [$ext_shared]) - PHP_ADD_INCLUDE([\${abs_top_srcdir}/..]) - LDFLAGS="$LDFLAGS -L\${top_builddir}/../client/.libs -lremctl"]) + PHP_ADD_INCLUDE([@abs_top_srcdir@]) + LDFLAGS="$LDFLAGS -L@abs_top_builddir@/client/.libs -lremctl"]) |