autobuild: Fix two issues

The test for defining the automake conditional for the poll
implementation was keying off of the threads variable, producing
incorrect results for Cygwin.

A simple typo in the Makefile causes a build failure when
cross-compiling for Windows.

Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>

diff --git a/configure.ac b/configure.ac
index 4b8752a..a273688 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -186,8 +186,8 @@ AM_CONDITIONAL([OS_NULL], [test "x$backend" = xnull])
 AM_CONDITIONAL([OS_OPENBSD], [test "x$backend" = xopenbsd])
 AM_CONDITIONAL([OS_SUNOS], [test "x$backend" = xsunos])
 AM_CONDITIONAL([OS_WINDOWS], [test "x$backend" = xwindows])
-AM_CONDITIONAL([POLL_POSIX], [test "x$threads" = xposix])
-AM_CONDITIONAL([POLL_WINDOWS], [test "x$threads" = xwindows])
+AM_CONDITIONAL([POLL_POSIX], [test "x$poll" = xposix])
+AM_CONDITIONAL([POLL_WINDOWS], [test "x$poll" = xwindows])
 AM_CONDITIONAL([THREADS_POSIX], [test "x$threads" = xposix])
 AM_CONDITIONAL([THREADS_WINDOWS], [test "x$threads" = xwindows])
 AM_CONDITIONAL([CREATE_IMPORT_LIB], [test "x$create_import_lib" = xyes])

diff --git a/libusb/Makefile.am b/libusb/Makefile.am
index 1e09222..5adba7c 100644 (file)
--- a/libusb/Makefile.am
+++ b/libusb/Makefile.am
@@ -31,7 +31,7 @@ OS_NULL_SRC = os/null_usb.c
 OS_OPENBSD_SRC = os/openbsd_usb.c
 OS_SUNOS_SRC = os/sunos_usb.h os/sunos_usb.c
 OS_WINDOWS_SRC = libusb-1.0.def libusb-1.0.rc \
-                os/windows_common.h ps/windows_common.c \
+                os/windows_common.h os/windows_common.c \
                 os/windows_usbdk.h os/windows_usbdk.c \
                 os/windows_winusb.h os/windows_winusb.c
 

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index b691456..eb561c0 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11448
+#define LIBUSB_NANO 11449