diff options
| author | Patrick Ohly <patrick.ohly@intel.com> | 2010-01-28 13:29:04 +0100 |
|---|---|---|
| committer | Patrick Ohly <patrick.ohly@intel.com> | 2010-01-28 13:29:04 +0100 |
| commit | b456b6a9a11384f7e7ab05b14c3f5eeffdb3d995 (patch) | |
| tree | 1137b89f43ae0788b02679ce7d1225333dd97d27 | |
| parent | d3517e723c8c1d55a0f851586145ceadbd7c23cb (diff) | |
autotools: removed obsolete libbluetooth2/3 check (MB #9260)
The code got duplicated accidentally while editing it. The second
copy wasn't harmful, just redundant. Removed.
| -rw-r--r-- | configure-pre.in | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/configure-pre.in b/configure-pre.in index e24185cc..4c50b067 100644 --- a/configure-pre.in +++ b/configure-pre.in @@ -280,43 +280,6 @@ fi AM_CONDITIONAL([ENABLE_OBEX], [test "$have_obex" = "yes" && test "$enable_bluetooth" = "yes"]) AM_CONDITIONAL([ENABLE_BLUETOOTH], [test "$have_bluetooth" = "yes" && test "$enable_bluetooth" = "yes"]) -if test "$have_bluetooth"; then - AC_LANG(C) - CFLAGS_old="$CFLAGS" - CFLAGS="$CPPFLAGS $BLUEZ_CFLAGS" - # test in this order: - # - recent libbluetooth (no _safe variant, base function has bufsize) - # - intermediate with _safe - # - else assume old-style (no bufsize, no _safe) - # - # The source code checks the signature both by via pointer assignment and calling - # it (better safe than sorry). One these should fail if the signature is not right. - AC_COMPILE_IFELSE([#include <bluetooth/sdp.h> - #include <bluetooth/sdp_lib.h> - sdp_record_t *(*extract_pdu)(const uint8_t *pdata, int bufsize, int *scanned) = - sdp_extract_pdu; - void foo(void) { - uint8_t *pdata = NULL; - int scanned; - sdp_extract_pdu(pdata, 100, &scanned); - } - ], - AC_DEFINE(HAVE_BLUEZ_BUFSIZE, 1, [base libbluetooth functions accept bufsize parameter]), - AC_COMPILE_IFELSE([#include <bluetooth/sdp.h> - #include <bluetooth/sdp_lib.h> - sdp_record_t *(*extract_pdu)(const uint8_t *pdata, int bufsize, int *scanned) = - sdp_extract_pdu_safe; - void foo(void) { - uint8_t *pdata = NULL; - int scanned; - sdp_extract_pdu_safe(pdata, 100, &scanned); - } - ], - AC_DEFINE(HAVE_BLUEZ_SAFE, 1, [libbluetooth has _safe variants]))) - CFLAGS="$CFLAGS_old" -fi - - if test ! "$TRANSPORT" && test "$libsoup_disabled" != "yes" && test "$libcurl_disabled" != "yes" && |