Commit a99f15bc1884d8692d363b0b6bb6f80fa3844850
2013-08-30T14:38:12
More autoconf buggery.
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
diff --git a/autogen.sh b/autogen.sh
index 3f3088e..c9a8432 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,18 +6,16 @@ bs_dir="$(dirname $(readlink -f $0))"
rm -rf "${bs_dir}"/autom4te.cache
rm -f "${bs_dir}"/aclocal.m4 "${bs_dir}"/ltmain.sh
+libusb_dir="${bs_dir}"/compat/libusb-1.0/
+rm -rf "${libusb_dir}"/autom4te.cache
+rm -rf "${libusb_dir}"/aclocal.m4 "${libusb_dir}"/ltmain.sh
+
echo 'Running autoreconf -if...'
aclocal --force -I m4
libtoolize --install --copy --force
-autoconf --force
autoheader --force
automake --add-missing --copy --force-missing
-
-libusb_dir="${bs_dir}"/compat/libusb-1.0/
-rm -rf "${libusb_dir}"/autom4te.cache
-rm -rf "${libusb_dir}"/aclocal.m4 "${libusb_dir}"/ltmain.sh
-
-autoreconf -fi "${libusb_dir}"
+autoconf --force
if test -z "$NOCONFIGURE" ; then
echo 'Configuring...'
diff --git a/configure.ac b/configure.ac
index 9e81672..a76fd32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -428,6 +428,7 @@ AC_CONFIG_FILES([
Makefile
compat/Makefile
compat/jansson/Makefile
+ compat/libusb-1.0/Makefile
ccan/Makefile
lib/Makefile
])