Merging from branch.

svn path=/trunk/; revision=2581

diff --git a/macros/ChangeLog b/macros/ChangeLog
index e12b9d9..114a8c2 100644 (file)
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -2,6 +2,10 @@
 
        * autogen.sh: hardcode automake-1.4
 
+2002-08-21  JP Rosevear  <jpr@ximian.com>
+
+       * gnome-pilot.m4: add -lpisync to PISOCK_LIBS
+
 2002-05-15  JP Rosevear  <jpr@ximian.com>
 
        * gnome-pilot.m4: Fix quoting for AC_MSG_*

diff --git a/macros/gnome-pilot.m4 b/macros/gnome-pilot.m4
index 7f5b0f3..fd2dc96 100644 (file)
--- a/macros/gnome-pilot.m4
+++ b/macros/gnome-pilot.m4
@@ -25,7 +25,7 @@ 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)