diff -ruN obexftp-0.18.orig/acinclude.m4 obexftp-0.18/acinclude.m4 --- obexftp-0.18.orig/acinclude.m4 2006-01-12 01:38:25.000000000 +1000 +++ obexftp-0.18/acinclude.m4 2006-01-26 00:57:00.000000000 +1000 @@ -97,31 +97,6 @@ dnl -dnl Check for USB library -dnl Waring: the AC_TRY_COMPILE won't work with -Werror -dnl - -AC_DEFUN([USB_CHECK],[ - AC_MSG_CHECKING(for USB support) - - AC_TRY_COMPILE( [ - #include - #include - ],[ - usb_obex_intf_info_t usb_intf; - ], - am_cv_usb_found=yes, - am_cv_usb_found=no - ) - - if test $am_cv_usb_found = yes; then - AC_DEFINE(HAVE_USB,1,[Define if system supports USB]) - fi - - AC_MSG_RESULT($am_cv_usb_found) -]) - -dnl dnl From autoconf-archive, should be in macros dir dnl AC_DEFUN([AC_PROG_SWIG],[ @@ -263,7 +238,3 @@ AC_MSG_RESULT($PYTHON_EXTRA_LIBS)` AC_SUBST(PYTHON_EXTRA_LIBS) ]) - -### test test test -builtin(include,tcl.m4) - diff -ruN obexftp-0.18.orig/aclocal.m4 obexftp-0.18/aclocal.m4 --- obexftp-0.18.orig/aclocal.m4 2006-01-12 03:16:38.000000000 +1000 +++ obexftp-0.18/aclocal.m4 2006-01-26 00:57:28.000000000 +1000 @@ -110,31 +110,6 @@ dnl -dnl Check for USB library -dnl Waring: the AC_TRY_COMPILE won't work with -Werror -dnl - -AC_DEFUN([USB_CHECK],[ - AC_MSG_CHECKING(for USB support) - - AC_TRY_COMPILE( [ - #include - #include - ],[ - usb_obex_intf_info_t usb_intf; - ], - am_cv_usb_found=yes, - am_cv_usb_found=no - ) - - if test $am_cv_usb_found = yes; then - AC_DEFINE(HAVE_USB,1,[Define if system supports USB]) - fi - - AC_MSG_RESULT($am_cv_usb_found) -]) - -dnl dnl From autoconf-archive, should be in macros dir dnl AC_DEFUN([AC_PROG_SWIG],[ @@ -277,9 +252,6 @@ AC_SUBST(PYTHON_EXTRA_LIBS) ]) -builtin(include,tcl.m4) - - # Copyright 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. diff -ruN obexftp-0.18.orig/apps/obexftp.c obexftp-0.18/apps/obexftp.c --- obexftp-0.18.orig/apps/obexftp.c 2006-01-12 03:27:04.000000000 +1000 +++ obexftp-0.18/apps/obexftp.c 2006-01-26 00:58:05.000000000 +1000 @@ -362,7 +362,6 @@ } -#ifdef HAVE_USB static void discover_cb(obex_t *handle, obex_object_t *object, int mode, int event, int obex_cmd, int obex_rsp) { (void) handle; @@ -376,7 +375,7 @@ static void discover_usb() { obex_t *handle; - obex_intf_info_t* obex_intf; + obex_interface_t *obex_intf; int i, interfaces_number; if(! (handle = OBEX_Init(OBEX_TRANS_USB, discover_cb, 0))) { @@ -393,7 +392,6 @@ printf("Use '-U interface_number' to connect\n"); OBEX_Cleanup(handle); } -#endif /* HAVE_USB */ int main(int argc, char *argv[]) @@ -450,9 +448,7 @@ {"bluetooth", optional_argument, NULL, 'b'}, #endif {"channel", required_argument, NULL, 'B'}, -#ifdef HAVE_USB {"usb", optional_argument, NULL, 'u'}, -#endif {"tty", required_argument, NULL, 't'}, {"network", required_argument, NULL, 'n'}, {"uuid", optional_argument, NULL, 'U'}, @@ -511,7 +507,6 @@ break; #endif /* HAVE_BLUETOOTH */ -#ifdef HAVE_USB case 'u': transport = OBEX_TRANS_USB; /* handle severed optional option argument */ @@ -523,7 +518,6 @@ discover_usb(); } break; -#endif /* HAVE_USB */ case 't': transport = OBEX_TRANS_CUSTOM; @@ -727,9 +721,7 @@ " -b, --bluetooth [] use or search a bluetooth device\n" " [ -B, --channel ] use this bluetooth channel when connecting\n" #endif -#ifdef HAVE_USB " -u, --usb [] connect to a usb interface or list interfaces\n" -#endif " -t, --tty connect to this tty using a custom transport\n" " -n, --network connect to this host\n\n" " -U, --uuid use given uuid (none, FBS, IRMC, S45)\n" diff -ruN obexftp-0.18.orig/config.h.in obexftp-0.18/config.h.in --- obexftp-0.18.orig/config.h.in 2006-01-12 03:21:47.000000000 +1000 +++ obexftp-0.18/config.h.in 2006-01-26 00:58:22.000000000 +1000 @@ -84,9 +84,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define if system supports USB */ -#undef HAVE_USB - /* Define as const if the declaration of iconv() needs const. */ #undef ICONV_CONST diff -ruN obexftp-0.18.orig/configure.in obexftp-0.18/configure.in --- obexftp-0.18.orig/configure.in 2005-12-23 08:50:54.000000000 +1000 +++ obexftp-0.18/configure.in 2006-01-26 00:57:00.000000000 +1000 @@ -21,13 +21,12 @@ AC_CHECK_HEADERS([arpa/inet.h errno.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h termios.h unistd.h sys/select.h]) # Checks for libraries. -AM_PATH_OPENOBEX(1.0.0) +PKG_CHECK_MODULES(OPENOBEX,openobex) AM_ICONV dnl IRDA_CHECK BLUETOOTH_CHECK SDPLIB_CHECK -USB_CHECK # check for optional swig rebuild AC_ARG_ENABLE([swig], diff -ruN obexftp-0.18.orig/obexftp/client.c obexftp-0.18/obexftp/client.c --- obexftp-0.18.orig/obexftp/client.c 2006-01-18 11:37:40.000000000 +1000 +++ obexftp-0.18/obexftp/client.c 2006-01-26 00:58:37.000000000 +1000 @@ -493,10 +493,8 @@ char *devicedup, *devicep; bdaddr_t bdaddr; #endif -#ifdef HAVE_USB int obex_intf_cnt; - obex_intf_info_t *obex_intf; -#endif + obex_interface_t *obex_intf; obex_object_t *object; int ret = -1; /* no connection yet */ @@ -559,7 +557,6 @@ break; #endif /* HAVE_BLUETOOTH */ -#ifdef HAVE_USB case OBEX_TRANS_USB: obex_intf_cnt = OBEX_FindInterfaces(cli->obexhandle, &obex_intf); DEBUG(3, "%s() \n", __func__); @@ -573,7 +570,6 @@ } else ret = OBEX_InterfaceConnect(cli->obexhandle, &obex_intf[port]); break; -#endif /* HAVE_USB */ default: ret = -ESOCKTNOSUPPORT;