diff options
| -rw-r--r-- | macros/ChangeLog | 5 | ||||
| -rw-r--r-- | macros/gnome-pilot.m4 | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index 854785e05a..bda0e0fa6a 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,3 +1,8 @@ +2000-01-22 Peter Teichman <peter@helixcode.com> + + * gnome-pilot.m4 (PILOT_LIBS): fix the version-checking macro for + debian + 2000-01-20 Raja R Harinath <harinath@cs.umn.edu> * gnome-objc-checks.m4: Look for sched_yield in -lrt, too. diff --git a/macros/gnome-pilot.m4 b/macros/gnome-pilot.m4 index 55f0d3152f..862b4ef153 100644 --- a/macros/gnome-pilot.m4 +++ b/macros/gnome-pilot.m4 @@ -33,6 +33,7 @@ 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 @@ -40,7 +41,8 @@ AC_DEFUN([PILOT_LINK_HOOK],[ if test x$PISOCK_INCLUDEDIR = x; then AC_CHECK_HEADER(pi-version.h, [], [ - AC_CHECK_HEADER(libpisock/pi-version.h, PISOCK_INCLUDEDIR="-I/usr/include/libpisock", + AC_CHECK_HEADER(libpisock/pi-version.h, [PISOCK_INCLUDEDIR="-I/usr/include/libpisock" + piversion_include="libpisock/pi-version.h"], AC_MSG_ERROR("Unable to find pi-version.h")) ]) fi @@ -64,7 +66,7 @@ AC_DEFUN([PILOT_LINK_HOOK],[ pl_mi=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` AC_TRY_RUN( [ - #include <pi-version.h> + #include <$piversion_include> int main(int argc,char *argv[]) { if (PILOT_LINK_VERSION == $pl_ve) { if (PILOT_LINK_MAJOR == $pl_ma) { |