]> granicus.if.org Git - php/commitdiff
Fix bug: #18479. Better error message what was not found.
authorfoobar <sniper@php.net>
Tue, 23 Jul 2002 01:11:16 +0000 (01:11 +0000)
committerfoobar <sniper@php.net>
Tue, 23 Jul 2002 01:11:16 +0000 (01:11 +0000)
ext/gd/config.m4

index 2dc117d51d4189306337f03924572315ec24639f..87d92a05fcbfad75241ae772dac3d58707904117 100644 (file)
@@ -327,14 +327,6 @@ dnl Various checks for GD features
     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
@@ -345,6 +337,16 @@ dnl SuSE 6.x package structure
     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)