This cvs diff contains support for --without-bluez in pilot-link 0.12.2 - bringing i386 into line with other architectures. I'm still looking into why the buildd build does not correctly detect bluez.
-- Neil Williams ============= http://www.data-freedom.org/ http://www.nosoftwarepatents.com/ http://www.linux.codehelp.co.uk/
Index: configure.ac
===================================================================
RCS file: /cvs/pilot-link/pilot-link_src/configure.ac,v
retrieving revision 1.60
diff -p -u -b -B -r1.60 configure.ac
--- configure.ac 16 Feb 2007 17:28:59 -0000 1.60
+++ configure.ac 2 Mar 2007 10:19:15 -0000
@@ -358,13 +358,15 @@ if test "x$use_bluez" != "xno"; then
if test "x$have_bluez" = xno && test "x$use_bluez" = xyes; then
AC_MSG_ERROR([BlueZ explicitly requested but no support found])
fi
- if test "x$have_bluez" = xyes; then
+ if test "x$have_bluez" = xyes && test "x$use_bluez" = xyes; then
AC_DEFINE(HAVE_BLUEZ, 1, [Define if we have BlueZ bluetooth support])
AC_MSG_RESULT([enabled])
msg_bluez="yes"
else
AC_MSG_RESULT([not found])
fi
+else
+ have_bluez="no"
fi
AM_CONDITIONAL(WITH_BLUEZ, test x$have_bluez = "xyes")
Index: libpisock/Makefile.am
===================================================================
RCS file: /cvs/pilot-link/pilot-link_src/libpisock/Makefile.am,v
retrieving revision 1.31
diff -p -u -b -B -r1.31 Makefile.am
--- libpisock/Makefile.am 5 Feb 2007 17:53:42 -0000 1.31
+++ libpisock/Makefile.am 2 Mar 2007 10:19:15 -0000
@@ -78,8 +78,13 @@ libpisock_la_SOURCES = \
versamail.c
# Including PTHREAD_CFLAGS here is a dirty ugly kluge. It works.
+if WITH_BLUEZ
libpisock_la_LIBADD = \
@usb_libs@ @PTHREAD_LIBS@ @PTHREAD_CFLAGS@ @BLUEZ_LIBS@
+else
+libpisock_la_LIBADD = \
+ @usb_libs@ @PTHREAD_LIBS@ @PTHREAD_CFLAGS@
+endif
libpisock_la_LDFLAGS = \
-export-dynamic -version-info $(PISOCK_CURRENT):$(PISOCK_REVISION):$(PISOCK_AGE)
pgp0uSV6SfIWn.pgp
Description: PGP signature
