Link Here
|
1 |
--- configure.orig 2008-03-20 16:57:56.000000000 +0300 |
|
|
2 |
+++ configure 2009-03-07 23:40:53.000000000 +0300 |
3 |
@@ -20182,113 +20182,10 @@ |
4 |
{ echo "$as_me:$LINENO: checking for LIBUSB" >&5 |
5 |
echo $ECHO_N "checking for LIBUSB... $ECHO_C" >&6; } |
6 |
|
7 |
-if test -n "$PKG_CONFIG"; then |
8 |
- if test -n "$LIBUSB_CFLAGS"; then |
9 |
- pkg_cv_LIBUSB_CFLAGS="$LIBUSB_CFLAGS" |
10 |
- else |
11 |
- if test -n "$PKG_CONFIG" && \ |
12 |
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"libusb\"\"") >&5 |
13 |
- ($PKG_CONFIG --exists --print-errors ""libusb"") 2>&5 |
14 |
- ac_status=$? |
15 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
16 |
- (exit $ac_status); }; then |
17 |
- pkg_cv_LIBUSB_CFLAGS=`$PKG_CONFIG --cflags ""libusb"" 2>/dev/null` |
18 |
-else |
19 |
- pkg_failed=yes |
20 |
-fi |
21 |
- fi |
22 |
-else |
23 |
- pkg_failed=untried |
24 |
-fi |
25 |
-if test -n "$PKG_CONFIG"; then |
26 |
- if test -n "$LIBUSB_LIBS"; then |
27 |
- pkg_cv_LIBUSB_LIBS="$LIBUSB_LIBS" |
28 |
- else |
29 |
- if test -n "$PKG_CONFIG" && \ |
30 |
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"libusb\"\"") >&5 |
31 |
- ($PKG_CONFIG --exists --print-errors ""libusb"") 2>&5 |
32 |
- ac_status=$? |
33 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
34 |
- (exit $ac_status); }; then |
35 |
- pkg_cv_LIBUSB_LIBS=`$PKG_CONFIG --libs ""libusb"" 2>/dev/null` |
36 |
-else |
37 |
- pkg_failed=yes |
38 |
-fi |
39 |
- fi |
40 |
-else |
41 |
- pkg_failed=untried |
42 |
-fi |
43 |
- |
44 |
- |
45 |
- |
46 |
-if test $pkg_failed = yes; then |
47 |
- |
48 |
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
49 |
- _pkg_short_errors_supported=yes |
50 |
-else |
51 |
- _pkg_short_errors_supported=no |
52 |
-fi |
53 |
- if test $_pkg_short_errors_supported = yes; then |
54 |
- LIBUSB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""libusb""` |
55 |
- else |
56 |
- LIBUSB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""libusb""` |
57 |
- fi |
58 |
- # Put the nasty error message in config.log where it belongs |
59 |
- echo "$LIBUSB_PKG_ERRORS" >&5 |
60 |
- |
61 |
- { { echo "$as_me:$LINENO: error: Package requirements (\"libusb\") were not met: |
62 |
- |
63 |
-$LIBUSB_PKG_ERRORS |
64 |
- |
65 |
-Consider adjusting the PKG_CONFIG_PATH environment variable if you |
66 |
-installed software in a non-standard prefix. |
67 |
- |
68 |
-Alternatively, you may set the environment variables LIBUSB_CFLAGS |
69 |
-and LIBUSB_LIBS to avoid the need to call pkg-config. |
70 |
-See the pkg-config man page for more details. |
71 |
-" >&5 |
72 |
-echo "$as_me: error: Package requirements (\"libusb\") were not met: |
73 |
- |
74 |
-$LIBUSB_PKG_ERRORS |
75 |
- |
76 |
-Consider adjusting the PKG_CONFIG_PATH environment variable if you |
77 |
-installed software in a non-standard prefix. |
78 |
- |
79 |
-Alternatively, you may set the environment variables LIBUSB_CFLAGS |
80 |
-and LIBUSB_LIBS to avoid the need to call pkg-config. |
81 |
-See the pkg-config man page for more details. |
82 |
-" >&2;} |
83 |
- { (exit 1); exit 1; }; } |
84 |
-elif test $pkg_failed = untried; then |
85 |
- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it |
86 |
-is in your PATH or set the PKG_CONFIG environment variable to the full |
87 |
-path to pkg-config. |
88 |
- |
89 |
-Alternatively, you may set the environment variables LIBUSB_CFLAGS |
90 |
-and LIBUSB_LIBS to avoid the need to call pkg-config. |
91 |
-See the pkg-config man page for more details. |
92 |
- |
93 |
-To get pkg-config, see <http://pkg-config.freedesktop.org/>. |
94 |
-See \`config.log' for more details." >&5 |
95 |
-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it |
96 |
-is in your PATH or set the PKG_CONFIG environment variable to the full |
97 |
-path to pkg-config. |
98 |
- |
99 |
-Alternatively, you may set the environment variables LIBUSB_CFLAGS |
100 |
-and LIBUSB_LIBS to avoid the need to call pkg-config. |
101 |
-See the pkg-config man page for more details. |
102 |
- |
103 |
-To get pkg-config, see <http://pkg-config.freedesktop.org/>. |
104 |
-See \`config.log' for more details." >&2;} |
105 |
- { (exit 1); exit 1; }; } |
106 |
-else |
107 |
- LIBUSB_CFLAGS=$pkg_cv_LIBUSB_CFLAGS |
108 |
- LIBUSB_LIBS=$pkg_cv_LIBUSB_LIBS |
109 |
+ LIBUSB_CFLAGS="" |
110 |
+ LIBUSB_LIBS="-lusb" |
111 |
{ echo "$as_me:$LINENO: result: yes" >&5 |
112 |
echo "${ECHO_T}yes" >&6; } |
113 |
- : |
114 |
-fi |
115 |
- |
116 |
|
117 |
|
118 |
# check for OpenSSL's libcrypto |