cvs: php4 /ext/gd config.m4

sniper Thu May 10 16:55:56 2001 EDT Modified files: /php4/ext/gd config.m4 Log: default to /usr/local Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.59 php4/ext/gd/config.m4:1.60 --- php4/ext/gd/config.m4:1.59 Wed May 9 17:54:24 2001 +++ php4/ext/gd/config.m4 Thu May 10 16:55:56 2001 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.59 2001/05/10 00:54:24 sniper Exp $ +dnl $Id: config.m4,v 1.60 2001/05/10 23:55:56 sniper Exp $ dnl AC_DEFUN(PHP_GD_JPEG,[ @@ -7,6 +7,10 @@ [ --with-jpeg-dir=DIR GD: Set the path to libjpeg install prefix.]) if test "$PHP_JPEG_DIR" != "no" -a "$PHP_JPEG_DIR"; then + if test "$PHP_JPEG_DIR" = "yes"; then + $PHP_JPEG_DIR=/usr/local + fi + AC_CHECK_LIB(jpeg,jpeg_read_header,[ PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, GD_SHARED_LIBADD) ],[ @@ -24,6 +28,10 @@ [ --with-png-dir=DIR GD: Set the path to libpng install prefix.]) if test "$PHP_PNG_DIR" != "no" -a "$PHP_PNG_DIR"; then + if test "$PHP_PNG_DIR" = "yes"; then + $PHP_PNG_DIR=/usr/local + fi + AC_CHECK_LIB(png,png_info_init,[ PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, GD_SHARED_LIBADD) PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib, GD_SHARED_LIBADD) @@ -42,6 +50,10 @@ [ --with-xpm-dir=DIR GD: Set the path to libXpm install prefix.]) if test "$PHP_XPM_DIR" != "no" -a "$PHP_XPM_DIR"; then + if test "$PHP_XPM_DIR" = "yes"; then + $PHP_XPM_DIR=/usr/local + fi + AC_CHECK_LIB(Xpm,XpmFreeXpmImage, [ PHP_ADD_LIBRARY_WITH_PATH(Xpm, $PHP_XPM_DIR/lib, GD_SHARED_LIBADD) PHP_ADD_LIBRARY_WITH_PATH(X11, $PHP_XPM_DIR/lib, GD_SHARED_LIBADD)