GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-08-26 13:52:02 +00:00
Code Issues Releases Wiki Activity

Make autoconf always build for libusb.

Browse Source
This commit is contained in:
Con Kolivas 2013-08-30 14:47:53 +10:00
parent a99f15bc18
commit 748eda1faa
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
autogen.sh
View File

@ -1,7 +1,4 @@
#!/bin/sh #!/bin/sh
make clean
make maintainer-clean
bs_dir="$(dirname $(readlink -f $0))" 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
@ -17,6 +14,8 @@ autoheader --force
automake --add-missing --copy --force-missing automake --add-missing --copy --force-missing
autoconf --force autoconf --force
autoreconf -fi "${libusb_dir}"
if test -z "$NOCONFIGURE" ; then if test -z "$NOCONFIGURE" ; then
echo 'Configuring...' echo 'Configuring...'
"$bs_dir"/configure "$@" "$bs_dir"/configure "$@"

3
configure.ac
View File

@ -320,10 +320,10 @@ AM_CONDITIONAL([HAVE_CURSES], [test x$curses = xyes])
AM_CONDITIONAL([HAVE_WINDOWS], [test x$have_win32 = xtrue]) AM_CONDITIONAL([HAVE_WINDOWS], [test x$have_win32 = xtrue])
AM_CONDITIONAL([HAVE_x86_64], [test x$have_x86_64 = xtrue]) AM_CONDITIONAL([HAVE_x86_64], [test x$have_x86_64 = xtrue])
AC_CONFIG_SUBDIRS([compat/libusb-1.0])
if test "x$want_usbutils" != xfalse; then if test "x$want_usbutils" != xfalse; then
AC_DEFINE([USE_USBUTILS], [1], [Defined to 1 if usbutils support required]) AC_DEFINE([USE_USBUTILS], [1], [Defined to 1 if usbutils support required])
LIBUSB_LIBS="compat/libusb-1.0/libusb/.libs/libusb-1.0.a" LIBUSB_LIBS="compat/libusb-1.0/libusb/.libs/libusb-1.0.a"
AC_CONFIG_SUBDIRS([compat/libusb-1.0])
if test "x$have_linux" = "xtrue"; then if test "x$have_linux" = "xtrue"; then
PKG_CHECK_MODULES([UDEV], [libudev], LIBUSB_LIBS+=" -ludev", [AC_MSG_ERROR([Missing required libudev dev])]) PKG_CHECK_MODULES([UDEV], [libudev], LIBUSB_LIBS+=" -ludev", [AC_MSG_ERROR([Missing required libudev dev])])
fi fi
@ -428,7 +428,6 @@ 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
]) ])