summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJP Rosevear <jpr@ximian.com>2002-09-20 20:01:19 +0000
committerJP Rosevear <jpr@src.gnome.org>2002-09-20 20:01:19 +0000
commitc70fcf7c3b938c9d7f19544023a2c3dbab29bb04 (patch)
treeadc99df62b8dc5d0d6b852f8536b73939f050b33
parenteee1fef91dc11f4f2c1b8bea288eb645834b366e (diff)
downloadshared-mime-info-c70fcf7c3b938c9d7f19544023a2c3dbab29bb04.tar.gz
fix problem where -lpisync was not linked in if you didn't specify
2002-09-20 JP Rosevear <jpr@ximian.com> * gnome-pilot.m4: fix problem where -lpisync was not linked in if you didn't specify --with-pisock svn path=/trunk/; revision=2590
-rw-r--r--macros/ChangeLog5
-rw-r--r--macros/gnome-pilot.m44
2 files changed, 7 insertions, 2 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index 9befd90b..7c0ed0bb 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-20 JP Rosevear <jpr@ximian.com>
+
+ * gnome-pilot.m4: fix problem where -lpisync was not linked in if
+ you didn't specify --with-pisock
+
2002-09-16 JP Rosevear <jpr@ximian.com>
* gnome-pilot.m4: check for pilot-link 0.11.4 by default
diff --git a/macros/gnome-pilot.m4 b/macros/gnome-pilot.m4
index 6d9f12ae..59f59b73 100644
--- a/macros/gnome-pilot.m4
+++ b/macros/gnome-pilot.m4
@@ -45,7 +45,7 @@ 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]))
])
@@ -53,7 +53,7 @@ AC_DEFUN([PILOT_LINK_HOOK],[
fi
if test "x$PISOCK_LIBS" = "x"; then
- AC_CHECK_LIB(pisock, pi_accept, [ PISOCK_LIBS=-lpisock ],
+ AC_CHECK_LIB(pisock, pi_accept, [ PISOCK_LIBS=-lpisock -lpisync],
[ AC_MSG_ERROR([Unable to find libpisock. Try http://www.pilot-link.org.]) ])
fi