1 --- libusb-0.1.8/configure.in~configure.patch 2004-02-12 03:27:18.000000000 +1100
2 +++ libusb-0.1.8/configure.in 2004-11-03 20:17:45.949802575 +1100
4 # This configure.in is based off of the one that glib uses
6 # require atleast autoconf 2.13
10 # init autoconf (and check for presence of usb.c)
13 +AC_CONFIG_SRCDIR([usb.c])
19 dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
20 dnl are available for $ac_help expansion (don't we all *love* autoconf?)
21 -ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
22 - [AC_DIVERT_PUSH(NOTICE)])
23 +dnl ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
24 +dnl [AC_DIVERT_PUSH(NOTICE)])
27 # The following version number definitions apply to libusb
30 LIBUSB_VERSION=$LIBUSB_MAJOR_VERSION.$LIBUSB_MINOR_VERSION.$LIBUSB_MICRO_VERSION
33 +dnl AC_DIVERT_POP()dnl
35 AC_SUBST(LIBUSB_MAJOR_VERSION)
36 AC_SUBST(LIBUSB_MINOR_VERSION)
38 AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
40 # Specify a configuration file
41 -AM_CONFIG_HEADER(config.h)
42 +AC_CONFIG_HEADERS([config.h])
44 AC_DEFINE_UNQUOTED(LIBUSB_MAJOR_VERSION, $LIBUSB_MAJOR_VERSION)
45 AC_DEFINE_UNQUOTED(LIBUSB_MINOR_VERSION, $LIBUSB_MINOR_VERSION)
48 dnl figure debugging default, prior to $ac_help setup
50 -ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
51 - [AC_DIVERT_PUSH(NOTICE)])
52 +dnl ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
53 +dnl [AC_DIVERT_PUSH(NOTICE)])
54 if test `expr $LIBUSB_MINOR_VERSION \% 2` = 1 ; then
60 +dnl AC_DIVERT_POP()dnl
62 dnl declare --enable-* args and collect ac_help strings
63 AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default)
66 if test "$os_support" = "bsd"; then
67 AC_MSG_CHECKING(if dev/usb/usb.h uses new naming convention)
69 - [#include <dev/usb/usb.h>],
71 + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <dev/usb/usb.h>]], [[int main(void)
73 int a = ((struct usb_ctl_request *)0L)->ucr_addr;
76 - [AC_MSG_RESULT(yes)],
78 + }]])],[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
79 AC_DEFINE_UNQUOTED(HAVE_OLD_DEV_USB_USB_H)])
84 AM_CONDITIONAL(BUILD_DOCS, test "$build_docs" != "no")
95 -],[chmod +x libusb-config])
98 +AC_CONFIG_COMMANDS([default],[[chmod +x libusb-config]],[[]])