patch-configure 2.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596
  1. --- php-5.5.10.orig/configure 2014-03-05 11:52:32.000000000 +0100
  2. +++ php-5.5.10/configure 2014-03-11 19:16:14.718425962 +0100
  3. @@ -37475,19 +37475,7 @@ fi
  4. php_with_xpm_dir=no
  5. -
  6. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the location of libXpm" >&5
  7. -$as_echo_n "checking for the location of libXpm... " >&6; }
  8. -
  9. -# Check whether --with-xpm-dir was given.
  10. -if test "${with_xpm_dir+set}" = set; then :
  11. - withval=$with_xpm_dir; PHP_XPM_DIR=$withval
  12. -else
  13. -
  14. - PHP_XPM_DIR=no
  15. -
  16. -
  17. -fi
  18. +PHP_XPM_DIR=no
  19. ext_output=$PHP_XPM_DIR
  20. @@ -39551,13 +39539,6 @@ $as_echo "#define HAVE_GD_JPG 1" >>confd
  21. GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBJPEG"
  22. fi
  23. - if test -n "$GD_XPM_DIR"; then
  24. -
  25. -$as_echo "#define HAVE_GD_XPM 1" >>confdefs.h
  26. -
  27. - GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_XPM"
  28. - fi
  29. -
  30. if test -n "$FREETYPE2_DIR"; then
  31. $as_echo "#define HAVE_GD_FREETYPE 1" >>confdefs.h
  32. @@ -42258,58 +42239,6 @@ fi
  33. esac
  34. done
  35. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreateFromXpm in -lgd" >&5
  36. -$as_echo_n "checking for gdImageCreateFromXpm in -lgd... " >&6; }
  37. -if ${ac_cv_lib_gd_gdImageCreateFromXpm+:} false; then :
  38. - $as_echo_n "(cached) " >&6
  39. -else
  40. - ac_check_lib_save_LIBS=$LIBS
  41. -LIBS="-lgd $LIBS"
  42. -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  43. -/* end confdefs.h. */
  44. -
  45. -/* Override any GCC internal prototype to avoid an error.
  46. - Use char because int might match the return type of a GCC
  47. - builtin and then its argument prototype would still apply. */
  48. -#ifdef __cplusplus
  49. -extern "C"
  50. -#endif
  51. -char gdImageCreateFromXpm ();
  52. -int
  53. -main ()
  54. -{
  55. -return gdImageCreateFromXpm ();
  56. - ;
  57. - return 0;
  58. -}
  59. -_ACEOF
  60. -if ac_fn_c_try_link "$LINENO"; then :
  61. - ac_cv_lib_gd_gdImageCreateFromXpm=yes
  62. -else
  63. - ac_cv_lib_gd_gdImageCreateFromXpm=no
  64. -fi
  65. -rm -f core conftest.err conftest.$ac_objext \
  66. - conftest$ac_exeext conftest.$ac_ext
  67. -LIBS=$ac_check_lib_save_LIBS
  68. -fi
  69. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreateFromXpm" >&5
  70. -$as_echo "$ac_cv_lib_gd_gdImageCreateFromXpm" >&6; }
  71. -if test "x$ac_cv_lib_gd_gdImageCreateFromXpm" = xyes; then :
  72. -
  73. - LDFLAGS=$save_old_LDFLAGS
  74. - ext_shared=$save_ext_shared
  75. -
  76. -$as_echo "#define HAVE_GD_XPM 1" >>confdefs.h
  77. -
  78. -
  79. -else
  80. -
  81. - LDFLAGS=$save_old_LDFLAGS
  82. - ext_shared=$save_ext_shared
  83. - unset ac_cv_lib_gd_gdImageCreateFromXpm
  84. -
  85. -
  86. -fi
  87. save_old_LDFLAGS=$LDFLAGS