From ae1124c112c88e807fb5f500846c9b12ea882122 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Wed, 2 May 2012 12:06:36 +0100 Subject: Autotools: Add bootstrap.sh bootstrap.sh does not invoke configure whereas autogen.sh does. This allows libusbx users to choose the one that suits them best. --- autogen.sh | 17 +---------------- bootstrap.sh | 17 +++++++++++++++++ libusb/version.h | 2 +- 3 files changed, 19 insertions(+), 17 deletions(-) create mode 100755 bootstrap.sh diff --git a/autogen.sh b/autogen.sh index 782bec7..5872540 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,18 +1,3 @@ #!/bin/sh - -# use libtoolize if available, otherwise look for glibtoolize (darwin) -if (libtoolize --version) < /dev/null > /dev/null 2>&1; then - LIBTOOLIZE=libtoolize -elif (glibtoolize --version) < /dev/null > /dev/null 2>&1; then - LIBTOOLIZE=glibtoolize -else - echo "libtoolize or glibtoolize was not found! Please install libtool." - exit -fi - -$LIBTOOLIZE --copy --force || exit 1 -aclocal || exit 1 -autoheader || exit 1 -autoconf || exit 1 -automake -a -c || exit 1 +source ./bootstrap.sh ./configure --enable-maintainer-mode --enable-examples-build $* diff --git a/bootstrap.sh b/bootstrap.sh new file mode 100755 index 0000000..3e9574a --- /dev/null +++ b/bootstrap.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +# use libtoolize if available, otherwise look for glibtoolize (darwin) +if (libtoolize --version) < /dev/null > /dev/null 2>&1; then + LIBTOOLIZE=libtoolize +elif (glibtoolize --version) < /dev/null > /dev/null 2>&1; then + LIBTOOLIZE=glibtoolize +else + echo "libtoolize or glibtoolize was not found! Please install libtool." + exit +fi + +$LIBTOOLIZE --copy --force || exit 1 +aclocal || exit 1 +autoheader || exit 1 +autoconf || exit 1 +automake -a -c || exit 1 diff --git a/libusb/version.h b/libusb/version.h index 3862ed5..5fd6719 100644 --- a/libusb/version.h +++ b/libusb/version.h @@ -9,7 +9,7 @@ #define LIBUSB_MICRO 10 #endif #ifndef LIBUSB_NANO -#define LIBUSB_NANO 10486 +#define LIBUSB_NANO 10487 #endif /* LIBUSB_RC is the release candidate suffix. Should normally be empty. */ #ifndef LIBUSB_RC -- cgit v1.2.1