aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--macros/ChangeLog5
-rw-r--r--macros/gnome-pilot.m45
2 files changed, 9 insertions, 1 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index 71b22f882c..b3c9c3f6a4 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-23 Peter Teichman <peter@helixcode.com>
+
+ * gnome-pilot.m4: i broke the version-checking macro for other
+ distribs in my last commit. fixing that now.
+
2000-01-23 Martin Baulig <martin@home-of-linux.org>
* gnome-libgtop-check.m4 (GNOME_LIBGTOP_TYPES): Check for
diff --git a/macros/gnome-pilot.m4 b/macros/gnome-pilot.m4
index 862b4ef153..16e081a366 100644
--- a/macros/gnome-pilot.m4
+++ b/macros/gnome-pilot.m4
@@ -33,7 +33,6 @@ AC_DEFUN([PILOT_LINK_HOOK],[
else
AC_MSG_ERROR("Unable to find libpisock. Try ftp://ryeham.ee.ryerson.ca/pub/PalmOS/.")
fi
- piversion_include="pi-version.h"
AC_SUBST(PISOCK_INCLUDEDIR)
AC_SUBST(PISOCK_LIBDIR)
fi
@@ -59,6 +58,10 @@ AC_DEFUN([PILOT_LINK_HOOK],[
[ testplversion=yes ]
)
+ if test x$piversion_include = x; then
+ piversion_include="pi-version.h"
+ fi
+
if test x$testplversion = xyes; then
AC_MSG_CHECKING(for pilot-link version >= $1)
pl_ve=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`