|
@@ -182,7 +182,7 @@ m4_define([BFG_PTHREAD_FLAG_CHECK],
|
|
|
fi
|
|
fi
|
|
|
$2
|
|
$2
|
|
|
break 2
|
|
break 2
|
|
|
- ],[])
|
|
|
|
|
|
|
+ ])
|
|
|
done
|
|
done
|
|
|
done
|
|
done
|
|
|
)
|
|
)
|
|
@@ -293,7 +293,7 @@ PKG_CHECK_MODULES([LIBUSB], [libusb-1.0],[
|
|
|
AC_CHECK_LIB($usb_lib, libusb_init, [
|
|
AC_CHECK_LIB($usb_lib, libusb_init, [
|
|
|
libusb=yes
|
|
libusb=yes
|
|
|
break
|
|
break
|
|
|
- ], [])
|
|
|
|
|
|
|
+ ])
|
|
|
done
|
|
done
|
|
|
if test "x$libusb" = xyes; then
|
|
if test "x$libusb" = xyes; then
|
|
|
AC_CHECK_DECL([libusb_init],[
|
|
AC_CHECK_DECL([libusb_init],[
|
|
@@ -362,7 +362,7 @@ if test "x$libusb" = xyes; then
|
|
|
AC_DEFINE([HAVE_LIBUSB], [1], [Define if you have libusb-1.0])
|
|
AC_DEFINE([HAVE_LIBUSB], [1], [Define if you have libusb-1.0])
|
|
|
save_CFLAGS="$CFLAGS"
|
|
save_CFLAGS="$CFLAGS"
|
|
|
CFLAGS="$LIBUSB_CFLAGS $CFLAGS"
|
|
CFLAGS="$LIBUSB_CFLAGS $CFLAGS"
|
|
|
- AC_CHECK_DECLS([libusb_error_name],[],[],[#include <libusb.h>])
|
|
|
|
|
|
|
+ AC_CHECK_DECLS([libusb_error_name],[true],[true],[#include <libusb.h>])
|
|
|
CFLAGS="$save_CFLAGS"
|
|
CFLAGS="$save_CFLAGS"
|
|
|
fi
|
|
fi
|
|
|
|
|
|
|
@@ -452,7 +452,7 @@ else
|
|
|
fi
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
|
-AC_ARG_WITH([system-libblkmaker], [AC_HELP_STRING([--with-system-libblkmaker], [Use system libblkmaker rather than bundled one (default disabled)])],[],[with_system_libblkmaker=no])
|
|
|
|
|
|
|
+AC_ARG_WITH([system-libblkmaker], [AC_HELP_STRING([--with-system-libblkmaker], [Use system libblkmaker rather than bundled one (default disabled)])],[true],[with_system_libblkmaker=no])
|
|
|
if test "x$with_system_libblkmaker" = "xyes"; then
|
|
if test "x$with_system_libblkmaker" = "xyes"; then
|
|
|
PKG_CHECK_MODULES([libblkmaker],[libblkmaker_jansson-0.1],[
|
|
PKG_CHECK_MODULES([libblkmaker],[libblkmaker_jansson-0.1],[
|
|
|
true
|
|
true
|
|
@@ -642,7 +642,7 @@ for sym in bswap_ __builtin_bswap __bswap_ __swap swap OSSwapInt; do
|
|
|
AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_$headerfile]), 1)
|
|
AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_$headerfile]), 1)
|
|
|
fi
|
|
fi
|
|
|
break 2
|
|
break 2
|
|
|
- ],[])
|
|
|
|
|
|
|
+ ])
|
|
|
done
|
|
done
|
|
|
AC_MSG_RESULT([no])
|
|
AC_MSG_RESULT([no])
|
|
|
done
|
|
done
|