If the test for gphoto2-config fails, don't call it later.

ChangeLog

@@ -1,3 +1,8 @@
+2004-04-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
+
+	* acinclude.m4 aclocal.m4 configure: If the test for gphoto2-config
+	  fails, don't call it later.
+
 -- snapshot 1.0.14-pre2
 
 2004-04-17  Henning Meier-Geinitz <henning@meier-geinitz.de>

acinclude.m4

@@ -358,7 +358,7 @@ AC_DEFUN([SANE_CHECK_GPHOTO2],
 
 		AC_CHECK_TOOL(HAVE_GPHOTO2, gphoto2-config, false)
 	
-		if test $HAVE_GPHOTO2 != ""
+		if test $HAVE_GPHOTO2 != "false"
 		then
 			with_gphoto2=`gphoto2-config --prefix`
 			CPPFLAGS="${CPPFLAGS} `gphoto2-config --cflags`"

aclocal.m4

@@ -370,7 +370,7 @@ AC_DEFUN([SANE_CHECK_GPHOTO2],
 
 		AC_CHECK_TOOL(HAVE_GPHOTO2, gphoto2-config, false)
 	
-		if test $HAVE_GPHOTO2 != ""
+		if test $HAVE_GPHOTO2 != "false"
 		then
 			with_gphoto2=`gphoto2-config --prefix`
 			CPPFLAGS="${CPPFLAGS} `gphoto2-config --cflags`"
@@ -6349,7 +6349,7 @@ SED=$lt_cv_path_SED
 AC_MSG_RESULT([$SED])
 ])
 
-# lib-prefix.m4 serial 3 (gettext-0.12.2)
+# lib-prefix.m4 serial 3 (gettext-0.13)
 dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -7057,7 +7057,7 @@ AC_DEFUN([AC_LIB_APPENDTOVAR],
   done
 ])
 
-# lib-ld.m4 serial 2 (gettext-0.12)
+# lib-ld.m4 serial 3 (gettext-0.13)
 dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -7073,11 +7073,12 @@ dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
 AC_DEFUN([AC_LIB_PROG_LD_GNU],
 [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
 [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  acl_cv_prog_gnu_ld=yes
-else
-  acl_cv_prog_gnu_ld=no
-fi])
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  acl_cv_prog_gnu_ld=yes ;;
+*)
+  acl_cv_prog_gnu_ld=no ;;
+esac])
 with_gnu_ld=$acl_cv_prog_gnu_ld
 ])
 
@@ -7147,11 +7148,12 @@ AC_CACHE_VAL(acl_cv_path_LD,
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
+      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break ;;
+      *)
+	test "$with_gnu_ld" != yes && break ;;
+      esac
     fi
   done
   IFS="$ac_save_ifs"