cvs: php4 /ext/gd config.m4

sniper Mon Jul 22 21:11:16 2002 EDT Modified files: /php4/ext/gd config.m4 Log: Fix bug: #18479. Better error message what was not found. Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.104 php4/ext/gd/config.m4:1.105 --- php4/ext/gd/config.m4:1.104 Wed Jul 17 13:28:57 2002 +++ php4/ext/gd/config.m4 Mon Jul 22 21:11:16 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.104 2002/07/17 17:28:57 sniper Exp $ +dnl $Id: config.m4,v 1.105 2002/07/23 01:11:16 sniper Exp $ dnl dnl @@ -327,14 +327,6 @@ done done - if test -n "$GD_INCLUDE" -a -n "$GD_LIB" ; then - PHP_ADD_LIBRARY_WITH_PATH(gd, $GD_LIB, GD_SHARED_LIBADD) - AC_DEFINE(HAVE_LIBGD,1,[ ]) - PHP_GD_CHECK_VERSION - else - AC_MSG_ERROR([Unable to find libgd.(a|so) anywhere under $GD_SEARCH_PATHS]) - fi - dnl NetBSD package structure if test -f /usr/pkg/include/gd/gd.h -a -z "$GD_INCLUDE" ; then GD_INCLUDE=/usr/pkg/include/gd @@ -344,6 +336,16 @@ if test -f /usr/include/gd/gd.h -a -z "$GD_INCLUDE" ; then GD_INCLUDE=/usr/include/gd fi + + if test -n "$GD_INCLUDE" -a -n "$GD_LIB" ; then + PHP_ADD_LIBRARY_WITH_PATH(gd, $GD_LIB, GD_SHARED_LIBADD) + AC_DEFINE(HAVE_LIBGD,1,[ ]) + PHP_GD_CHECK_VERSION + elif test -z "$GD_INCLUDE"; then + AC_MSG_ERROR([Unable to find gd.h anywhere under $GD_SEARCH_PATHS]) + else + AC_MSG_ERROR([Unable to find libgd.(a|so) anywhere under $GD_SEARCH_PATHS]) + fi PHP_EXPAND_PATH($GD_INCLUDE, GD_INCLUDE) PHP_ADD_INCLUDE($GD_INCLUDE)