diff options
| author | Peter Williams <peterw@src.gnome.org> | 2000-06-29 18:44:26 +0000 |
|---|---|---|
| committer | Peter Williams <peterw@src.gnome.org> | 2000-06-29 18:44:26 +0000 |
| commit | 601130f9721fcb224204db28a3a2b4e7b98a4fcb (patch) | |
| tree | 6852766d3506dcfac0baa325cbfa08514eb9e860 | |
| parent | a8ed3c7bd88eafeedc078725171d3b0b7dd12bc7 (diff) | |
| download | shared-mime-info-unlabeled-1.15.2.tar.gz | |
Head sync.unlabeled-1.15.2
svn path=/branches/unlabeled-1.15.2/; revision=1297
| -rw-r--r-- | macros/gnome-pilot.m4 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/macros/gnome-pilot.m4 b/macros/gnome-pilot.m4 index a2ebfe5e..960d5fc6 100644 --- a/macros/gnome-pilot.m4 +++ b/macros/gnome-pilot.m4 @@ -67,6 +67,8 @@ AC_DEFUN([PILOT_LINK_HOOK],[ pl_ve=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` pl_ma=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` pl_mi=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + CFLAGS_save="$CFLAGS" + CFLAGS="$CFLAGS $PISOCK_INCLUDEDIR" AC_TRY_RUN( [ #include <$piversion_include> @@ -89,6 +91,7 @@ AC_DEFUN([PILOT_LINK_HOOK],[ [AC_MSG_ERROR("pilot-link >= $1 required")], [AC_MSG_WARN("No action taken for crosscompile")] ) + CFLAGS="$CFLAGS_save" fi ]) @@ -99,10 +102,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 |