Browse Source

More autoconf buggery.

Con Kolivas 12 years ago
parent
commit
a99f15bc18
2 changed files with 6 additions and 7 deletions
  1. 5 7
      autogen.sh
  2. 1 0
      configure.ac

+ 5 - 7
autogen.sh

@@ -6,18 +6,16 @@ bs_dir="$(dirname $(readlink -f $0))"
 rm -rf "${bs_dir}"/autom4te.cache
 rm -rf "${bs_dir}"/autom4te.cache
 rm -f "${bs_dir}"/aclocal.m4 "${bs_dir}"/ltmain.sh
 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...'
 echo 'Running autoreconf -if...'
 aclocal --force -I m4
 aclocal --force -I m4
 libtoolize --install --copy --force
 libtoolize --install --copy --force
-autoconf --force
 autoheader --force
 autoheader --force
 automake --add-missing --copy --force-missing
 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
 if test -z "$NOCONFIGURE" ; then
 	echo 'Configuring...'
 	echo 'Configuring...'

+ 1 - 0
configure.ac

@@ -428,6 +428,7 @@ AC_CONFIG_FILES([
 	Makefile
 	Makefile
 	compat/Makefile
 	compat/Makefile
 	compat/jansson/Makefile
 	compat/jansson/Makefile
+	compat/libusb-1.0/Makefile
 	ccan/Makefile
 	ccan/Makefile
 	lib/Makefile
 	lib/Makefile
 	])
 	])