Fix a bug introduced in the gnome-pilot-config to "gnome-config gpilot"

	* gnome-pilot.m4 (PILOT_LIBS): Fix a bug introduced in the
	gnome-pilot-config to "gnome-config gpilot" change that caused not
	having pilot-link installed to become a fatal error.

svn path=/trunk/; revision=1171

diff --git a/macros/ChangeLog b/macros/ChangeLog
index bb93c28..920b252 100644 (file)
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,9 @@
+2000-04-10  Dan Winship  <danw@helixcode.com>
+
+       * gnome-pilot.m4 (PILOT_LIBS): Fix a bug introduced in the
+       gnome-pilot-config to "gnome-config gpilot" change that caused not
+       having pilot-link installed to become a fatal error.
+
 2000-02-26  James Henstridge  <james@daa.com.au>
 
        * gnome-gettext.m4: fix up check of LINGUAS variable so that we don't

diff --git a/macros/gnome-pilot.m4 b/macros/gnome-pilot.m4
index cdf4071..f050c57 100644 (file)
--- a/macros/gnome-pilot.m4
+++ b/macros/gnome-pilot.m4
@@ -97,12 +97,16 @@ AC_DEFUN([PILOT_LINK_CHECK],[
 ])
 
 AC_DEFUN([GNOME_PILOT_HOOK],[
-       AC_PATH_PROG(GNOME_PILOT_CONFIG,gnome-config,no)
+       AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
        AC_CACHE_CHECK([for gnome-pilot environment],gnome_cv_pilot_found,[
-               if test x$GNOME_PILOT_CONFIG = xno; then
+               if test x$GNOME_CONFIG = xno; then
                        gnome_cv_pilot_found=no
                else
-                       gnome_cv_pilot_found=yes
+                       if $GNOME_CONFIG gpilot 2> /dev/null; then
+                               gnome_cv_pilot_found=yes
+                       else
+                               gnome_cv_pilot_found=no
+                       fi
                fi
        ])
        AM_CONDITIONAL(HAVE_GNOME_PILOT,test x$gnome_cv_pilot_found = xyes)