pyrox.dev
1diff -ru php-5.4.14/configure php-5.4.14-new/configure
2--- php-5.4.14/configure 2013-04-10 09:53:26.000000000 +0200
3+++ php-5.4.14-new/configure 2013-04-22 17:13:55.039043622 +0200
4@@ -6513,7 +6513,7 @@
5
6 case $host_alias in
7 *aix*)
8- APXS_LIBEXECDIR=`$APXS -q LIBEXECDIR`
9+ APXS_LIBEXECDIR="$prefix/modules"
10 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp"
11 PHP_AIX_LDFLAGS="-Wl,-brtl"
12 build_type=shared
13@@ -6706,7 +6706,7 @@
14 if test "$?" != "0"; then
15 APACHE_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option
16 else
17- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
18+ APXS_LIBEXECDIR="$prefix/modules"
19 if test -z `$APXS -q SYSCONFDIR`; then
20 APACHE_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
21 $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
22@@ -7909,7 +7909,7 @@
23 { (exit 1); exit 1; }; }
24 fi
25
26- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
27+ APXS_LIBEXECDIR="$prefix/modules"
28 if test -z `$APXS -q SYSCONFDIR`; then
29 INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
30 $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
31@@ -8779,7 +8779,7 @@
32 { (exit 1); exit 1; }; }
33 fi
34
35- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
36+ APXS_LIBEXECDIR="$prefix/modules"
37 if test -z `$APXS -q SYSCONFDIR`; then
38 INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
39 $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
40@@ -9634,7 +9634,7 @@
41
42 case $host_alias in
43 *aix*)
44- APXS_LIBEXECDIR=`$APXS -q LIBEXECDIR`
45+ APXS_LIBEXECDIR="$prefix/modules"
46 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp"
47 PHP_AIX_LDFLAGS="-Wl,-brtl"
48 build_type=shared
49@@ -9827,7 +9827,7 @@
50 if test "$?" != "0"; then
51 APACHE_HOOKS_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option
52 else
53- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
54+ APXS_LIBEXECDIR="$prefix/modules"
55 if test -z `$APXS -q SYSCONFDIR`; then
56 APACHE_HOOKS_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
57 $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
58@@ -59657,9 +59657,7 @@
59
60
61 if test "$PHP_GETTEXT" != "no"; then
62- for i in $PHP_GETTEXT /usr/local /usr; do
63- test -r $i/include/libintl.h && GETTEXT_DIR=$i && break
64- done
65+ GETTEXT_DIR=$PHP_GETTEXT
66
67 if test -z "$GETTEXT_DIR"; then
68 { { $as_echo "$as_me:$LINENO: error: Cannot locate header file libintl.h" >&5