Magellan Linux

Annotation of /trunk/php/patches/php-5.2.4-multilib.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1711 - (hide annotations) (download)
Fri Mar 23 13:03:30 2012 UTC (12 years, 7 months ago) by niro
File size: 909 byte(s)
-php5 -> php move
1 niro 347 diff -Naur php-5.2.4/acinclude.m4 php-5.2.4-magellan/acinclude.m4
2     --- php-5.2.4/acinclude.m4 2007-08-20 16:28:45.000000000 +0200
3     +++ php-5.2.4-magellan/acinclude.m4 2007-09-07 20:45:44.000000000 +0200
4     @@ -444,7 +444,7 @@
5     dnl Adds a path to linkpath/runpath (LDFLAGS)
6     dnl
7     AC_DEFUN([PHP_ADD_LIBPATH],[
8     - if test "$1" != "/usr/$PHP_LIBDIR" && test "$1" != "/usr/lib"; then
9     + if test "$1" != "/usr/$PHP_LIBDIR" && test "$1" != "/usr/lib" && test "$1" != "/usr/lib64"; then
10     PHP_EXPAND_PATH($1, ai_p)
11     ifelse([$2],,[
12     _PHP_ADD_LIBPATH_GLOBAL([$ai_p])
13     @@ -2037,7 +2037,7 @@
14     dnl Search for the sendmail binary
15     dnl
16     AC_DEFUN([PHP_PROG_SENDMAIL], [
17     - PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib
18     + PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib:/usr/lib64
19     AC_PATH_PROG(PROG_SENDMAIL, sendmail,[], $PATH:$PHP_ALT_PATH)
20     PHP_SUBST(PROG_SENDMAIL)
21     ])