diff --git a/ChangeLog b/ChangeLog index 0087e20bc..57d5d2160 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-02-28 Stéphane Voltz + * configure.in configure: restored HAVE_USBCALLS like initially + committed for OS/2 support + 2013-03-04 Oliver Schwartz * backend/snapscan-options.c backend/snapscan-scsi.c backend/snapscan.c backend/snapscan-sources.c backend/snapscan.h diff --git a/configure b/configure index a721832ce..69ec32908 100755 --- a/configure +++ b/configure @@ -9851,7 +9851,7 @@ if test "$HAVE_USB" = "yes"; then case ${host_os} in os2*) -$as_echo "#define HAVE_USBCALL 1" >>confdefs.h +$as_echo "#define HAVE_USBCALLS 1" >>confdefs.h ;; *) diff --git a/configure.in b/configure.in index e8f3fa9d3..90fc7c9f8 100644 --- a/configure.in +++ b/configure.in @@ -418,7 +418,7 @@ fi if test "$HAVE_USB" = "yes"; then case ${host_os} in os2*) - AC_DEFINE(HAVE_USBCALL, 1, [Define to 1 if you have usbcall.dll.]) + AC_DEFINE(HAVE_USBCALLS, 1, [Define to 1 if you have usbcall.dll.]) ;; *) if test "$have_libusb_1_0" = "yes"; then diff --git a/include/sane/config.h.in b/include/sane/config.h.in index 23dde638c..c62938b3c 100644 --- a/include/sane/config.h.in +++ b/include/sane/config.h.in @@ -421,7 +421,7 @@ #undef HAVE_UNISTD_H /* Define to 1 if you have usbcall.dll. */ -#undef HAVE_USBCALL +#undef HAVE_USBCALLS /* Define to 1 if you have the `usleep' function. */ #undef HAVE_USLEEP