diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 137 |
1 files changed, 66 insertions, 71 deletions
@@ -652,6 +652,8 @@ INTF_SERIAL_LIB INTF_SERIAL INTF_LANPLUS_LIB INTF_LANPLUS +INTF_USB_LIB +INTF_USB INTF_LAN_LIB INTF_LAN BASEDIR @@ -675,8 +677,8 @@ DUMPBIN LD FGREP LIBTOOL -POW_LIB LIBOBJS +POW_LIB EGREP GREP CPP @@ -793,6 +795,7 @@ enable_libtool_lock enable_solaris_opt enable_internal_md5 enable_intf_lan +enable_intf_usb enable_intf_lanplus enable_intf_serial with_kerneldir @@ -1448,6 +1451,7 @@ Optional Features: --enable-solaris-opt enable all options for Solaris [default=no] --enable-internal-md5 enable internal MD5 library [default=no] --enable-intf-lan enable IPMIv1.5 LAN interface [default=yes] + --enable-intf-usb enable IPMI USB interface [default=yes] --enable-intf-lanplus enable IPMIv2.0 RMCP+ LAN interface [default=auto] --enable-intf-serial enable direct Serial Basic/Terminal mode interface [default=yes] @@ -2893,7 +2897,7 @@ fi # Define the identity of the package. PACKAGE=ipmitool - VERSION=1.8.15 + VERSION=1.8.16 cat >>confdefs.h <<_ACEOF @@ -4935,73 +4939,6 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h esac -for ac_header in stdlib.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" -if test "x$ac_cv_header_stdlib_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STDLIB_H 1 -_ACEOF - -fi - -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5 -$as_echo_n "checking for GNU libc compatible malloc... " >&6; } -if ${ac_cv_func_malloc_0_nonnull+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_func_malloc_0_nonnull=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined STDC_HEADERS || defined HAVE_STDLIB_H -# include <stdlib.h> -#else -char *malloc (); -#endif - -int -main () -{ -return ! malloc (0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_malloc_0_nonnull=yes -else - ac_cv_func_malloc_0_nonnull=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5 -$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; } -if test $ac_cv_func_malloc_0_nonnull = yes; then : - -$as_echo "#define HAVE_MALLOC 1" >>confdefs.h - -else - $as_echo "#define HAVE_MALLOC 0" >>confdefs.h - - case " $LIBOBJS " in - *" malloc.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS malloc.$ac_objext" - ;; -esac - - -$as_echo "#define malloc rpl_malloc" >>confdefs.h - -fi - - for ac_header in sys/select.h sys/socket.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -5226,7 +5163,7 @@ fi done -CFLAGS="$CFLAGS -fno-strict-aliasing -Wreturn-type" +CFLAGS="$CFLAGS -Wall -Wextra -std=c99 -pedantic -Wformat -Wformat-nonliteral" case `pwd` in *\ * | *\ *) @@ -12621,6 +12558,7 @@ fi xenable_intf_bmc=no xenable_intf_imb=yes xenable_intf_open=yes +xenable_intf_usb=yes xenable_intf_lipmi=yes #xenable_intf_serial=yes xenable_intf_dummy=no @@ -12698,6 +12636,39 @@ $as_echo "#define ENABLE_ALL_OPTIONS 1" >>confdefs.h fi +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <stdio.h> + +int +main () +{ + + struct test { + union { + int a; + unsigned int b; + }; + } test; + + printf("a is %d", test.a); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_need_fms_extension=no +else + ac_need_fms_extension=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +if test "x$ac_need_fms_extension" = "xyes"; then + CFLAGS="$CFLAGS -fms-extensions" + +fi + # Check whether --enable-internal-md5 was given. if test "${enable_internal_md5+set}" = set; then : enableval=$enable_internal_md5; xenable_internal_md5=$enableval @@ -12870,6 +12841,27 @@ $as_echo "#define IPMI_INTF_LAN 1" >>confdefs.h IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB lan/libintf_lan.la" fi +# Check whether --enable-intf-usb was given. +if test "${enable_intf_usb+set}" = set; then : + enableval=$enable_intf_usb; xenable_intf_usb=$enableval +else + xenable_intf_usb=yes +fi + +if test "x$xenable_intf_usb" = "xstatic" || test "x$xenable_intf_usb" = "xplugin"; then + xenable_intf_usb=yes +fi +if test "x$xenable_intf_usb" = "xyes"; then + +$as_echo "#define IPMI_INTF_USB 1" >>confdefs.h + + INTF_USB=usb + + INTF_USB_LIB=libintf_usb.la + + IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB usb/libintf_usb.la" +fi + # Check whether --enable-intf-lanplus was given. if test "${enable_intf_lanplus+set}" = set; then : enableval=$enable_intf_lanplus; xenable_intf_lanplus=$enableval @@ -13941,7 +13933,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_config_files="$ac_config_files Makefile doc/Makefile contrib/Makefile control/Makefile control/pkginfo control/prototype control/rpmmacros control/ipmitool.spec lib/Makefile include/Makefile include/ipmitool/Makefile src/Makefile src/plugins/Makefile src/plugins/lan/Makefile src/plugins/lanplus/Makefile src/plugins/open/Makefile src/plugins/free/Makefile src/plugins/imb/Makefile src/plugins/bmc/Makefile src/plugins/lipmi/Makefile src/plugins/serial/Makefile src/plugins/dummy/Makefile" +ac_config_files="$ac_config_files Makefile doc/Makefile contrib/Makefile control/Makefile control/pkginfo control/prototype control/rpmmacros control/ipmitool.spec lib/Makefile include/Makefile include/ipmitool/Makefile src/Makefile src/plugins/Makefile src/plugins/lan/Makefile src/plugins/lanplus/Makefile src/plugins/open/Makefile src/plugins/free/Makefile src/plugins/imb/Makefile src/plugins/bmc/Makefile src/plugins/usb/Makefile src/plugins/lipmi/Makefile src/plugins/serial/Makefile src/plugins/dummy/Makefile" cat >confcache <<\_ACEOF @@ -14968,6 +14960,7 @@ do "src/plugins/free/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/free/Makefile" ;; "src/plugins/imb/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/imb/Makefile" ;; "src/plugins/bmc/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/bmc/Makefile" ;; + "src/plugins/usb/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/usb/Makefile" ;; "src/plugins/lipmi/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/lipmi/Makefile" ;; "src/plugins/serial/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/serial/Makefile" ;; "src/plugins/dummy/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/dummy/Makefile" ;; @@ -16348,6 +16341,8 @@ $as_echo " free : $xenable_intf_free" >&6; } $as_echo " imb : $xenable_intf_imb" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: bmc : $xenable_intf_bmc" >&5 $as_echo " bmc : $xenable_intf_bmc" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: usb : $xenable_intf_usb" >&5 +$as_echo " usb : $xenable_intf_usb" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: lipmi : $xenable_intf_lipmi" >&5 $as_echo " lipmi : $xenable_intf_lipmi" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: serial : $xenable_intf_serial" >&5 |