diff options
Diffstat (limited to 'lang/php53/files/patch-configure')
| -rw-r--r-- | lang/php53/files/patch-configure | 130 |
1 files changed, 104 insertions, 26 deletions
diff --git a/lang/php53/files/patch-configure b/lang/php53/files/patch-configure index 9a84d05c3f1c..10b9fafe78b9 100644 --- a/lang/php53/files/patch-configure +++ b/lang/php53/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Thu Jun 19 00:06:29 2003 -+++ configure Sat Jun 28 16:45:44 2003 -@@ -597,6 +597,8 @@ +--- configure.orig Tue Jul 15 00:32:50 2003 ++++ configure Tue Jul 15 01:44:37 2003 +@@ -620,6 +620,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 Include GNU MP support" -@@ -28224,6 +28226,31 @@ +@@ -29376,6 +29378,31 @@ @@ -41,7 +41,7 @@ -@@ -28248,7 +28275,7 @@ +@@ -29528,7 +29555,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 \ @@ -50,7 +50,7 @@ libgd/xbm.c" for ac_func in fabsf floorf -@@ -28323,6 +28350,11 @@ +@@ -29603,6 +29630,11 @@ fi @@ -62,7 +62,7 @@ if test "$PHP_JPEG_DIR" != "no"; then for i in /usr /usr/local $PHP_JPEG_DIR; do -@@ -29724,6 +29756,9 @@ +@@ -31314,6 +31346,9 @@ cat >> confdefs.h <<\EOF #define HAVE_GD_BUNDLED 1 @@ -72,7 +72,7 @@ EOF cat >> confdefs.h <<\EOF -@@ -29774,6 +29809,14 @@ +@@ -31364,6 +31399,14 @@ GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208" fi @@ -87,10 +87,10 @@ else if test "$PHP_GD" != "no"; then -@@ -32275,6 +32318,60 @@ - - save_old_LDFLAGS=$LDFLAGS - LDFLAGS=" -L$GD_LIB $GD_SHARED_LIBADD $LDFLAGS" +@@ -35713,6 +35756,137 @@ + esac + done + + echo $ac_n "checking for gdImageGifAnimBegin in -lgd""... $ac_c" 1>&6 +echo "configure:32250: checking for gdImageGifAnimBegin in -lgd" >&5 +ac_lib_var=`echo gd'_'gdImageGifAnimBegin | sed 'y%./+-%__p_%'` @@ -126,32 +126,109 @@ +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 -+ ++ + LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared + cat >> confdefs.h <<\EOF +#define HAVE_GD_GIF_ANIM 1 +EOF + -+ ++ +else + echo "$ac_t""no" 1>&6 + + LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared + unset ac_cv_func_gd -+ -+ ++ ++ +fi + -+ ++ + save_old_LDFLAGS=$LDFLAGS -+ LDFLAGS=" -L$GD_LIB $GD_SHARED_LIBADD $LDFLAGS" ++ ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " ++ ++ save_ext_shared=$ext_shared ++ ext_shared=yes ++ ++ for ac_i in $ac_stuff; do ++ case $ac_i in ++ -l*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="$LDFLAGS -l$ac_ii" ++ else ++ ++ ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="$LIBS -l$ac_ii" ++ ;; ++ esac ++ ++ ++ fi ++ ;; ++ esac ++ ++ ++ ;; ++ -L*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ if test "$ac_ii" != "/usr/lib"; then ++ ++ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then ++ ai_p=$ac_ii ++ else ++ ++ ep_dir="`echo $ac_ii|sed 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ fi ++ ++ ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="$ld_runpath_switch$ai_p -L$ai_p $LDFLAGS" ++ else ++ ++ ++ ++ unique=`echo $ai_p|sed 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" ++ ++ fi ++ ++ ++ fi ++ ++ fi ++ ++ ;; ++ esac ++ done ++ echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6 - echo "configure:32280: checking for gdCacheCreate in -lgd" >&5 + echo "configure:35718: checking for gdCacheCreate in -lgd" >&5 ac_lib_var=`echo gd'_'gdCacheCreate | sed 'y%./+-%__p_%'` -@@ -54325,8 +54422,8 @@ +@@ -57066,8 +57240,8 @@ echo $ac_n "checking Oracle version""... $ac_c" 1>&6 - echo "configure:54328: checking Oracle version" >&5 + echo "configure:57069: checking Oracle version" >&5 - if test -s "$ORACLE_DIR/orainst/unix.rgs"; then - ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/ */:/g' | cut -d: -f 6 | cut -c 2-4` + if test -s "$ORACLE_DIR/ocommon/install/partial.prd"; then @@ -159,7 +236,7 @@ test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3 elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then ORACLE_VERSION=9.0 -@@ -56589,6 +56686,102 @@ +@@ -58359,6 +58533,102 @@ if test "$ext_shared" = "yes"; then @@ -262,7 +339,7 @@ ORACLE_SHARED_LIBADD="-lnlsrtl3 $ORACLE_SHARED_LIBADD" if test -n "$ORACLE_DIR/lib"; then -@@ -71130,29 +71323,6 @@ +@@ -77889,29 +78159,6 @@ else @@ -292,7 +369,7 @@ case ct in c|c_r|pthread*) ;; *) -@@ -71176,52 +71346,7 @@ +@@ -77935,52 +78182,7 @@ @@ -346,7 +423,7 @@ save_old_LDFLAGS=$LDFLAGS -@@ -71291,37 +71416,6 @@ +@@ -78126,38 +78328,6 @@ @@ -354,6 +431,7 @@ - echo "$ac_t""no" 1>&6 - - LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared - unset ac_cv_func_tcl - - @@ -384,7 +462,7 @@ fi -@@ -84252,10 +84346,7 @@ +@@ -89822,10 +89992,7 @@ CXXFLAGS="$CXXFLAGS $standard_libtool_flag" all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)' |