summaryrefslogtreecommitdiff
path: root/libusb/libusb-0.1.7/configure.patch
blob: 5f78908da200432fb5aebea7c07040b663e5dfea (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99

#
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
#

--- libusb-0.1.7/configure.in~configure
+++ libusb-0.1.7/configure.in
@@ -1,17 +1,18 @@
 # This configure.in is based off of the one that glib uses
 
 # require atleast autoconf 2.13
-AC_PREREQ(2.13)
+AC_PREREQ(2.57)
 
 # init autoconf (and check for presence of usb.c)
-AC_INIT(usb.c)
+AC_INIT
+AC_CONFIG_SRCDIR([usb.c])
 
 # Save this value here, since automake will set cflags later
 cflags_set=${CFLAGS+set}
 
 dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
 dnl are available for $ac_help expansion (don't we all *love* autoconf?)
-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
+dnl AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 
 #
 # The following version number definitions apply to libusb
@@ -33,7 +34,7 @@
 LIBUSB_BINARY_AGE=3
 LIBUSB_VERSION=$LIBUSB_MAJOR_VERSION.$LIBUSB_MINOR_VERSION.$LIBUSB_MICRO_VERSION
 dnl
-AC_DIVERT_POP()dnl
+dnl AC_DIVERT_POP()dnl
 
 AC_SUBST(LIBUSB_MAJOR_VERSION)
 AC_SUBST(LIBUSB_MINOR_VERSION)
@@ -62,7 +63,7 @@
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
 
 # Specify a configuration file
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 
 AC_DEFINE_UNQUOTED(LIBUSB_MAJOR_VERSION, $LIBUSB_MAJOR_VERSION)
 AC_DEFINE_UNQUOTED(LIBUSB_MINOR_VERSION, $LIBUSB_MINOR_VERSION)
@@ -111,13 +112,13 @@
 
 dnl figure debugging default, prior to $ac_help setup
 dnl
-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
+dnl AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 if test `expr $LIBUSB_MINOR_VERSION \% 2` = 1 ; then
   debug_default=yes
 else
   debug_default=minimum
 fi
-AC_DIVERT_POP()dnl
+dnl AC_DIVERT_POP()dnl
 
 dnl declare --enable-* args and collect ac_help strings
 AC_ARG_ENABLE(debug, [  --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default)
@@ -175,15 +176,11 @@
 
 if test "$os_support" = "bsd"; then
   AC_MSG_CHECKING(if dev/usb/usb.h uses new naming convention)
-  AC_TRY_COMPILE(
-    [#include <dev/usb/usb.h>],
-    [int main(void)
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <dev/usb/usb.h>]], [[int main(void)
      {
        int a = ((struct usb_ctl_request *)0L)->ucr_addr;
        return 0;
-     }],
-    [AC_MSG_RESULT(yes)],
-    [AC_MSG_RESULT(no)
+     }]])],[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
     AC_DEFINE(HAVE_OLD_DEV_USB_USB_H)])
 fi
 
@@ -214,7 +211,7 @@
 
 AM_CONDITIONAL(BUILD_DOCS, test "$build_docs" != "no")
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
   Makefile
   doc/Makefile
   libusb.spec
@@ -223,5 +220,7 @@
   README
   INSTALL.libusb
   usb.h
-],[chmod +x libusb-config])
+])
+AC_CONFIG_COMMANDS([default],[[chmod +x libusb-config]],[[]])
+AC_OUTPUT