From 368054d2231a6ec2ddaf5bf2918db9cbe912e667 Mon Sep 17 00:00:00 2001 From: foobar Date: Thu, 9 Nov 2000 02:29:15 +0000 Subject: [PATCH] Fix to get jpeg/xpm support everytime. --- ext/gd/config.m4 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 index b09bcdb9c1..21ab03fdae 100644 --- a/ext/gd/config.m4 +++ b/ext/gd/config.m4 @@ -16,7 +16,6 @@ AC_DEFUN(PHP_GD_JPEG,[ AC_MSG_RESULT(no) AC_MSG_WARN(If configure fails try --with-jpeg-dir=) ]) - AC_CHECK_LIB(gd, gdImageCreateFromJpeg, [AC_DEFINE(HAVE_GD_JPG, 1, [ ])]) ]) @@ -39,7 +38,6 @@ AC_DEFUN(PHP_GD_XPM,[ AC_MSG_RESULT(no) AC_MSG_WARN(If configure fails try --with-xpm-dir=) ]) - AC_CHECK_LIB(gd, gdImageCreateFromXpm, [AC_DEFINE(HAVE_GD_XPM, 1, [ ])]) ]) @@ -54,6 +52,8 @@ AC_DEFUN(PHP_GD_CHECK_VERSION,[ AC_CHECK_LIB(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF, 1, [ ])]) AC_CHECK_LIB(gd, gdImageCreateFromXbm, [AC_DEFINE(HAVE_GD_XBM, 1, [ ])]) AC_CHECK_LIB(gd, gdImageWBMP, [AC_DEFINE(HAVE_GD_WBMP, 1, [ ])]) + AC_CHECK_LIB(gd, gdImageCreateFromJpeg, [AC_DEFINE(HAVE_GD_JPG, 1, [ ])]) + AC_CHECK_LIB(gd, gdImageCreateFromXpm, [AC_DEFINE(HAVE_GD_XPM, 1, [ ])]) ]) @@ -70,6 +70,7 @@ AC_ARG_ENABLE(gd-native-ttf, AC_MSG_RESULT(no) ]) + shared=no AC_MSG_CHECKING(whether to include GD support) AC_ARG_WITH(gd, -- 2.50.1