mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 03:17:13 +00:00
69 lines
2.5 KiB
Diff
69 lines
2.5 KiB
Diff
|
diff -ru php-5.4.14/configure php-5.4.14-new/configure
|
||
|
|
--- php-5.4.14/configure 2013-04-10 09:53:26.000000000 +0200
|
||
|
|
+++ php-5.4.14-new/configure 2013-04-22 17:13:55.039043622 +0200
|
||
|
|
@@ -6513,7 +6513,7 @@
|
||
|
|
|
||
|
|
case $host_alias in
|
||
|
|
*aix*)
|
||
|
|
- APXS_LIBEXECDIR=`$APXS -q LIBEXECDIR`
|
||
|
|
+ APXS_LIBEXECDIR="$prefix/modules"
|
||
|
|
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp"
|
||
|
|
PHP_AIX_LDFLAGS="-Wl,-brtl"
|
||
|
|
build_type=shared
|
||
|
|
@@ -6706,7 +6706,7 @@
|
||
|
|
if test "$?" != "0"; then
|
||
|
|
APACHE_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option
|
||
|
|
else
|
||
|
|
- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
|
||
|
|
+ APXS_LIBEXECDIR="$prefix/modules"
|
||
|
|
if test -z `$APXS -q SYSCONFDIR`; then
|
||
|
|
APACHE_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
|
||
|
|
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
|
||
|
|
@@ -7909,7 +7909,7 @@
|
||
|
|
{ (exit 1); exit 1; }; }
|
||
|
|
fi
|
||
|
|
|
||
|
|
- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
|
||
|
|
+ APXS_LIBEXECDIR="$prefix/modules"
|
||
|
|
if test -z `$APXS -q SYSCONFDIR`; then
|
||
|
|
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
|
||
|
|
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
|
||
|
|
@@ -8779,7 +8779,7 @@
|
||
|
|
{ (exit 1); exit 1; }; }
|
||
|
|
fi
|
||
|
|
|
||
|
|
- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
|
||
|
|
+ APXS_LIBEXECDIR="$prefix/modules"
|
||
|
|
if test -z `$APXS -q SYSCONFDIR`; then
|
||
|
|
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
|
||
|
|
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
|
||
|
|
@@ -9634,7 +9634,7 @@
|
||
|
|
|
||
|
|
case $host_alias in
|
||
|
|
*aix*)
|
||
|
|
- APXS_LIBEXECDIR=`$APXS -q LIBEXECDIR`
|
||
|
|
+ APXS_LIBEXECDIR="$prefix/modules"
|
||
|
|
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp"
|
||
|
|
PHP_AIX_LDFLAGS="-Wl,-brtl"
|
||
|
|
build_type=shared
|
||
|
|
@@ -9827,7 +9827,7 @@
|
||
|
|
if test "$?" != "0"; then
|
||
|
|
APACHE_HOOKS_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option
|
||
|
|
else
|
||
|
|
- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
|
||
|
|
+ APXS_LIBEXECDIR="$prefix/modules"
|
||
|
|
if test -z `$APXS -q SYSCONFDIR`; then
|
||
|
|
APACHE_HOOKS_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
|
||
|
|
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
|
||
|
|
@@ -59657,9 +59657,7 @@
|
||
|
|
|
||
|
|
|
||
|
|
if test "$PHP_GETTEXT" != "no"; then
|
||
|
|
- for i in $PHP_GETTEXT /usr/local /usr; do
|
||
|
|
- test -r $i/include/libintl.h && GETTEXT_DIR=$i && break
|
||
|
|
- done
|
||
|
|
+ GETTEXT_DIR=$PHP_GETTEXT
|
||
|
|
|
||
|
|
if test -z "$GETTEXT_DIR"; then
|
||
|
|
{ { $as_echo "$as_me:$LINENO: error: Cannot locate header file libintl.h" >&5
|