Merge branch 'release/debian/3.1.4-1'debian/3.1.4-1

1 files changed, 16 insertions, 15 deletions

diff --git a/configure b/configure
index 0194dbe..efb787b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for ipmiutil 3.1.3.
+# Generated by GNU Autoconf 2.63 for ipmiutil 3.1.4.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -743,8 +743,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='ipmiutil'
 PACKAGE_TARNAME='ipmiutil'
-PACKAGE_VERSION='3.1.3'
-PACKAGE_STRING='ipmiutil 3.1.3'
+PACKAGE_VERSION='3.1.4'
+PACKAGE_STRING='ipmiutil 3.1.4'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="util/ipmiutil.c"
@@ -1503,7 +1503,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ipmiutil 3.1.3 to adapt to many kinds of systems.
+\`configure' configures ipmiutil 3.1.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1573,7 +1573,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ipmiutil 3.1.3:";;
+     short | recursive ) echo "Configuration of ipmiutil 3.1.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1589,7 +1589,7 @@ Optional Features:
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-landesk       adds landesk library support [default=no]
-  --disable-lanplus      disable lanplus support [default=enabled]
+  --enable-lanplus      enable lanplus support (default=yes)
   --enable-sha256        build with SHA256 support, requires later openssl.
   --enable-ekanalyzer        build with ekanalyzer function enabled.
   --enable-useflags    include environment CFLAGS and LDFLAGS.
@@ -1683,7 +1683,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ipmiutil configure 3.1.3
+ipmiutil configure 3.1.4
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1697,7 +1697,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ipmiutil $as_me 3.1.3, which was
+It was created by ipmiutil $as_me 3.1.4, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2551,7 +2551,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ipmiutil'
- VERSION='3.1.3'
+ VERSION='3.1.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13037,10 +13037,9 @@ fi
 
 # Check whether --enable-lanplus was given.
 if test "${enable_lanplus+set}" = set; then
-  enableval=$enable_lanplus;
-fi
-
-if test "x$enable_lanplus" = "xno"; then
+  enableval=$enable_lanplus; default=yes
+else
+  if test "x$enableval" = "xno"; then
 	drv_lanplus=""
 	LANPLUS_CFLAGS=""
 	LANPLUS_LDADD=""
@@ -13059,6 +13058,8 @@ else
 	LANPLUS_SAM="yes"
 	LD_SAMX="../lib/libipmi_lanplus.a -lcrypto"
 fi
+fi
+
 
 #AC_ARG_ENABLE([liblanplus],
 #    [  --enable-liblanplus      build libipmiutil.a with lanplus [[default=disabled]]],)
@@ -13957,7 +13958,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ipmiutil $as_me 3.1.3, which was
+This file was extended by ipmiutil $as_me 3.1.4, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14020,7 +14021,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-ipmiutil config.status 3.1.3
+ipmiutil config.status 3.1.4
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"