From: foobar <sniper@php.net>
Date: Thu, 10 May 2001 23:55:56 +0000 (+0000)
Subject: default to /usr/local
X-Git-Tag: php-4.0.6RC1~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5bc7cf90cd81b6e43faab7a902fdc559a2a0f2ee;p=php

default to /usr/local
---

diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index 31659b53e4..7199736cbc 100644
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -7,6 +7,10 @@ AC_DEFUN(PHP_GD_JPEG,[
   [  --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 @@ AC_DEFUN(PHP_GD_PNG,[
   [  --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 @@ AC_DEFUN(PHP_GD_XPM,[
   [  --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)