diff options
| author | Dan Winship <danw@src.gnome.org> | 2000-04-10 18:21:11 +0000 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2000-04-10 18:21:11 +0000 |
| commit | e4ce699339aa94e65ad2868399306f1ed4500df4 (patch) | |
| tree | 581e1f8379e7ed56c690f848d9a84f27e0527bbb | |
| parent | 5ee0a8275335a5b0f1deb19ac506bbe0f2e75a22 (diff) | |
| download | shared-mime-info-e4ce699339aa94e65ad2868399306f1ed4500df4.tar.gz | |
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
| -rw-r--r-- | macros/ChangeLog | 6 | ||||
| -rw-r--r-- | macros/gnome-pilot.m4 | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index bb93c28f..920b2522 100644 --- 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 cdf4071a..f050c578 100644 --- 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) |