[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-devel
Subject:    Re: Fix for kdepim gnokii configure script
From:       Tim Smith <tim () electronghost ! co ! uk>
Date:       2003-11-11 14:12:02
[Download RAW message or body]

On Tuesday 11 November 2003 13:29, Tim Smith wrote:
> KAddressbook can use gnokii to talk to a mobile phone. Gnokii can (in
> recent versions) use bluetooth to talk to bluetooth-enabled phones. The
> configure check for libgnokii will currently fail if gnokii was built with
> bluetooth support. Here's a patch to fix that.

Oops. Blank file. Here is the real one.

-- 
Tim Smith (tim@electronghost.co.uk)
England Prevails.

["fixkdepimgnokii.diff" (text/x-diff)]

Index: configure.in.in
===================================================================
RCS file: /home/kde/kdepim/configure.in.in,v
retrieving revision 1.30
diff -u -3 -p -r1.30 configure.in.in
--- configure.in.in	27 Oct 2003 15:38:07 -0000	1.30
+++ configure.in.in	11 Nov 2003 13:57:47 -0000
@@ -23,6 +23,19 @@ fi
 
 CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
 
+# check for libbluetooth (Bluetooth library) because gnokii may require it
+AC_DEFUN(KDE_CHECK_BLUETOOTH,
+[
+  AC_CHECK_HEADERS(bluetooth/bluetooth.h)
+  LIB_BLUETOOTH=
+  AC_CHECK_LIB(bluetooth, hci_open_dev,
+       [ LIB_BLUETOOTH="-lbluetooth" ],
+       [],
+       [] )
+  AC_SUBST(LIB_BLUETOOTH)
+])
+
+
 # check for libgnokii (Nokia mobile phone library)
 AC_DEFUN(KDE_CHECK_GNOKII,
 [
@@ -30,12 +43,11 @@ AC_DEFUN(KDE_CHECK_GNOKII,
   AC_REQUIRE([AC_HAVE_XPM])
   LIB_GNOKII=
   AC_CHECK_LIB(gnokii, gn_cfg_read,
-       [ LIB_GNOKII="-lgnokii" ],
+       [ LIB_GNOKII="-lgnokii $LIB_BLUETOOTH" ],
        [],
-       $all_libraries -lXpm -lX11 )
+       $all_libraries -lXpm -lX11 $LIB_BLUETOOTH )
   AC_SUBST(LIB_GNOKII)
 ])
-
 
 dnl the below is copied from kdenetwork's configure as too many apps moved
 dnl and noone can say which tests are needed and which are obsolete for kdepim ;(
Index: kaddressbook/xxport/configure.in.in
===================================================================
RCS file: /home/kde/kdepim/kaddressbook/xxport/configure.in.in,v
retrieving revision 1.2
diff -u -3 -p -r1.2 configure.in.in
--- kaddressbook/xxport/configure.in.in	13 Oct 2003 09:10:33 -0000	1.2
+++ kaddressbook/xxport/configure.in.in	11 Nov 2003 13:57:47 -0000
@@ -1,3 +1,4 @@
 # $Id: configure.in.in,v 1.2 2003/10/13 09:10:33 faure Exp $
 
+KDE_CHECK_BLUETOOTH
 KDE_CHECK_GNOKII


>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<


[prev in list] [next in list] [prev in thread] [next in thread]