diff options
author | Douglas Gilbert <dgilbert@interlog.com> | 2017-12-29 18:23:19 +0000 |
---|---|---|
committer | Douglas Gilbert <dgilbert@interlog.com> | 2017-12-29 18:23:19 +0000 |
commit | b29ef85867d5347e8fed4c603986964868cba801 (patch) | |
tree | 6c39b1855f97dc416307229654713d9aed4c8d54 /configure | |
parent | 766b77d70276eef4a6ae92217d1ffbcde819a88b (diff) | |
download | sg3_utils-b29ef85867d5347e8fed4c603986964868cba801.tar.gz |
sg_ses: further NVMe support work; decode array status dpage (obsolete); build: add SG_LIB_ANDROID
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@738 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 191 |
1 files changed, 190 insertions, 1 deletions
@@ -635,6 +635,8 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +OS_ANDROID_FALSE +OS_ANDROID_TRUE OS_WIN32_CYGWIN_FALSE OS_WIN32_CYGWIN_TRUE OS_WIN32_MINGW_FALSE @@ -784,6 +786,7 @@ enable_libtool_lock enable_linuxbsg enable_win32_spt_direct enable_scsistrings +enable_nvme_supp ' ac_precious_vars='build_alias host_alias @@ -1441,7 +1444,9 @@ Optional Features: --disable-linuxbsg option ignored, this is placeholder --enable-win32-spt-direct enable Win32 SPT Direct - --disable-scsistrings Disable full SCSI sense strings + --disable-scsistrings Disable full SCSI sense strings and NVMe status + strings + --disable-nvme-supp remove all or most NVMe code Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -12355,6 +12360,122 @@ _ACEOF fi done +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_cancel" >&5 +$as_echo_n "checking for library containing pthread_cancel... " >&6; } +if ${ac_cv_search_pthread_cancel+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_cancel (); +int +main () +{ +return pthread_cancel (); + ; + return 0; +} +_ACEOF +for ac_lib in '' pthread; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_pthread_cancel=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_pthread_cancel+:} false; then : + break +fi +done +if ${ac_cv_search_pthread_cancel+:} false; then : + +else + ac_cv_search_pthread_cancel=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_cancel" >&5 +$as_echo "$ac_cv_search_pthread_cancel" >&6; } +ac_res=$ac_cv_search_pthread_cancel +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +$as_echo "#define HAVE_PTHREAD_CANCEL 1" >>confdefs.h + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_kill" >&5 +$as_echo_n "checking for library containing pthread_kill... " >&6; } +if ${ac_cv_search_pthread_kill+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_kill (); +int +main () +{ +return pthread_kill (); + ; + return 0; +} +_ACEOF +for ac_lib in '' pthread; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_pthread_kill=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_pthread_kill+:} false; then : + break +fi +done +if ${ac_cv_search_pthread_kill+:} false; then : + +else + ac_cv_search_pthread_kill=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_kill" >&5 +$as_echo "$ac_cv_search_pthread_kill" >&6; } +ac_res=$ac_cv_search_pthread_kill +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +$as_echo "#define HAVE_PTHREAD_KILL 1" >>confdefs.h + +fi + @@ -12448,6 +12569,52 @@ fi done ;; + *-*-android*) + +cat >>confdefs.h <<_ACEOF +#define SG_LIB_ANDROID 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define SG_LIB_LINUX 1 +_ACEOF + + os_cflags='' + + os_libs='' + + for ac_header in linux/nvme_ioctl.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "linux/nvme_ioctl.h" "ac_cv_header_linux_nvme_ioctl_h" "$ac_includes_default" +if test "x$ac_cv_header_linux_nvme_ioctl_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LINUX_NVME_IOCTL_H 1 +_ACEOF + +$as_echo "#define HAVE_NVME 1" >>confdefs.h + +fi + +done + + for ac_header in linux/types.h linux/bsg.h linux/kdev_t.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_LINUX_TYPES_H + # include <linux/types.h> + #endif + +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + ;; *-*-freebsd*|*-*-kfreebsd*-gnu*) cat >>confdefs.h <<_ACEOF @@ -12598,6 +12765,14 @@ else OS_WIN32_CYGWIN_FALSE= fi + if echo $host_os | grep 'android' > /dev/null; then + OS_ANDROID_TRUE= + OS_ANDROID_FALSE='#' +else + OS_ANDROID_TRUE='#' + OS_ANDROID_FALSE= +fi + # Check whether --enable-linuxbsg was given. if test "${enable_linuxbsg+set}" = set; then : @@ -12632,6 +12807,16 @@ _ACEOF fi +# Check whether --enable-nvme-supp was given. +if test "${enable_nvme_supp+set}" = set; then : + enableval=$enable_nvme_supp; +cat >>confdefs.h <<_ACEOF +#define IGNORE_NVME 1 +_ACEOF + +fi + + ac_config_files="$ac_config_files Makefile include/Makefile lib/Makefile src/Makefile doc/Makefile scripts/Makefile" cat >confcache <<\_ACEOF @@ -12794,6 +12979,10 @@ if test -z "${OS_WIN32_CYGWIN_TRUE}" && test -z "${OS_WIN32_CYGWIN_FALSE}"; then as_fn_error $? "conditional \"OS_WIN32_CYGWIN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${OS_ANDROID_TRUE}" && test -z "${OS_ANDROID_FALSE}"; then + as_fn_error $? "conditional \"OS_ANDROID\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 |