From 342ebce798fe98ede64939a49bbc3770d8214649 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sun, 8 May 2016 22:59:02 +0200
Subject: Imported Upstream version 1.8.17

---
 configure.ac | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index a1bcf38..16c8305 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 dnl
 dnl autoconf for ipmitool
 dnl
-AC_INIT([src/ipmitool.c])
+AC_INIT([ipmitool], [1.8.17])
+AC_CONFIG_SRCDIR([src/ipmitool.c])
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([ipmitool], [1.8.16])
+AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
-AC_CONFIG_SRCDIR([src/ipmitool.c])
 AC_PREREQ(2.50)
 AC_SUBST(ac_configure_args)
 
@@ -32,7 +32,7 @@ AC_CHECK_FUNCS([alarm gethostbyname getaddrinfo getifaddrs socket select])
 AC_CHECK_FUNCS([memmove memset strchr strdup strerror])
 AC_CHECK_FUNCS([getpassphrase])
 
-CFLAGS="$CFLAGS -Wall -Wextra -std=c99 -pedantic -Wformat -Wformat-nonliteral"
+CFLAGS="$CFLAGS -Wall -Wextra -std=gnu99 -pedantic -Wformat -Wformat-nonliteral"
 
 AM_PROG_LIBTOOL
 LIBTOOL="$LIBTOOL --silent"
@@ -89,6 +89,7 @@ solaris*)
 	xenable_intf_open=no
 	xenable_intf_lipmi=no
 	xenable_intf_bmc=no
+	xenable_intf_usb=no
 	;;
 *darwin*|aix*)
 	# disable the linux and solaris-specific interfaces
@@ -97,6 +98,7 @@ solaris*)
 	xenable_intf_lipmi=no
 	xenable_intf_bmc=no
 	xenable_ipmishell=no
+	xenable_intf_usb=no
 	;;
 *freebsd*)
 	xenable_intf_imb=no
@@ -201,9 +203,9 @@ fi
 dnl enable IPMI USB interface
 AC_ARG_ENABLE([intf-usb],
 	[AC_HELP_STRING([--enable-intf-usb],
-			[enable IPMI USB interface [default=yes]])],
+			[enable IPMI USB interface [default=auto]])],
 		[xenable_intf_usb=$enableval],
-		[xenable_intf_usb=yes])
+		[xenable_intf_usb=$xenable_intf_usb])
 if test "x$xenable_intf_usb" = "xstatic" || test "x$xenable_intf_usb" = "xplugin"; then
    xenable_intf_usb=yes
 fi
-- 
cgit v1.2.3