diff options
| author | Dan Winship <danw@src.gnome.org> | 2000-04-11 02:21:11 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2000-04-11 02:21:11 +0800 |
| commit | f85c096a2c075737889724a9c775d775ae8724b8 (patch) | |
| tree | e9aaaff8b66831379ebb37243007b3c850fc84e0 /macros | |
| parent | 4d2972e69fdf11e3f058651600c1854bf07ce9da (diff) | |
| download | gsoc2013-evolution-f85c096a2c075737889724a9c775d775ae8724b8.tar.gz gsoc2013-evolution-f85c096a2c075737889724a9c775d775ae8724b8.tar.zst gsoc2013-evolution-f85c096a2c075737889724a9c775d775ae8724b8.zip | |
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=2366
Diffstat (limited to 'macros')
| -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 bb93c28faf..920b252213 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 cdf4071a46..f050c57801 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) |