diff options
Diffstat (limited to 'lang/php5/files/patch-configure')
| -rw-r--r-- | lang/php5/files/patch-configure | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/lang/php5/files/patch-configure b/lang/php5/files/patch-configure index 4890f31005d6..2856115cce8e 100644 --- a/lang/php5/files/patch-configure +++ b/lang/php5/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon Dec 22 10:01:56 2003 -+++ configure Sat Jan 24 14:08:52 2004 -@@ -622,6 +622,8 @@ +--- configure.orig Fri Mar 19 11:01:07 2004 ++++ configure Fri Mar 19 11:10:11 2004 +@@ -624,6 +624,8 @@ ac_help="$ac_help --enable-gd-jis-conv GD: Enable JIS-mapped Japanese font support." ac_help="$ac_help @@ -9,7 +9,7 @@ --with-gettext[=DIR] Include GNU gettext support." ac_help="$ac_help --with-gmp[=DIR] Include GNU MP support" -@@ -23795,6 +23797,10 @@ +@@ -24057,6 +24059,10 @@ THIS_PREFIX=$i THIS_INCLUDE=$i/db4/db.h break @@ -20,16 +20,16 @@ elif test -f "$i/include/db4/db.h"; then THIS_PREFIX=$i THIS_INCLUDE=$i/include/db4/db.h -@@ -23814,7 +23820,7 @@ +@@ -24076,7 +24082,7 @@ fi done -- for LIB in db-4.1 db-4.0 db-4 db4 db; do -+ for LIB in db-4.1 db-4.0 db-4 db41 db4 db; do +- for LIB in db-4.2 db-4.1 db-4.0 db-4 db4 db; do ++ for LIB in db-4.2 db-4.1 db-4.0 db-4 db41 db4 db; do if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then old_LDFLAGS=$LDFLAGS -@@ -29640,6 +29646,31 @@ +@@ -30047,6 +30053,31 @@ @@ -61,7 +61,7 @@ -@@ -29792,7 +29823,7 @@ +@@ -30199,7 +30230,7 @@ libgd/gd_io_file.c libgd/gd_ss.c libgd/gd_io_ss.c libgd/gd_png.c libgd/gd_jpeg.c \ libgd/gdxpm.c libgd/gdfontt.c libgd/gdfonts.c libgd/gdfontmb.c libgd/gdfontl.c \ libgd/gdfontg.c libgd/gdtables.c libgd/gdft.c libgd/gdcache.c libgd/gdkanji.c \ @@ -70,7 +70,7 @@ libgd/xbm.c" for ac_func in fabsf floorf -@@ -29867,6 +29898,11 @@ +@@ -30274,6 +30305,11 @@ fi @@ -82,7 +82,7 @@ if test "$PHP_JPEG_DIR" != "no"; then for i in $PHP_JPEG_DIR /usr/local /usr; do -@@ -31580,6 +31616,9 @@ +@@ -31987,6 +32023,9 @@ cat >> confdefs.h <<\EOF #define HAVE_GD_BUNDLED 1 @@ -92,7 +92,7 @@ EOF cat >> confdefs.h <<\EOF -@@ -31634,6 +31673,14 @@ +@@ -32041,6 +32080,14 @@ GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208" fi @@ -107,7 +107,7 @@ else if test "$PHP_GD" != "no"; then -@@ -35985,6 +36032,137 @@ +@@ -36392,6 +36439,137 @@ esac done @@ -243,9 +243,9 @@ + done + echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6 - echo "configure:35990: checking for gdCacheCreate in -lgd" >&5 + echo "configure:36397: checking for gdCacheCreate in -lgd" >&5 ac_lib_var=`echo gd'_'gdCacheCreate | sed 'y%./+-%__p_%'` -@@ -60181,6 +60359,102 @@ +@@ -61441,6 +61619,102 @@ if test "$ext_shared" = "yes"; then @@ -348,7 +348,7 @@ ORACLE_SHARED_LIBADD="-lnlsrtl3 $ORACLE_SHARED_LIBADD" if test -n "$ORACLE_DIR/lib"; then -@@ -79683,29 +79957,6 @@ +@@ -82018,29 +82292,6 @@ else @@ -378,7 +378,7 @@ case ct in c|c_r|pthread*) ;; *) -@@ -79729,52 +79980,7 @@ +@@ -82064,52 +82315,7 @@ @@ -432,7 +432,7 @@ save_old_LDFLAGS=$LDFLAGS -@@ -79909,38 +80115,6 @@ +@@ -82244,38 +82450,6 @@ c|c_r|pthread*) ;; *) LIBS="-ltcl $LIBS" |