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/'`
6/files/ini-1.3.8&id=e8a20a9bdad9bd3a1cf38614c98d2b1b819a0d3a'>Remove all space characters from Makefile assignments.olgeni2014-06-091-3/+3 * lang/gcc-aux: Bring in latest diffs-*marino2014-05-146-117/+298 * lang/gcc-aux: Require latest binutils for DF 3.6 and earliermarino2014-05-142-8/+17 * Convert all :U to :tu and :L to :tlbapt2014-05-051-3/+3 * lang/gcc-aux: Update from RC1 to Release 4.9.0marino2014-04-262-7/+9 * lang/gcc-aux: Fix a testsuite application typo, add test to listmarino2014-04-202-1/+2 * lang/gcc-aux + gnatdroid-armv7: Update to 16 April prereleasemarino2014-04-185-799/+26 * lang/gnatdroid-armv7 (&gcc-aux): Fix socket support and gnat.dg testsuitemarino2014-04-136-24/+582 * lang/gcc-aux: Fix typo in long description with slight cleanupmarino2014-04-111-4/+3 * lang/gcc-aux: significantly reduce c++ testsuite diff file sizemarino2014-04-103-4614/+311 * lang/gcc-aux: Add binutils requirement for FreeBSDmarino2014-04-102-0/+10 * lang/gcc-aux: Upgrade from 30 March snapshot to 6 Aprilmarino2014-04-0910-44/+810 * lang/gcc-aux: set Makefile.common includes like gcc47-auxmarino2014-04-061-1/+1 * lang/gcc-aux: Update to latest snapshot, 30 MAR 2014marino2014-03-312-3/+3 * lang/gcc-aux: Fix parallel jobs build (GCC bug)marino2014-03-227-19/+39 * lang/gcc-aux: Upgrade from gcc-4.7.3 to gcc49-20140302 snapshotmarino2014-03-1413-2690/+1457 * lang/gcc-aux: Fix skip-bootstrap functionalitymarino2014-03-041-5/+5 * lang/gcc-aux: Fix on DFly 3.5+ with test optionmarino2014-03-041-1/+1 * Define GPLv3RLE license (GPLv3 Runtime Library Exception)marino2014-02-131-2/+3 * lang/gcc-aux: Update diff-ada, diff-core for Androidmarino2014-01-242-311/+493 * lang/gcc-aux: Convert to stagingmarino2013-11-103-52/+25 * Update to libmpc version 1.0.1 which brings the following fixes:gerald2013-10-261-1/+1 * lang/gcc-aux: Support iconv update in DragonFly master branchmarino2013-09-241-4/+45 * Add NO_STAGE all over the place in preparation for the staging support (cat: ...bapt2013-09-211-0/+1 * Introduce ICONV_CONFIGURE_ARG variable defined at Uses/iconv.mk.bsam2013-09-051-1/+1 * - Fix lang/gcc-aux broken in r324744 [1]ak2013-08-151-3/+4 * - Remove MAKE_JOBS_SAFE variableak2013-08-151-1/+0 * Fix overwritting of USESbapt2013-08-011-1/+1 * - Convert to new Uses/perl5.mk frameworkaz2013-07-311-0/+3 * lang/gcc-aux: bug fixesmarino2013-07-216-16/+250 * Replace John Marino email address with FreeBSD versionmarino2013-07-121-2/+2 * Fix leftovers check on tinderbox by removing empty directories.rakuco2013-06-071-0/+2 * Update to gcc 4.7.3bapt2013-04-307-136/+164 * Convert the last USE_ICONV to USES=iconvbapt2013-04-281-1/+1 * - Update diff-core patch to allow faster symbol matching on FreeBSD>=9culot2012-08-092-5/+52