diff options
| author | Peter Williams <peterw@src.gnome.org> | 2000-05-22 19:45:05 +0000 |
|---|---|---|
| committer | Peter Williams <peterw@src.gnome.org> | 2000-05-22 19:45:05 +0000 |
| commit | fe429032b4dc63917949cfab0cf570625b7757a8 (patch) | |
| tree | 70ea22d6a4da2e07bedfe85a5cddc5e7ad0a1246 | |
| parent | 09c3c1f811812c67bfe9f84a2e2f912de0e8cb58 (diff) | |
| download | gnome-common-latest-balsa-0-8.tar.gz | |
Sync with HEADlatest-balsa-0-8
svn path=/branches/latest-balsa-0-8/; revision=1250
| -rw-r--r-- | macros/ChangeLog | 11 | ||||
| -rw-r--r-- | macros/gnome-pilot.m4 | 6 |
2 files changed, 15 insertions, 2 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index 7ce773e..e780a96 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,3 +1,14 @@ +2000-05-15 Russell Steinthal <rms39@columbia.edu> + + * gnome-pilot.m4 (PILOT_LIBS): An attempt to fix the gnome-pilot + check on Solaris (`$GNOME_CONFIG ...` returns more than one word, + so we need quotes around it to keep test from bombing out) + +2000-05-01 Dan Winship <danw@helixcode.com> + + * gnome-pilot.m4 (PILOT_LIBS): "But that trick NEVER works!" + "This time for sure!" + Sun Apr 23 12:15:14 2000 George Lebl <jirka@5z.com> * gnome.m4: add an extra lib of docklets. These checks are diff --git a/macros/gnome-pilot.m4 b/macros/gnome-pilot.m4 index a2ebfe5..39f73cc 100644 --- a/macros/gnome-pilot.m4 +++ b/macros/gnome-pilot.m4 @@ -99,10 +99,12 @@ AC_DEFUN([PILOT_LINK_CHECK],[ AC_DEFUN([GNOME_PILOT_HOOK],[ AC_PATH_PROG(GNOME_CONFIG,gnome-config,no) AC_CACHE_CHECK([for gnome-pilot environment],gnome_cv_pilot_found,[ - if test x$GNOME_CONFIG = xno; then + if test "x$GNOME_CONFIG" = "xno"; then gnome_cv_pilot_found=no else - if $GNOME_CONFIG --modversion gpilot 2> /dev/null; then + # gnome-config doesn't return a useful error status, + # so we check if it outputs anything to stderr + if test "x`$GNOME_CONFIG gpilot 2>&1 > /dev/null`" = "x"; then gnome_cv_pilot_found=yes else gnome_cv_pilot_found=no |