diff options
author | Radek Doulik <rodo@src.gnome.org> | 2002-11-07 00:33:24 +0800 |
---|---|---|
committer | Radek Doulik <rodo@src.gnome.org> | 2002-11-07 00:33:24 +0800 |
commit | 774aba8ec57d4e7d76a8b5bab60308a05159da64 (patch) | |
tree | 66d7d8d646ccae7d922ee0431701c10fa772b8e0 /macros/gnome-pilot.m4 | |
parent | 97c28e431cce252e5050e95a28d20a351d49094c (diff) | |
download | gsoc2013-evolution-774aba8ec57d4e7d76a8b5bab60308a05159da64.tar.gz gsoc2013-evolution-774aba8ec57d4e7d76a8b5bab60308a05159da64.tar.zst gsoc2013-evolution-774aba8ec57d4e7d76a8b5bab60308a05159da64.zip |
reverted unwanted changes which slipped in while I moved gnome-2-port branch
to gtkhtml/HEAD
svn path=/trunk/; revision=18601
Diffstat (limited to 'macros/gnome-pilot.m4')
-rw-r--r-- | macros/gnome-pilot.m4 | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/macros/gnome-pilot.m4 b/macros/gnome-pilot.m4 index d8ce9606ae..59f59b73d3 100644 --- a/macros/gnome-pilot.m4 +++ b/macros/gnome-pilot.m4 @@ -25,12 +25,12 @@ AC_DEFUN([PILOT_LINK_HOOK],[ else PISOCK_CFLAGS="-I$withval/include" incdir="$withval/include" - PISOCK_LIBS="-L$withval/lib -lpisock" + PISOCK_LIBS="-L$withval/lib -lpisock -lpisync" AC_MSG_CHECKING("for existance of $withval/lib/libpisock.so") if test -r $withval/lib/libpisock.so; then - AC_MSG_RESULT("yes") + AC_MSG_RESULT(yes) else - AC_MSG_ERROR("Unable to find libpisock. Try ftp://ryeham.ee.ryerson.ca/pub/PalmOS/.") + AC_MSG_ERROR([Unable to find libpisock. Try http://www.pilot-link.org.]) fi fi ]) @@ -45,16 +45,16 @@ AC_DEFUN([PILOT_LINK_HOOK],[ piversion_include="$prefix/include/pi-version.h" if test x$PISOCK_LIBDIR = x; then incdir="$prefix/include" - PISOCK_LIBS="-L$prefix/lib -lpisock" + PISOCK_LIBS="-L$prefix/lib -lpisock -lpisync" fi ], - AC_MSG_ERROR("Unable to find pi-version.h")) + AC_MSG_ERROR([Unable to find pi-version.h])) ]) ]) fi 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/.") ]) + AC_CHECK_LIB(pisock, pi_accept, [ PISOCK_LIBS=-lpisock -lpisync], + [ AC_MSG_ERROR([Unable to find libpisock. Try http://www.pilot-link.org.]) ]) fi AC_ARG_ENABLE(pilotlinktest, @@ -75,7 +75,7 @@ AC_DEFUN([PILOT_LINK_HOOK],[ 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) + 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/'` @@ -99,9 +99,9 @@ AC_DEFUN([PILOT_LINK_HOOK],[ return 1; } ], - [AC_MSG_RESULT(yes (found $PILOT_LINK_VERSION))], - [AC_MSG_ERROR("pilot-link >= $1 required")], - [AC_MSG_WARN("No action taken for crosscompile")] + [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 @@ -198,7 +198,7 @@ AC_DEFUN([GNOME_PILOT_CHECK],[ gpv=$1 fi if test x$2 = x; then - plv=0.9.5 + plv=0.11.4 else plv=$2 fi |