summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Brabec <utx@src.gnome.org>2000-06-24 10:47:21 +0000
committerStanislav Brabec <utx@src.gnome.org>2000-06-24 10:47:21 +0000
commitc5fa192f33d4341c6ae358bf624ec88f69565521 (patch)
treea9313193a2b92de2de4dde68fae82adfa65509e9
parent69a8dde36da75192819b8a036570b862ac10c20f (diff)
downloadshared-mime-info-c5fa192f33d4341c6ae358bf624ec88f69565521.tar.gz
Use 'PISOCK_INCLUDEDIR' in pisock version check.
svn path=/trunk/; revision=1283
-rw-r--r--macros/ChangeLog4
-rw-r--r--macros/gnome-pilot.m43
2 files changed, 7 insertions, 0 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index 5122c166..3022f1c5 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,7 @@
+2000-06-23 Stanislav Brabec <utx@penguin.cz>
+
+ * gnome-pilot.m4: Use 'PISOCK_INCLUDEDIR' in pisock version check.
+
2000-06-17 Dan Winship <danw@helixcode.com>
* autogen.sh: exit immediately if aclocal, autoheader, automake,
diff --git a/macros/gnome-pilot.m4 b/macros/gnome-pilot.m4
index 39f73cca..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
])