diff options
| author | Koen Kooi <koen@openembedded.org> | 2005-06-30 08:19:37 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-06-30 08:19:37 +0000 |
| commit | c8e5702127e507e82e6f68a4b8c546803accea9d (patch) | |
| tree | 00583491f40ecc640f2b28452af995e3a63a09d7 /packages/libusb/libusb-0.1.8/configure.patch | |
| parent | 87ec8ca4d2e2eb4d1c1e1e1a6b46a395d56805b9 (diff) | |
import clean BK tree at cset 1.3670
Diffstat (limited to 'packages/libusb/libusb-0.1.8/configure.patch')
| -rw-r--r-- | packages/libusb/libusb-0.1.8/configure.patch | 99 |
1 files changed, 99 insertions, 0 deletions
diff --git a/packages/libusb/libusb-0.1.8/configure.patch b/packages/libusb/libusb-0.1.8/configure.patch index e69de29bb2..6f014a9dcd 100644 --- a/packages/libusb/libusb-0.1.8/configure.patch +++ b/packages/libusb/libusb-0.1.8/configure.patch @@ -0,0 +1,99 @@ +--- libusb-0.1.8/configure.in~configure.patch 2004-02-12 03:27:18.000000000 +1100 ++++ libusb-0.1.8/configure.in 2004-11-03 20:17:45.949802575 +1100 +@@ -1,10 +1,11 @@ + # 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]) + + AH_TOP( + #undef LINUX_API +@@ -29,8 +30,8 @@ + + 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?) +-ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], +- [AC_DIVERT_PUSH(NOTICE)]) ++dnl ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], ++dnl [AC_DIVERT_PUSH(NOTICE)]) + + # + # The following version number definitions apply to libusb +@@ -52,7 +53,7 @@ + LIBUSB_BINARY_AGE=4 + 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) +@@ -81,7 +82,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) +@@ -149,14 +150,14 @@ + + dnl figure debugging default, prior to $ac_help setup + dnl +-ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], +- [AC_DIVERT_PUSH(NOTICE)]) ++dnl ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], ++dnl [AC_DIVERT_PUSH(NOTICE)]) + 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) +@@ -207,15 +208,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_UNQUOTED(HAVE_OLD_DEV_USB_USB_H)]) + fi + +@@ -246,7 +243,7 @@ + + AM_CONDITIONAL(BUILD_DOCS, test "$build_docs" != "no") + +-AC_OUTPUT([ ++AC_CONFIG_FILES([ + Makefile + doc/Makefile + libusb.spec +@@ -255,5 +252,6 @@ + README + INSTALL.libusb + usb.h +-],[chmod +x libusb-config]) +- ++]) ++AC_CONFIG_COMMANDS([default],[[chmod +x libusb-config]],[[]]) ++AC_OUTPUT |