aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell Steinthal <steintr@src.gnome.org>2000-05-16 11:43:44 +0800
committerRussell Steinthal <steintr@src.gnome.org>2000-05-16 11:43:44 +0800
commit40b6141cfe1649f685e49ebd81cfd4baf0baeedf (patch)
tree6acebfc6c6d01f9ff409852bed08efe166f58444
parent062b4e53c4d29699c7a2f040efeace29e74e5427 (diff)
downloadgsoc2013-evolution-40b6141cfe1649f685e49ebd81cfd4baf0baeedf.tar.gz
gsoc2013-evolution-40b6141cfe1649f685e49ebd81cfd4baf0baeedf.tar.zst
gsoc2013-evolution-40b6141cfe1649f685e49ebd81cfd4baf0baeedf.zip
Yet another attempt at fixing the gnome-pilot check- this time on Solaris.
$GNOME_CONFIG is printing more than one word, which when backticked causes test to do not nice things... Can someone with Solaris test this? test on Linux appears to be too lenient to worry about this in any case. svn path=/trunk/; revision=3054
-rw-r--r--macros/ChangeLog6
-rw-r--r--macros/gnome-pilot.m44
2 files changed, 8 insertions, 2 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index bcb29bfdfb..e780a962d1 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,9 @@
+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!"
diff --git a/macros/gnome-pilot.m4 b/macros/gnome-pilot.m4
index eb63912af6..39f73cca9e 100644
--- a/macros/gnome-pilot.m4
+++ b/macros/gnome-pilot.m4
@@ -99,12 +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
# 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
+ if test "x`$GNOME_CONFIG gpilot 2>&1 > /dev/null`" = "x"; then
gnome_cv_pilot_found=yes
else
gnome_cv_pilot_found=no