diff options
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/gnome-pilot.m4 | 64 |
1 files changed, 37 insertions, 27 deletions
diff --git a/macros/gnome-pilot.m4 b/macros/gnome-pilot.m4 index 0622fd41fe..07c310f456 100644 --- a/macros/gnome-pilot.m4 +++ b/macros/gnome-pilot.m4 @@ -3,19 +3,18 @@ dnl GNOME_PILOT_HOOK(script if found, fail) dnl if fail = "failure", abort if gnome-pilot not found dnl +dnl +dnl + GNOME_PILOT_CFLAGS= GNOME_PILOT_LIBS= -PISOCK_INCLUDEDIR= +PISOCK_CFLAGS= PISOCK_LIBS= -PILOT_BINS= -PILOT_LIBS= AC_SUBST(GNOME_PILOT_CFLAGS) AC_SUBST(GNOME_PILOT_LIBS) -AC_SUBST(PISOCK_INCLUDEDIR) +AC_SUBST(PISOCK_CFLAGS) AC_SUBST(PISOCK_LIBS) -AC_SUBST(PILOT_BINS) -AC_SUBST(PILOT_LIBS) AC_DEFUN([PILOT_LINK_HOOK],[ AC_ARG_WITH(pisock, @@ -24,64 +23,63 @@ AC_DEFUN([PILOT_LINK_HOOK],[ dnl Note that an empty true branch is not valid sh syntax. ifelse([$1], [], :, [$1]) else - PISOCK_INCLUDEDIR="-I$withval/include" - PISOCK_LIBDIR="-L$withval/lib" - PISOCK_LIBS="-lpisock" + PISOCK_CFLAGS="-I$withval/include" + PISOCK_LIBS="-L$withval/lib -lpisock" AC_MSG_CHECKING("for existance of $withval/lib/libpisock.so") if test -r $withval/lib/libpisock.so; then AC_MSG_RESULT("yes") else AC_MSG_ERROR("Unable to find libpisock. Try ftp://ryeham.ee.ryerson.ca/pub/PalmOS/.") fi - AC_SUBST(PISOCK_INCLUDEDIR) - AC_SUBST(PISOCK_LIBDIR) fi ]) - 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" + if test x$PISOCK_CFLAGS = x; then + AC_CHECK_HEADER(pi-version.h, [incdir="/usr/include"], [ + AC_CHECK_HEADER(libpisock/pi-version.h, [PISOCK_CFLAGS="-I/usr/include/libpisock" piversion_include="libpisock/pi-version.h" - AC_SUBST(PISOCK_INCLUDEDIR) + incdir="/usr/inlude/libpisock" ], [ - AC_CHECK_HEADER($prefix/include/pi-version.h, [PISOCK_INCLUDEDIR="-I$prefix/include/libpisock" + AC_CHECK_HEADER($prefix/include/pi-version.h, [PISOCK_CFLAGS="-I$prefix/include/libpisock" piversion_include="$prefix/include/pi-version.h" if test x$PISOCK_LIBDIR = x; then echo Assuming libpisock in $prefix/lib - PISOCK_LIBDIR="-L$prefix/lib" - PISOCK_LIBS="-lpisock" - AC_SUBST(PISOCK_LIBDIR) - AC_SUBST(PISOCK_LIBS) + incdir="$prefix/include" + PISOCK_LIBS="-L$prefix/lib -lpisock" fi ], AC_MSG_ERROR("Unable to find pi-version.h")) ]) ]) fi - - AC_SUBST(PISOCK_INCLUDEDIR) - - if test x$PISOCK_LIBDIR = x; then + + if test x$PISOCK_LIBS = x; then AC_CHECK_LIB(pisock, pi_accept, [ PISOCK_LIBS=-lpisock ], [ AC_MSG_ERROR("Unable to find libpisock. Try ftp://ryeham.ee.ryerson.ca/pub/PalmOS/.") ]) fi AC_ARG_ENABLE(pilotlinktest, - [ --enable-pilotlinktest Test for correct version of pilot-link], + [ --enable-pilotlinktest Test for correct version of pilot-link], [testplversion=$enableval], [ testplversion=yes ] ) if test x$piversion_include = x; then piversion_include="pi-version.h" + pi_version=`cat $incdir/pi-version.h|grep PILOT_LINK_VERSION|sed 's/#define PILOT_LINK_VERSION \([[0-9]]*\)/\1/'` + pi_major=`cat $incdir/pi-version.h|grep PILOT_LINK_MAJOR|sed 's/#define PILOT_LINK_MAJOR \([[0-9]]*\)/\1/'` + pi_minor=`cat $incdir/pi-version.h|grep PILOT_LINK_MINOR|sed 's/#define PILOT_LINK_MINOR \([[0-9]]*\)/\1/'` + pi_patch=`cat $incdir/pi-version.h|grep PILOT_LINK_PATCH|sed 's/#define PILOT_LINK_PATCH \"\(.*\)\"/\1/'` fi + PILOT_LINK_VERSION="$pi_version.$pi_major.$pi_minor$pi_patch" + 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/'` 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" + CFLAGS="$CFLAGS $PISOCK_CFLAGS" AC_TRY_RUN( [ #include <$piversion_include> @@ -100,12 +98,24 @@ AC_DEFUN([PILOT_LINK_HOOK],[ exit(1); } ], - [AC_MSG_RESULT(yes)], + [AC_MSG_RESULT(yes (found $PILOT_LINK_VERSION))], [AC_MSG_ERROR("pilot-link >= $1 required")], [AC_MSG_WARN("No action taken for crosscompile")] ) CFLAGS="$CFLAGS_save" fi + + PISOCK_CFLAGS="$PISOCK_CFLAGS -DGP_PILOT_LINK_VERSION=\\\"$PILOT_LINK_VERSION\\\"" + + unset piversion_include + unset pi_verion + unset pi_major + unset pi_minor + unset pi_patch + unset incdir + unset pl_mi + unset pl_ma + unset pl_ve ]) AC_DEFUN([PILOT_LINK_CHECK],[ |