From a8c8969925d5d79f7b09463ee2110d9ebeb283e1 Mon Sep 17 00:00:00 2001 From: Henning Geinitz Date: Wed, 3 Jul 2002 12:09:29 +0000 Subject: [PATCH] Check for usb_get_busses to make sure, we have at least version 0.1.6 of libusb. Fixed strncasecomp test for OS/2. Henning Meier-Geinitz --- configure | 14 +++++++------- configure.in | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 4056b47f2..77d0e643e 100755 --- a/configure +++ b/configure @@ -3179,9 +3179,9 @@ fi # FreeBSD 3+ needs this if test "${ac_cv_header_usb_h}" = "yes" ; then - echo $ac_n "checking for usb_open in -lusb""... $ac_c" 1>&6 -echo "configure:3184: checking for usb_open in -lusb" >&5 -ac_lib_var=`echo usb'_'usb_open | sed 'y%./+-%__p_%'` + echo $ac_n "checking for usb_get_busses in -lusb""... $ac_c" 1>&6 +echo "configure:3184: checking for usb_get_busses in -lusb" >&5 +ac_lib_var=`echo usb'_'usb_get_busses | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3193,10 +3193,10 @@ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then @@ -3226,7 +3226,7 @@ else echo "$ac_t""no" 1>&6 fi - if test "${ac_cv_lib_usb_usb_open}" = "yes" ; then + if test "${ac_cv_lib_usb_usb_get_busses}" = "yes" ; then HAVE_LIBUSB="yes" fi fi @@ -4413,7 +4413,7 @@ done -if test "$ac_cv_header_os2_h" == "yes" ; then +if test "$ac_cv_header_os2_h" = "yes" ; then cat >> confdefs.h <<\EOF #define strncasecmp strnicmp EOF diff --git a/configure.in b/configure.in index d78124880..c5270b07d 100644 --- a/configure.in +++ b/configure.in @@ -240,8 +240,8 @@ AC_CHECK_LIB(scsi, scsireq_enter) # FreeBSD needs this AC_CHECK_LIB(cam, cam_open_device) # FreeBSD 3+ needs this if test "${ac_cv_header_usb_h}" = "yes" ; then - AC_CHECK_LIB(usb, usb_open) - if test "${ac_cv_lib_usb_usb_open}" = "yes" ; then + AC_CHECK_LIB(usb, usb_get_busses) + if test "${ac_cv_lib_usb_usb_get_busses}" = "yes" ; then HAVE_LIBUSB="yes" fi fi @@ -278,7 +278,7 @@ AC_CHECK_FUNCS(atexit inet_addr inet_aton inet_ntoa ioperm mkdir \ AC_REPLACE_FUNCS(getenv inet_ntop inet_pton isfdtype sigprocmask snprintf \ strdup strndup strsep usleep vsyslog) -if test "$ac_cv_header_os2_h" == "yes" ; then +if test "$ac_cv_header_os2_h" = "yes" ; then AC_DEFINE(strncasecmp,strnicmp,[Define for OS/2 only]) fi