Merge ubuntu/+source/openipmi:paelzer-lp-issue-workaround-temp-namespace/2.0.27-and-init-for-focal into ubuntu/+source/openipmi:ubuntu/focal-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

This has a new upstream for a year now.
Furthermore I found an open bug that is valid.

Fixed both and ready for upload going ahead of Debian for now.
PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3848

It is in bileto, but has no reasonable tests that are worth to link here.

P.S. Debian has no git to MR somewhere, but I'm planning to submit a debdiff to a new bug once we are ok with this.

[Christian Ehrhardt  (paelzer)]

Note: this is a special case, due to an issue in the LP-git backend we can no more push to repositories that are based on other. The only way to get this reviewable was to push to usd-import-team, but for clear separation under a very obvious different namespace.

TODO: This branch will be dropped even on the remote after the tag was pushed

[Lucas Kanashiro (lucaskanashiro)]

+1 on those changes.

I also tried to reproduce LP #1844448 in a LXD container and got exactly the expected result described here: https://bugs.launchpad.net/ubuntu/+source/openipmi/+bug/1844448/comments/5

Just a small nitpick since we are going ahead of Debian here. After running licensecheck against the source code I found some files not covered by the current debian/copyright file:

./m4/ax_pkg_swig.m4: GPL (v2 or later)
  [Copyright: 2011 Murray Cumming <email address hidden> / 2008 Sebastian Huber <email address hidden> / 2008 Rafael Laboissiere <email address hidden> / 2008 Andrew Collier / 2008 Alan W. Irwin]

./m4/ax_prog_python_version.m4: FSF All Permissive
  [Copyright: 2009 Francesco Salvestrini <email address hidden>]

./m4/ax_python_devel.m4: GPL (v3 or later)
  [Copyright: 2013 Daniel Mullner <email address hidden> / 2009 Sebastian Huber <email address hidden> / 2009 Rafael Laboissiere <email address hidden> / 2009 Matteo Settenvini <email address hidden> / 2009 Horst Knorr <email address hidden> / 2009 Andrew Collier / 2009 Alan W. Irwin]

./sample/solterm.c: BSD (unspecified) LGPL (v2 or later)
  [Copyright: 2005 Cyclades Australia Pty. Ltd.]

Most of those files were added to support python build by default apparently.

review: Approve

[Christian Ehrhardt  (paelzer)]

Thanks for the review Lucas, uploading now

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/openipmi
 * [new tag] upload/2.0.27-0ubuntu1 -> upload/2.0.27-0ubuntu1

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading openipmi_2.0.27-0ubuntu1.dsc: done.
  Uploading openipmi_2.0.27.orig.tar.gz: done.
  Uploading openipmi_2.0.27-0ubuntu1.debian.tar.xz: done.
  Uploading openipmi_2.0.27-0ubuntu1_source.buildinfo: done.
  Uploading openipmi_2.0.27-0ubuntu1_source.changes: done.
Successfully uploaded packages.

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/openipmi
 - [deleted] paelzer-lp-issue-workaround-temp-namespace/2.0.27-and-init-for-focal

Cleanup done

[Christian Ehrhardt  (paelzer)]

Submitted the new Delta to Debian, but as there is no git that has just a bug report with a link to my branch (that I cleaned up to apply on Debian)

diff --git a/Makefile.am b/Makefile.am
index b1aacdf..cd597d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,10 @@
 RPM		= rpmbuild
 RPMFLAGS	= -ta
 
-SUBDIRS    = include utils lib unix $(GLIB_DIR) $(TCL_DIR) libedit cmdlang \
+SUBDIRS    = include utils lib unix $(GLIB_DIR) $(TCL_DIR) cmdlang \
 	     ui lanserv sample doc man $(SWIG_DIR)
 
-DIST_SUBDIRS = include utils lib unix glib tcl libedit cmdlang \
+DIST_SUBDIRS = include utils lib unix glib tcl cmdlang \
 	     ui lanserv sample doc man swig
 
 EXTRA_DIST = FAQ TODO README.Force README.MotorolaMXP OpenIPMI.spec.in \
@@ -29,10 +29,10 @@ uninstall-local:
 rpm: dist
 	$(RPM) $(RPMFLAGS) $(distdir).tar.gz < /dev/null
 
-PYPATH=$(top_builddir)/swig/python:$(top_builddir)/swig/python/.libs:$(srcdir)/openipmigui
+PYPATH=$(top_builddir)/swig/python:$(top_builddir)/swig/python/.libs
 
 rungui:
-	LD_LIBRARY_PATH=$(top_builddir)/glib/.libs LD_PRELOAD=$(OPENIPMI_SWIG_SO):$(top_builddir)/swig/python/.libs/_OpenIPMI.so PYTHONPATH=$(PYPATH) $(pythonprog) $(top_srcdir)/swig/python/openipmigui.py
+	LD_LIBRARY_PATH=$(top_builddir)/glib/.libs LD_PRELOAD=$(OPENIPMI_SWIG_SO):$(top_builddir)/swig/python/.libs/_OpenIPMI.so PYTHONPATH=$(PYPATH) $(PYTHON) $(top_srcdir)/swig/python/openipmigui.py
 
 DISTCLEANFILES=OpenIPMI.spec OpenIPMIcmdlang.pc OpenIPMI.pc OpenIPMItcl.pc \
 	OpenIPMIglib12.pc OpenIPMIposix.pc OpenIPMIui.pc OpenIPMIglib.pc \
diff --git a/Makefile.in b/Makefile.in
index aed3ad5..85796b8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -90,11 +90,16 @@ host_triplet = @host@
 target_triplet = @target@
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_config_feature.m4 \
-	$(top_srcdir)/m4/ax_have_epoll.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
+	$(top_srcdir)/m4/ax_config_feature.m4 \
+	$(top_srcdir)/m4/ax_have_epoll.m4 \
+	$(top_srcdir)/m4/ax_pkg_swig.m4 \
+	$(top_srcdir)/m4/ax_prog_python_version.m4 \
+	$(top_srcdir)/m4/ax_python_devel.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
@@ -214,7 +219,6 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -250,8 +254,6 @@ GLIB_DIR = @GLIB_DIR@
 GLIB_LIB = @GLIB_LIB@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_PKGCONF = @GLIB_PKGCONF@
-GLIB_SINGLE_LIB = @GLIB_SINGLE_LIB@
-GLIB_SINGLE_SO = @GLIB_SINGLE_SO@
 GLIB_SO = @GLIB_SO@
 GLIB_TARGET = @GLIB_TARGET@
 GLIB_VERSION = @GLIB_VERSION@
@@ -304,14 +306,21 @@ PERL_INSTALL_DIR = @PERL_INSTALL_DIR@
 PERL_POSIX_LIB = @PERL_POSIX_LIB@
 PERL_POSIX_SO = @PERL_POSIX_SO@
 POPTLIBS = @POPTLIBS@
-PYTHON_CFLAGS = @PYTHON_CFLAGS@
+PYTHON = @PYTHON@
+PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
 PYTHON_DIR = @PYTHON_DIR@
+PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
+PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
 PYTHON_GUI_DIR = @PYTHON_GUI_DIR@
 PYTHON_HAS_POSIX_THREADS = @PYTHON_HAS_POSIX_THREADS@
 PYTHON_INSTALL_DIR = @PYTHON_INSTALL_DIR@
 PYTHON_INSTALL_LIB_DIR = @PYTHON_INSTALL_LIB_DIR@
+PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_POSIX_LIB = @PYTHON_POSIX_LIB@
 PYTHON_POSIX_SO = @PYTHON_POSIX_SO@
+PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
+PYTHON_SWIG_FLAGS = @PYTHON_SWIG_FLAGS@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RT_LIB = @RT_LIB@
 SED = @SED@
@@ -322,6 +331,7 @@ SOCKETLIB = @SOCKETLIB@
 STRIP = @STRIP@
 SWIG = @SWIG@
 SWIG_DIR = @SWIG_DIR@
+SWIG_LIB = @SWIG_LIB@
 TCL_CFLAGS = @TCL_CFLAGS@
 TCL_DIR = @TCL_DIR@
 TCL_LIB = @TCL_LIB@
@@ -378,12 +388,10 @@ pkgprog = @pkgprog@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-pythonprog = @pythonprog@
 runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
-swigprog = @swigprog@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
@@ -395,10 +403,10 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 RPM = rpmbuild
 RPMFLAGS = -ta
-SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) libedit cmdlang \
+SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) cmdlang \
 	     ui lanserv sample doc man $(SWIG_DIR)
 
-DIST_SUBDIRS = include utils lib unix glib tcl libedit cmdlang \
+DIST_SUBDIRS = include utils lib unix glib tcl cmdlang \
 	     ui lanserv sample doc man swig
 
 EXTRA_DIST = FAQ TODO README.Force README.MotorolaMXP OpenIPMI.spec.in \
@@ -410,7 +418,7 @@ PKGCONFIGS = OpenIPMIutils.pc OpenIPMI.pc OpenIPMIui.pc OpenIPMIposix.pc \
 	     $(GLIB12_PKGCONF) $(TCL_PKGCONF)
 
 ACLOCAL_AMFLAGS = -I m4
-PYPATH = $(top_builddir)/swig/python:$(top_builddir)/swig/python/.libs:$(srcdir)/openipmigui
+PYPATH = $(top_builddir)/swig/python:$(top_builddir)/swig/python/.libs
 DISTCLEANFILES = OpenIPMI.spec OpenIPMIcmdlang.pc OpenIPMI.pc OpenIPMItcl.pc \
 	OpenIPMIglib12.pc OpenIPMIposix.pc OpenIPMIui.pc OpenIPMIglib.pc \
 	OpenIPMIpthread.pc OpenIPMIutils.pc
@@ -666,7 +674,7 @@ distdir: $(DISTFILES)
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
@@ -692,7 +700,7 @@ dist-shar: distdir
 	@echo WARNING: "Support for shar distribution archives is" \
 	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
 dist-zip: distdir
@@ -710,7 +718,7 @@ dist dist-all:
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lz*) \
@@ -720,7 +728,7 @@ distcheck: dist
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
@@ -930,7 +938,7 @@ rpm: dist
 	$(RPM) $(RPMFLAGS) $(distdir).tar.gz < /dev/null
 
 rungui:
-	LD_LIBRARY_PATH=$(top_builddir)/glib/.libs LD_PRELOAD=$(OPENIPMI_SWIG_SO):$(top_builddir)/swig/python/.libs/_OpenIPMI.so PYTHONPATH=$(PYPATH) $(pythonprog) $(top_srcdir)/swig/python/openipmigui.py
+	LD_LIBRARY_PATH=$(top_builddir)/glib/.libs LD_PRELOAD=$(OPENIPMI_SWIG_SO):$(top_builddir)/swig/python/.libs/_OpenIPMI.so PYTHONPATH=$(PYPATH) $(PYTHON) $(top_srcdir)/swig/python/openipmigui.py
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/OpenIPMI.spec b/OpenIPMI.spec
index 9534958..6349ee3 100644
--- a/OpenIPMI.spec
+++ b/OpenIPMI.spec
@@ -3,14 +3,14 @@
 
 Name: OpenIPMI
 Summary: %{name} - Library interface to IPMI
-Version: 2.0.25
+Version: 2.0.27
 Release: 2
 License: LGPL
 URL: http://openipmi.sourceforge.net
 Group: Utilities
 Vendor: OpenIPMI Project
 Packager: Tariq Shureih <[e-mail]>
-Source: %{name}-2.0.25.tar.gz
+Source: %{name}-2.0.27.tar.gz
 Buildroot: /var/tmp/%{name}-root
 BuildRequires: pkgconfig, perl >= 5, swig >= 1.3
 Summary: IPMI Library
diff --git a/README b/README
index 7e485a5..3c1d5e2 100644
--- a/README
+++ b/README
@@ -322,10 +322,6 @@ The source tree here consists of the following directories:
 +---lib - The man OpenIPMI code.  This is where all the logic for the
 |         handling of IPMI messages is.
 |  
-+---libedit - A readline replacement that provides cmdlang/openipmish
-|   |         with command line editing.
-|   \---editline - Include files for libedit
-|
 +---man - The man pages for the 
 |
 +---sample - Sample code and utilities that use the OpenIPMI library.
diff --git a/aclocal.m4 b/aclocal.m4
index b302b55..621a9eb 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
+# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.15'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.15], [],
+m4_if([$1], [1.15.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,12 +51,12 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15])dnl
+[AM_AUTOMAKE_VERSION([1.15.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
-# Copyright (C) 2011-2014 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -118,7 +118,7 @@ AC_SUBST([AR])dnl
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -170,7 +170,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -201,7 +201,7 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -392,7 +392,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -468,7 +468,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -665,7 +665,7 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -686,7 +686,7 @@ if test x"${install_sh+set}" != xset; then
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -707,7 +707,7 @@ AC_SUBST([am__leading_dot])])
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -757,7 +757,7 @@ rm -f confinc confmf
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -796,7 +796,7 @@ fi
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -825,7 +825,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -872,7 +872,7 @@ AC_LANG_POP([C])])
 # For backward compatibility.
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -891,7 +891,7 @@ AC_DEFUN([AM_RUN_LOG],
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -972,7 +972,7 @@ AC_CONFIG_COMMANDS_PRE(
 rm -f conftest.file
 ])
 
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1032,7 +1032,7 @@ AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1060,7 +1060,7 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1079,7 +1079,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1210,8 +1210,12 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([m4/ax_compare_version.m4])
 m4_include([m4/ax_config_feature.m4])
 m4_include([m4/ax_have_epoll.m4])
+m4_include([m4/ax_pkg_swig.m4])
+m4_include([m4/ax_prog_python_version.m4])
+m4_include([m4/ax_python_devel.m4])
 m4_include([m4/libtool.m4])
 m4_include([m4/ltoptions.m4])
 m4_include([m4/ltsugar.m4])
diff --git a/ar-lib b/ar-lib
index 463b9ec..05094d3 100755
--- a/ar-lib
+++ b/ar-lib
@@ -4,7 +4,7 @@
 me=ar-lib
 scriptversion=2012-03-01.08; # UTC
 
-# Copyright (C) 2010-2014 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 Free Software Foundation, Inc.
 # Written by Peter Rosin <[e-mail]>.
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am
index 264ee12..0ca3827 100644
--- a/cmdlang/Makefile.am
+++ b/cmdlang/Makefile.am
@@ -4,7 +4,7 @@ LD_VERSION = 0:5:0
 
 AM_CFLAGS = -Wall -Wsign-compare -I$(top_builddir)/include \
 	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/libedit -DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \
+	-DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \
 	$(TCL_CFLAGS)
 
 lib_LTLIBRARIES = libOpenIPMIcmdlang.la
@@ -25,7 +25,7 @@ openipmish_LDADD =  libOpenIPMIcmdlang.la \
 		$(top_builddir)/utils/libOpenIPMIutils.la \
 		$(top_builddir)/lib/libOpenIPMI.la \
 		$(top_builddir)/unix/libOpenIPMIposix.la \
-		$(top_builddir)/libedit/libedit.a \
+		-lreadline \
 		$(TERM_LIBS) \
 		$(SNMPLIBS) $(GLIB_LIB) $(GLIB_LIBS) \
 		$(TCL_LIB) $(TCL_LIBS) \
diff --git a/cmdlang/Makefile.in b/cmdlang/Makefile.in
index 56f16de..e2d70be 100644
--- a/cmdlang/Makefile.in
+++ b/cmdlang/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -93,11 +93,16 @@ target_triplet = @target@
 bin_PROGRAMS = openipmish$(EXEEXT)
 subdir = cmdlang
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_config_feature.m4 \
-	$(top_srcdir)/m4/ax_have_epoll.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
+	$(top_srcdir)/m4/ax_config_feature.m4 \
+	$(top_srcdir)/m4/ax_have_epoll.m4 \
+	$(top_srcdir)/m4/ax_pkg_swig.m4 \
+	$(top_srcdir)/m4/ax_prog_python_version.m4 \
+	$(top_srcdir)/m4/ax_python_devel.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -157,8 +162,7 @@ am__DEPENDENCIES_1 =
 openipmish_DEPENDENCIES = libOpenIPMIcmdlang.la \
 	$(top_builddir)/utils/libOpenIPMIutils.la \
 	$(top_builddir)/lib/libOpenIPMI.la \
-	$(top_builddir)/unix/libOpenIPMIposix.la \
-	$(top_builddir)/libedit/libedit.a $(am__DEPENDENCIES_1) \
+	$(top_builddir)/unix/libOpenIPMIposix.la $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -226,7 +230,6 @@ CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp README
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -262,8 +265,6 @@ GLIB_DIR = @GLIB_DIR@
 GLIB_LIB = @GLIB_LIB@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_PKGCONF = @GLIB_PKGCONF@
-GLIB_SINGLE_LIB = @GLIB_SINGLE_LIB@
-GLIB_SINGLE_SO = @GLIB_SINGLE_SO@
 GLIB_SO = @GLIB_SO@
 GLIB_TARGET = @GLIB_TARGET@
 GLIB_VERSION = @GLIB_VERSION@
@@ -316,14 +317,21 @@ PERL_INSTALL_DIR = @PERL_INSTALL_DIR@
 PERL_POSIX_LIB = @PERL_POSIX_LIB@
 PERL_POSIX_SO = @PERL_POSIX_SO@
 POPTLIBS = @POPTLIBS@
-PYTHON_CFLAGS = @PYTHON_CFLAGS@
+PYTHON = @PYTHON@
+PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
 PYTHON_DIR = @PYTHON_DIR@
+PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
+PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
 PYTHON_GUI_DIR = @PYTHON_GUI_DIR@
 PYTHON_HAS_POSIX_THREADS = @PYTHON_HAS_POSIX_THREADS@
 PYTHON_INSTALL_DIR = @PYTHON_INSTALL_DIR@
 PYTHON_INSTALL_LIB_DIR = @PYTHON_INSTALL_LIB_DIR@
+PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_POSIX_LIB = @PYTHON_POSIX_LIB@
 PYTHON_POSIX_SO = @PYTHON_POSIX_SO@
+PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
+PYTHON_SWIG_FLAGS = @PYTHON_SWIG_FLAGS@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RT_LIB = @RT_LIB@
 SED = @SED@
@@ -334,6 +342,7 @@ SOCKETLIB = @SOCKETLIB@
 STRIP = @STRIP@
 SWIG = @SWIG@
 SWIG_DIR = @SWIG_DIR@
+SWIG_LIB = @SWIG_LIB@
 TCL_CFLAGS = @TCL_CFLAGS@
 TCL_DIR = @TCL_DIR@
 TCL_LIB = @TCL_LIB@
@@ -390,12 +399,10 @@ pkgprog = @pkgprog@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-pythonprog = @pythonprog@
 runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
-swigprog = @swigprog@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
@@ -409,7 +416,7 @@ LIB_VERSION = 0.0.5
 LD_VERSION = 0:5:0
 AM_CFLAGS = -Wall -Wsign-compare -I$(top_builddir)/include \
 	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/libedit -DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \
+	-DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \
 	$(TCL_CFLAGS)
 
 lib_LTLIBRARIES = libOpenIPMIcmdlang.la
@@ -429,7 +436,7 @@ openipmish_LDADD = libOpenIPMIcmdlang.la \
 		$(top_builddir)/utils/libOpenIPMIutils.la \
 		$(top_builddir)/lib/libOpenIPMI.la \
 		$(top_builddir)/unix/libOpenIPMIposix.la \
-		$(top_builddir)/libedit/libedit.a \
+		-lreadline \
 		$(TERM_LIBS) \
 		$(SNMPLIBS) $(GLIB_LIB) $(GLIB_LIBS) \
 		$(TCL_LIB) $(TCL_LIBS) \
diff --git a/cmdlang/cmd_lanparm.c b/cmdlang/cmd_lanparm.c
index d43a4e1..7afd7dd 100644
--- a/cmdlang/cmd_lanparm.c
+++ b/cmdlang/cmd_lanparm.c
@@ -945,7 +945,8 @@ lanparm_config_set(ipmi_lanparm_t *lanparm, void *cb_data)
 	goto out_err;
     }
     info->cmd_info = cmd_info;
-    strncpy(info->name, name, sizeof(info->name));
+    strncpy(info->name, name, sizeof(info->name) - 1);
+    info->name[sizeof(info->name) - 1] = '\0';
 
     ipmi_cmdlang_cmd_info_get(cmd_info);
     rv = ipmi_lan_set_config(lanparm, lanc, lanparm_config_set_done, info);
@@ -1028,7 +1029,8 @@ lanparm_config_unlock(ipmi_lanparm_t *lanparm, void *cb_data)
 	goto out_err;
     }
     info->cmd_info = cmd_info;
-    strncpy(info->name, name, sizeof(info->name));
+    strncpy(info->name, name, sizeof(info->name) - 1);
+    info->name[sizeof(info->name) - 1] = '\0';
 
     ipmi_cmdlang_cmd_info_get(cmd_info);
     rv = ipmi_lan_clear_lock(lanparm, lanc, lanparm_config_unlock_done, info);
diff --git a/cmdlang/cmd_mc.c b/cmdlang/cmd_mc.c
index d7a90ea..0a3f644 100644
--- a/cmdlang/cmd_mc.c
+++ b/cmdlang/cmd_mc.c
@@ -1997,7 +1997,8 @@ mc_user_set(ipmi_mc_t *mc, void *cb_data)
 		cmdlang->errstr = "no name value";
 		goto out_err;
 	    }
-	    strncpy(info->name, argv[curr_arg], 16);
+	    strncpy(info->name, argv[curr_arg], 15);
+	    info->name[15] = '\0';
 	} else if (strcmp(argv[curr_arg], "password") == 0) {
 	    info->pw_set = 1;
 	    curr_arg++;
@@ -2015,7 +2016,8 @@ mc_user_set(ipmi_mc_t *mc, void *cb_data)
 		cmdlang->errstr = "no name value";
 		goto out_err;
 	    }
-	    strncpy(info->pw, argv[curr_arg], 20);
+	    strncpy(info->pw, argv[curr_arg], 19);
+	    info->pw[19] = '\0';
 	} else {
 	    cmdlang->err = EINVAL;
 	    cmdlang->errstr = "invalid setting";
diff --git a/cmdlang/cmd_pef.c b/cmdlang/cmd_pef.c
index 4a09804..47ab2bd 100644
--- a/cmdlang/cmd_pef.c
+++ b/cmdlang/cmd_pef.c
@@ -794,7 +794,8 @@ pef_config_set(ipmi_pef_t *pef, void *cb_data)
 	goto out_err;
     }
     info->cmd_info = cmd_info;
-    strncpy(info->name, name, sizeof(info->name));
+    strncpy(info->name, name, sizeof(info->name) - 1);
+    info->name[sizeof(info->name) - 1] = '\0';
 
     ipmi_cmdlang_cmd_info_get(cmd_info);
     rv = ipmi_pef_set_config(pef, lanc, pef_config_set_done, info);
@@ -877,7 +878,8 @@ pef_config_unlock(ipmi_pef_t *pef, void *cb_data)
 	goto out_err;
     }
     info->cmd_info = cmd_info;
-    strncpy(info->name, name, sizeof(info->name));
+    strncpy(info->name, name, sizeof(info->name) - 1);
+    info->name[sizeof(info->name) - 1] = '\0';
 
     ipmi_cmdlang_cmd_info_get(cmd_info);
     rv = ipmi_pef_clear_lock(pef, lanc, pef_config_unlock_done, info);
diff --git a/cmdlang/cmd_solparm.c b/cmdlang/cmd_solparm.c
index aa5c1fc..df32c3f 100644
--- a/cmdlang/cmd_solparm.c
+++ b/cmdlang/cmd_solparm.c
@@ -539,7 +539,8 @@ solparm_config_set(ipmi_solparm_t *solparm, void *cb_data)
 	goto out_err;
     }
     info->cmd_info = cmd_info;
-    strncpy(info->name, name, sizeof(info->name));
+    strncpy(info->name, name, sizeof(info->name) - 1);
+    info->name[sizeof(info->name) - 1] = '\0';
 
     ipmi_cmdlang_cmd_info_get(cmd_info);
     rv = ipmi_sol_set_config(solparm, solc, solparm_config_set_done, info);
@@ -622,7 +623,8 @@ solparm_config_unlock(ipmi_solparm_t *solparm, void *cb_data)
 	goto out_err;
     }
     info->cmd_info = cmd_info;
-    strncpy(info->name, name, sizeof(info->name));
+    strncpy(info->name, name, sizeof(info->name) - 1);
+    info->name[sizeof(info->name) - 1] = '\0';
 
     ipmi_cmdlang_cmd_info_get(cmd_info);
     rv = ipmi_sol_clear_lock(solparm, solc, solparm_config_unlock_done, info);
diff --git a/cmdlang/ipmish.c b/cmdlang/ipmish.c
index 906cf19..139da67 100644
--- a/cmdlang/ipmish.c
+++ b/cmdlang/ipmish.c
@@ -50,7 +50,7 @@
 #include <OpenIPMI/ipmi_tcl.h>
 #include <OpenIPMI/ipmi_cmdlang.h>
 #include <OpenIPMI/ipmi_debug.h>
-#include <editline/readline.h>
+#include <readline/readline.h>
 
 #ifdef HAVE_GLIB
 #include <glib.h>
@@ -1049,6 +1049,8 @@ main(int argc, char *argv[])
 	}
     }
 
+    rl_initialize();
+
     if (use_debug_os) {
 	os_hnd = &ipmi_debug_os_handlers;
 	rv = sel_alloc_selector_nothread(&debug_sel);
diff --git a/config.h.in b/config.h.in
index 3317094..a079f8b 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,107 +1,38 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* Define to 1 if the `closedir' function returns void instead of `int'. */
-#undef CLOSEDIR_VOID
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-#undef CRAY_STACKSEG_END
-
-/* Define to 1 if using `alloca.c'. */
-#undef C_ALLOCA
-
-/* Define to 1 if you have `alloca', as a function or macro. */
-#undef HAVE_ALLOCA
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-#undef HAVE_ALLOCA_H
-
 /* Alternate UCD SMP directory */
 #undef HAVE_ALT_UCDSNMP_DIR
 
 /* Define to 1 if you have the `cfmakeraw' function. */
 #undef HAVE_CFMAKERAW
 
-/* Define to 1 if you have the <curses.h> header file. */
-#undef HAVE_CURSES_H
-
 /* Running on CYGWIN */
 #undef HAVE_CYGWIN_TARGET
 
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_DIRENT_H
-
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
-/* Define to 1 if you have the `endpwent' function. */
-#undef HAVE_ENDPWENT
-
 /* This platform supports epoll(7) with epoll_pwait(2). */
 #undef HAVE_EPOLL_PWAIT
 
 /* Define to 1 if you have the <execinfo.h> header file. */
 #undef HAVE_EXECINFO_H
 
-/* Define to 1 if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
-
-/* Define to 1 if you have the `fgetln' function. */
-#undef HAVE_FGETLN
-
-/* Define to 1 if you have the `fork' function. */
-#undef HAVE_FORK
-
 /* Have GDBM libraries */
 #undef HAVE_GDBM
 
 /* Define to 1 if you have the `getaddrinfo' function. */
 #undef HAVE_GETADDRINFO
 
-/* Define to 1 if you have getpwnam_r and getpwuid_r that are draft POSIX.1
-   versions. */
-#undef HAVE_GETPW_R_DRAFT
-
-/* Define to 1 if you have getpwnam_r and getpwuid_r that are POSIX.1
-   compatible. */
-#undef HAVE_GETPW_R_POSIX
-
 /* Have GLIB libraries */
 #undef HAVE_GLIB
 
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define to 1 if you have the `isascii' function. */
-#undef HAVE_ISASCII
-
-/* Define to 1 if you have the `issetugid' function. */
-#undef HAVE_ISSETUGID
-
-/* Define to 1 if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
-
-/* Define to 1 if you have the `memchr' function. */
-#undef HAVE_MEMCHR
-
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
-/* Define to 1 if you have the `memset' function. */
-#undef HAVE_MEMSET
-
-/* Define to 1 if you have the <ncurses.h> header file. */
-#undef HAVE_NCURSES_H
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-#undef HAVE_NDIR_H
-
 /* Define to 1 if you have the <netinet/ether.h> header file. */
 #undef HAVE_NETINET_ETHER_H
 
@@ -120,133 +51,42 @@
 /* Have Python installed */
 #undef HAVE_PYTHON
 
-/* Define to 1 if you have the `regcomp' function. */
-#undef HAVE_REGCOMP
-
-/* Define to 1 if you have the `re_comp' function. */
-#undef HAVE_RE_COMP
-
-/* Define to 1 if `stat' has the bug that it succeeds when given the
-   zero-length file name argument. */
-#undef HAVE_STAT_EMPTY_STRING_BUG
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
-/* Define to 1 if you have the `strchr' function. */
-#undef HAVE_STRCHR
-
-/* Define to 1 if you have the `strcspn' function. */
-#undef HAVE_STRCSPN
-
-/* Define to 1 if you have the `strdup' function. */
-#undef HAVE_STRDUP
-
-/* Define to 1 if you have the `strerror' function. */
-#undef HAVE_STRERROR
-
 /* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Define to 1 if you have the `strlcat' function. */
-#undef HAVE_STRLCAT
-
-/* Define to 1 if you have the `strlcpy' function. */
-#undef HAVE_STRLCPY
-
-/* Define to 1 if you have the `strrchr' function. */
-#undef HAVE_STRRCHR
-
-/* Define to 1 if you have the `strstr' function. */
-#undef HAVE_STRSTR
-
-/* Define to 1 if you have the `strtol' function. */
-#undef HAVE_STRTOL
-
 /* Have swig installed */
 #undef HAVE_SWIG
 
 /* Define to 1 if you have the `syslog' function. */
 #undef HAVE_SYSLOG
 
-/* Define to 1 if you have the <sys/cdefs.h> header file. */
-#undef HAVE_SYS_CDEFS_H
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_SYS_DIR_H
-
 /* Define to 1 if you have the <sys/ethernet.h> header file. */
 #undef HAVE_SYS_ETHERNET_H
 
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#undef HAVE_SYS_IOCTL_H
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_SYS_NDIR_H
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
-
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
-/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
-#undef HAVE_SYS_WAIT_H
-
 /* Have TCL libraries */
 #undef HAVE_TCL
 
-/* Define to 1 if you have the <termios.h> header file. */
-#undef HAVE_TERMIOS_H
-
-/* Define to 1 if you have the <term.h> header file. */
-#undef HAVE_TERM_H
-
 /* Have UCD SNMP */
 #undef HAVE_UCDSNMP
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to 1 if the system has the type `u_int32_t'. */
-#undef HAVE_U_INT32_T
-
-/* Define to 1 if you have the `vfork' function. */
-#undef HAVE_VFORK
-
-/* Define to 1 if you have the <vfork.h> header file. */
-#undef HAVE_VFORK_H
-
-/* Define to 1 if you have the `vw_printw' function. */
-#undef HAVE_VW_PRINTW
-
-/* Define to 1 if `fork' works. */
-#undef HAVE_WORKING_FORK
-
-/* Define to 1 if `vfork' works. */
-#undef HAVE_WORKING_VFORK
-
-/* Define to 1 if you have the `wresize' function. */
-#undef HAVE_WRESIZE
-
-/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
-   slash. */
-#undef LSTAT_FOLLOWS_SLASHED_SYMLINK
-
 /* Define to the sub-directory where libtool stores uninstalled libraries. */
 #undef LT_OBJDIR
 
@@ -271,17 +111,6 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at runtime.
-	STACK_DIRECTION > 0 => grows toward higher addresses
-	STACK_DIRECTION < 0 => grows toward lower addresses
-	STACK_DIRECTION = 0 => direction of growth unknown */
-#undef STACK_DIRECTION
-
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
@@ -290,18 +119,3 @@
 
 /* Version number of package */
 #undef VERSION
-
-/* Solaris's term.h does horrid things. */
-#undef _SUNOS
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to `int' if <sys/types.h> does not define. */
-#undef pid_t
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef size_t
-
-/* Define as `fork' if `vfork' does not work. */
-#undef vfork
diff --git a/configure b/configure
index 0305f1d..a1068a4 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.69 for OpenIPMI 2.0.25.
+# Generated by GNU Autoconf 2.69 for OpenIPMI 2.0.27.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='OpenIPMI'
 PACKAGE_TARNAME='OpenIPMI'
-PACKAGE_VERSION='2.0.25'
-PACKAGE_STRING='OpenIPMI 2.0.25'
+PACKAGE_VERSION='2.0.27'
+PACKAGE_STRING='OpenIPMI 2.0.27'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -634,10 +634,9 @@ ac_includes_default="\
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
+LIBOBJS
 BUILD_CC
 TERM_LIBS
-LIBOBJS
-ALLOCA
 OPENIPMI_SWIG_SO
 OPENIPMI_SWIG_LIBS
 DIA_FILTER_NAME
@@ -650,18 +649,24 @@ SOCKETLIB
 OPENSSLINCS
 OPENSSLLIBS
 SNMPLIBS
-SWIG
 SWIG_DIR
-swigprog
+SWIG_LIB
+SWIG
 PYTHON_GUI_DIR
+PYTHON_SWIG_FLAGS
 PYTHON_POSIX_SO
 PYTHON_POSIX_LIB
 PYTHON_HAS_POSIX_THREADS
 PYTHON_INSTALL_LIB_DIR
 PYTHON_INSTALL_DIR
-PYTHON_CFLAGS
 PYTHON_DIR
-pythonprog
+PYTHON_EXTRA_LIBS
+PYTHON_EXTRA_LDFLAGS
+PYTHON_SITE_PKG
+PYTHON_LIBS
+PYTHON_CPPFLAGS
+PYTHON
+PYTHON_VERSION
 PERL_POSIX_SO
 PERL_POSIX_LIB
 PERL_HAS_POSIX_THREADS
@@ -676,8 +681,6 @@ TCL_SO
 TCL_LIB
 TCL_LIBS
 TCL_CFLAGS
-GLIB_SINGLE_SO
-GLIB_SINGLE_LIB
 GLIB_DIR
 GLIB_TARGET
 GLIB_PKGCONF
@@ -866,7 +869,8 @@ LDFLAGS
 LIBS
 CPPFLAGS
 LT_SYS_LIBRARY_PATH
-CPP'
+CPP
+PYTHON_VERSION'
 
 
 # Initialize some variables set by options.
@@ -1417,7 +1421,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 OpenIPMI 2.0.25 to adapt to many kinds of systems.
+\`configure' configures OpenIPMI 2.0.27 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1489,7 +1493,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenIPMI 2.0.25:";;
+     short | recursive ) echo "Configuration of OpenIPMI 2.0.27:";;
    esac
   cat <<\_ACEOF
 
@@ -1560,6 +1564,10 @@ Some influential environment variables:
   LT_SYS_LIBRARY_PATH
               User-defined run-time library search path.
   CPP         C preprocessor
+  PYTHON_VERSION
+              The installed Python version to use, for example '2.3'. This
+              string will be appended to the Python interpreter canonical
+              name.
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1627,7 +1635,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenIPMI configure 2.0.25
+OpenIPMI configure 2.0.27
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1992,65 +2000,11 @@ fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_mongrel
-
-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
-# -------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
-# variable VAR accordingly.
-ac_fn_c_check_type ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=no"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof ($2))
-	 return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof (($2)))
-	    return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  eval "$3=yes"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_type
 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 OpenIPMI $as_me 2.0.25, which was
+It was created by OpenIPMI $as_me 2.0.27, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3023,7 +2977,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='OpenIPMI'
- VERSION='2.0.25'
+ VERSION='2.0.27'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4336,7 +4290,7 @@ OPENIPMI_VERSION_MAJOR=2
 
 OPENIPMI_VERSION_MINOR=0
 
-OPENIPMI_VERSION_RELEASE=25
+OPENIPMI_VERSION_RELEASE=27
 
 
 
@@ -4568,15 +4522,19 @@ if test "${with_perlusepthreads+set}" = set; then :
 fi
 
 
+pythonprog=
 trypython=yes
 
 # Check whether --with-python was given.
 if test "${with_python+set}" = set; then :
-  withval=$with_python; if test "x$withval" = "xyes"; then
+  withval=$with_python; if test "x$withval" = "x"; then
+      trypython=yes
+    elif test "x$withval" = "xyes"; then
       trypython=yes
     elif test "x$withval" = "xno"; then
       trypython=no
-    elif test -d "$withval"; then
+    else
+      pythonprog="$withval"
       trypython=yes
     fi
 fi
@@ -13065,11 +13023,13 @@ $as_echo "#define HAVE_GLIB /**/" >>confdefs.h
    GLIB_SO='$(top_builddir)/glib/.libs/libOpenIPMIglib.so'
    GLIB_PKGCONF=OpenIPMIglib.pc
    GLIB_TARGET=libOpenIPMIglib.la
+   GLIB_DIR=glib
 else
    GLIB_LIB=
    GLIB_SO=
    GLIB_PKGCONF=
    GLIB_TARGET=
+   GLIB_DIR=
 fi
 
 
@@ -13080,19 +13040,6 @@ fi
 
 
 
-if test "x$haveglib" = "xyes"; then
-   GLIB_DIR=glib
-   GLIB_SINGLE_LIB=$GLIB_LIB
-   GLIB_SINGLE_SO=$GLIB_SO
-else
-   GLIB_DIR=
-   GLIB_SINGLE_LIB=
-   GLIB_SINGLE_SO=
-fi
-
-
-
-
 # Handle TCL support
 TCL_LIBS=
 TCL_CFLAGS=
@@ -13101,22 +13048,26 @@ if test "x$trytcl" != "xno"; then
    FOUND_TCL_HEADER=no
    ver=`echo 'puts \$tcl_version' | tclsh`
    if test "x$tclcflags" = "x"; then
-      ac_fn_c_check_header_mongrel "$LINENO" "tcl.h" "ac_cv_header_tcl_h" "$ac_includes_default"
-if test "x$ac_cv_header_tcl_h" = xyes; then :
+      ac_fn_c_check_header_mongrel "$LINENO" "tcl/tcl.h" "ac_cv_header_tcl_tcl_h" "$ac_includes_default"
+if test "x$ac_cv_header_tcl_tcl_h" = xyes; then :
   FOUND_TCL_HEADER=yes;
 fi
 
 
       if test "x$FOUND_TCL_HEADER" != "xyes"; then
-         echo -n "checking for /usr/include/tcl$ver... "
-	 if test 'x$ver' != 'x' -a -d "/usr/include/tcl$ver"; then
-	    echo "yes"
+         ac_fn_c_check_header_mongrel "$LINENO" "tcl/tcl.h" "ac_cv_header_tcl_tcl_h" "$ac_includes_default"
+if test "x$ac_cv_header_tcl_tcl_h" = xyes; then :
+  FOUND_TCL_HEADER=yes;
+fi
+
+
+	 if test "x$FOUND_TCL_HEADER" == "xyes"; then
 	    tclcflags="-I /usr/include/tcl$ver"
             TCL_CFLAGS="$tclcflags"
-            FOUND_TCL_HEADER=yes
-         else
-	    echo "no"
 	 fi
+      else
+	tclcflags="-I /usr/include/tcl"
+        TCL_CFLAGS="$tclcflags"
       fi
    else
       TCL_CFLAGS="$tclcflags"
@@ -13402,19 +13353,33 @@ fi
 
 
 # Handle PYTHON support
-if test "x$pythoncflags" = "x" -o "x$pythoninstalldir" = "x"; then
-   pythonprog=
-   if test "x$trypython" != "xno"; then
-      # Extract the first word of "python", so it can be a program name with args.
-set dummy python; ac_word=$2
+PYTHON_DIR=
+PYTHON_INSTALL_DIR=
+PYTHON_INSTALL_LIB_DIR=
+PYTHON_SWIG_FLAGS=
+if test "x$trypython" = "xyes"; then
+   if test "x$pythonprog" != "x"; then
+      PYTHON="$pythonprog"
+   fi
+   if test "x$pythoncflags" != "x"; then
+      PYTHON_CPPFLAGS="$pythoncflags"
+   fi
+
+	#
+	# Allow the use of a (user set) custom python version
+	#
+
+
+	# Extract the first word of "python[$PYTHON_VERSION]", so it can be a program name with args.
+set dummy python$PYTHON_VERSION; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_pythonprog+:} false; then :
+if ${ac_cv_path_PYTHON+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $pythonprog in
+  case $PYTHON in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_pythonprog="$pythonprog" # Let the user override the test with a path.
+  ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -13424,7 +13389,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_pythonprog="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -13435,89 +13400,427 @@ IFS=$as_save_IFS
   ;;
 esac
 fi
-pythonprog=$ac_cv_path_pythonprog
-if test -n "$pythonprog"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pythonprog" >&5
-$as_echo "$pythonprog" >&6; }
+PYTHON=$ac_cv_path_PYTHON
+if test -n "$PYTHON"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
+$as_echo "$PYTHON" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-   fi
-   if test "x$pythonprog" != "x"; then
-      # Now find a proper installation location.
-      if test "x$pythoninstalldir" = "x"; then
-	 pythoninstalldir=`$pythonprog -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib());'`
-	 if test "x$pythoninstalldir" = "x" -o ! -d "$pythoninstalldir"; then
-	    pythoninstalldir=
-	 fi
-      fi
-   fi
+	if test -z "$PYTHON"; then
+	   as_fn_error $? "Cannot find python$PYTHON_VERSION in your system path" "$LINENO" 5
+	   PYTHON_VERSION=""
+	fi
+
+	#
+	# Check for a version of Python >= 2.1.0
+	#
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a version of Python >= '2.1.0'" >&5
+$as_echo_n "checking for a version of Python >= '2.1.0'... " >&6; }
+	ac_supports_python_ver=`$PYTHON -c "import sys; \
+		ver = sys.version.split ()[0]; \
+		print (ver >= '2.1.0')"`
+	if test "$ac_supports_python_ver" != "True"; then
+		if test -z "$PYTHON_NOVERSIONCHECK"; then
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+			{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "
+This version of the AC_PYTHON_DEVEL macro
+doesn't work properly with versions of Python before
+2.1.0. You may need to re-run configure, setting the
+variables PYTHON_CPPFLAGS, PYTHON_LIBS, PYTHON_SITE_PKG,
+PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
+Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
+to something else than an empty string.
+
+See \`config.log' for more details" "$LINENO" 5; }
+		else
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: skip at user request" >&5
+$as_echo "skip at user request" >&6; }
+		fi
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	fi
+
+	#
+	# if the macro parameter ``version'' is set, honour it
+	#
+	if test -n ""; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a version of Python " >&5
+$as_echo_n "checking for a version of Python ... " >&6; }
+		ac_supports_python_ver=`$PYTHON -c "import sys; \
+			ver = sys.version.split ()[0]; \
+			print (ver )"`
+		if test "$ac_supports_python_ver" = "True"; then
+		   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+		else
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+			as_fn_error $? "this package requires Python .
+If you have it installed, but it isn't the default Python
+interpreter in your system path, please pass the PYTHON_VERSION
+variable to configure. See \`\`configure --help'' for reference.
+" "$LINENO" 5
+			PYTHON_VERSION=""
+		fi
+	fi
+
+	#
+	# Check if you have distutils, else fail
+	#
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
+$as_echo_n "checking for the distutils Python package... " >&6; }
+	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+	if test -z "$ac_distutils_result"; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		as_fn_error $? "cannot import Python module \"distutils\".
+Please check your Python installation. The error was:
+$ac_distutils_result" "$LINENO" 5
+		PYTHON_VERSION=""
+	fi
+
+	#
+	# Check for Python include path
+	#
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python include path" >&5
+$as_echo_n "checking for Python include path... " >&6; }
+	if test -z "$PYTHON_CPPFLAGS"; then
+		python_path=`$PYTHON -c "import distutils.sysconfig; \
+			print (distutils.sysconfig.get_python_inc ());"`
+		plat_python_path=`$PYTHON -c "import distutils.sysconfig; \
+			print (distutils.sysconfig.get_python_inc (plat_specific=1));"`
+		if test -n "${python_path}"; then
+			if test "${plat_python_path}" != "${python_path}"; then
+				python_path="-I$python_path -I$plat_python_path"
+			else
+				python_path="-I$python_path"
+			fi
+		fi
+		PYTHON_CPPFLAGS=$python_path
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_CPPFLAGS" >&5
+$as_echo "$PYTHON_CPPFLAGS" >&6; }
+
+
+	#
+	# Check for Python library path
+	#
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python library path" >&5
+$as_echo_n "checking for Python library path... " >&6; }
+	if test -z "$PYTHON_LIBS"; then
+		# (makes two attempts to ensure we've got a version number
+		# from the interpreter)
+		ac_python_version=`cat<<EOD | $PYTHON -
+
+# join all versioning strings, on some systems
+# major/minor numbers could be in different list elements
+from distutils.sysconfig import *
+e = get_config_var('VERSION')
+if e is not None:
+	print(e)
+EOD`
+
+		if test -z "$ac_python_version"; then
+			if test -n "$PYTHON_VERSION"; then
+				ac_python_version=$PYTHON_VERSION
+			else
+				ac_python_version=`$PYTHON -c "import sys; \
+					print (sys.version[:3])"`
+			fi
+		fi
+
+		# Make the versioning information available to the compiler
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_PYTHON "$ac_python_version"
+_ACEOF
+
+
+		# First, the library directory:
+		ac_python_libdir=`cat<<EOD | $PYTHON -
+
+# There should be only one
+import distutils.sysconfig
+e = distutils.sysconfig.get_config_var('LIBDIR')
+if e is not None:
+	print (e)
+EOD`
+
+		# Now, for the library:
+		ac_python_library=`cat<<EOD | $PYTHON -
+
+import distutils.sysconfig
+c = distutils.sysconfig.get_config_vars()
+if 'LDVERSION' in c:
+	print ('python'+c['LDVERSION'])
+else:
+	print ('python'+c['VERSION'])
+EOD`
+
+		# This small piece shamelessly adapted from PostgreSQL python macro;
+		# credits goes to momjian, I think. I'd like to put the right name
+		# in the credits, if someone can point me in the right direction... ?
+		#
+		if test -n "$ac_python_libdir" -a -n "$ac_python_library"
+		then
+			# use the official shared library
+			ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"`
+			PYTHON_LIBS="-L$ac_python_libdir -l$ac_python_library"
+		else
+			# old way: use libpython from python_configdir
+			ac_python_libdir=`$PYTHON -c \
+			  "from distutils.sysconfig import get_python_lib as f; \
+			  import os; \
+			  print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"`
+			PYTHON_LIBS="-L$ac_python_libdir -lpython$ac_python_version"
+		fi
+
+		if test -z "PYTHON_LIBS"; then
+			as_fn_error $? "
+  Cannot determine location of your Python DSO. Please check it was installed with
+  dynamic libraries enabled, or try setting PYTHON_LIBS by hand.
+			" "$LINENO" 5
+		fi
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_LIBS" >&5
+$as_echo "$PYTHON_LIBS" >&6; }
+
+
+	#
+	# Check for site packages
+	#
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python site-packages path" >&5
+$as_echo_n "checking for Python site-packages path... " >&6; }
+	if test -z "$PYTHON_SITE_PKG"; then
+		PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
+			print (distutils.sysconfig.get_python_lib(0,0));"`
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_SITE_PKG" >&5
+$as_echo "$PYTHON_SITE_PKG" >&6; }
+
+
+	#
+	# libraries which must be linked in when embedding
+	#
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking python extra libraries" >&5
+$as_echo_n "checking python extra libraries... " >&6; }
+	if test -z "$PYTHON_EXTRA_LDFLAGS"; then
+	   PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
+                conf = distutils.sysconfig.get_config_var; \
+                print (conf('LIBS') + ' ' + conf('SYSLIBS'))"`
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LDFLAGS" >&5
+$as_echo "$PYTHON_EXTRA_LDFLAGS" >&6; }
+
+
+	#
+	# linking flags needed when embedding
+	#
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking python extra linking flags" >&5
+$as_echo_n "checking python extra linking flags... " >&6; }
+	if test -z "$PYTHON_EXTRA_LIBS"; then
+		PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
+			conf = distutils.sysconfig.get_config_var; \
+			print (conf('LINKFORSHARED'))"`
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LIBS" >&5
+$as_echo "$PYTHON_EXTRA_LIBS" >&6; }
+
+
+	#
+	# final check to see if everything compiles alright
+	#
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking consistency of all components of python development environment" >&5
+$as_echo_n "checking consistency of all components of python development environment... " >&6; }
+	# save current global flags
+	ac_save_LIBS="$LIBS"
+	ac_save_LDFLAGS="$LDFLAGS"
+	ac_save_CPPFLAGS="$CPPFLAGS"
+	LIBS="$ac_save_LIBS $PYTHON_LIBS $PYTHON_EXTRA_LIBS $PYTHON_EXTRA_LIBS"
+	LDFLAGS="$ac_save_LDFLAGS $PYTHON_EXTRA_LDFLAGS"
+	CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
+	ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+		#include <Python.h>
+int
+main ()
+{
+Py_Initialize();
+  ;
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  pythonexists=yes
+else
+  pythonexists=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+	ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+	# turn back to default flags
+	CPPFLAGS="$ac_save_CPPFLAGS"
+	LIBS="$ac_save_LIBS"
+	LDFLAGS="$ac_save_LDFLAGS"
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pythonexists" >&5
+$as_echo "$pythonexists" >&6; }
+
+        if test ! "x$pythonexists" = "xyes"; then
+	   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "
+  Could not link test program to Python. Maybe the main Python library has been
+  installed in some non-standard library path. If so, pass it to configure,
+  via the LIBS environment variable.
+  Example: ./configure LIBS=\"-L/usr/non-standard-path/python/lib\"
+  ============================================================================
+   ERROR!
+   You probably have to install the development version of the Python package
+   for your distribution.  The exact name of this package varies among them.
+  ============================================================================
+
+See \`config.log' for more details" "$LINENO" 5; }
+	  PYTHON_VERSION=""
+	fi
+
+	#
+	# all done!
+	#
+
+fi
+if test "x$PYTHON" != "x"; then
+
+
+
+
+    if test -n "$PYTHON"; then :
+
+        ax_python_version="3.0.0"
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python version" >&5
+$as_echo_n "checking for python version... " >&6; }
+
+        python_version=`$PYTHON -V 2>&1 | $GREP "^Python " | $SED -e 's/^.* \([0-9]*\.[0-9]*\.[0-9]*\)/\1/'`
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $python_version" >&5
+$as_echo "$python_version" >&6; }
+
+	PYTHON_VERSION=$python_version
+
+
 
-   if test "x$pythoncflags" = "x"; then
-      pythoninc=`$pythonprog -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc());'`
-      if test "x$pythoninc" != "x"; then
-         pythoncflags="-I$pythoninc"
-      else
-         pythoncflags=""
-      fi
-   else
-      PYTHON_CFLAGS="$pythoncflags"
-   fi
 
-   if test "x$pythoninstalldir" != "x"; then
-      if test "x$pythoninstalllibdir" = "x"; then
-	 pythoninstalllibdir=$pythoninstalldir
-      fi
+
+  # Used to indicate true or false condition
+  ax_compare_version=false
+
+  # Convert the two version strings to be compared into a format that
+  # allows a simple string comparison.  The end result is that a version
+  # string of the form 1.12.5-r617 will be converted to the form
+  # 0001001200050617.  In other words, each number is zero padded to four
+  # digits, and non digits are removed.
+
+  ax_compare_version_A=`echo "$ax_python_version" | sed -e 's/\([0-9]*\)/Z\1Z/g' \
+                     -e 's/Z\([0-9]\)Z/Z0\1Z/g' \
+                     -e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \
+                     -e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \
+                     -e 's/[^0-9]//g'`
+
+
+  ax_compare_version_B=`echo "$python_version" | sed -e 's/\([0-9]*\)/Z\1Z/g' \
+                     -e 's/Z\([0-9]\)Z/Z0\1Z/g' \
+                     -e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \
+                     -e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \
+                     -e 's/[^0-9]//g'`
+
+
+    ax_compare_version=`echo "x$ax_compare_version_A
+x$ax_compare_version_B" | sed 's/^ *//' | sort | sed "s/x${ax_compare_version_A}/true/;s/x${ax_compare_version_B}/false/;1q"`
+
+
+
+    if test "$ax_compare_version" = "true" ; then
+
+	    :
+            PYTHON_SWIG_FLAGS=-py3
+
+    else
+	    :
+
+
+  fi
+
+
+else
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find the python interpreter" >&5
+$as_echo "$as_me: WARNING: could not find the python interpreter" >&2;}
+
+
+fi
+
 
 $as_echo "#define HAVE_PYTHON /**/" >>confdefs.h
 
-      PYTHON_DIR=python
-      PYTHON_CFLAGS="$pythoncflags"
-      PYTHON_INSTALL_DIR="$pythoninstalldir"
-      PYTHON_INSTALL_LIB_DIR="$pythoninstalllibdir"
+   PYTHON_DIR=python
+   if test "x$pythoninstalldir" = "x"; then
+      PYTHON_INSTALL_DIR="$PYTHON_SITE_PKG"
    else
-      PYTHON_DIR=
-      PYTHON_CFLAGS=
-      PYTHON_INSTALL_DIR=
-      PYTHON_INSTALL_LIB_DIR=
+      PYTHON_INSTALL_DIR="$pythoninstalldir"
    fi
-else
    if test "x$pythoninstalllibdir" = "x"; then
-      pythoninstalllibdir=$pythoninstalldir
+      PYTHON_INSTALL_LIB_DIR="$PYTHON_INSTALL_DIR"
+   else
+      PYTHON_INSTALL_LIB_DIR="$pythoninstalllibdir"
    fi
 
-$as_echo "#define HAVE_PYTHON /**/" >>confdefs.h
-
-   PYTHON_DIR=python
-   PYTHON_CFLAGS="$pythoncflags"
-   PYTHON_INSTALL_DIR="$pythoninstalldir"
-   PYTHON_INSTALL_LIB_DIR="$pythoninstalllibdir"
-fi
-if test "x$pythonprog" != "x"; then
    if test "x$pythonusepthreads" = "x"; then
       cat - <<_ACEOF >conftest.py
 try:
-  import thread
+  import threading
   print('yes')
 except:
   print('no')
 _ACEOF
-      pythonusepthreads=`python conftest.py`
+      pythonusepthreads=`$PYTHON conftest.py`
       rm -f conftest.py
    fi
    echo "checking for python threads... $pythonusepthreads"
-fi
-if test "x$pythonusepthreads" = "xyes"; then
-   PYTHON_HAS_POSIX_THREADS=1
-   PYTHON_POSIX_LIB='$(top_builddir)/unix/libOpenIPMIpthread.la'
-   PYTHON_POSIX_SO='$(top_builddir)/unix/.libs/libOpenIPMIpthread.so'
-else
-   PYTHON_HAS_POSIX_THREADS=0
-   PYTHON_POSIX_LIB='$(top_builddir)/unix/libOpenIPMIposix.la'
-   PYTHON_POSIX_SO='$(top_builddir)/unix/.libs/libOpenIPMIposix.so'
+
+   if test "x$pythonusepthreads" = "xyes"; then
+      PYTHON_HAS_POSIX_THREADS=1
+      PYTHON_POSIX_LIB='$(top_builddir)/unix/libOpenIPMIpthread.la'
+      PYTHON_POSIX_SO='$(top_builddir)/unix/.libs/libOpenIPMIpthread.so'
+   else
+      PYTHON_HAS_POSIX_THREADS=0
+      PYTHON_POSIX_LIB='$(top_builddir)/unix/libOpenIPMIposix.la'
+      PYTHON_POSIX_SO='$(top_builddir)/unix/.libs/libOpenIPMIposix.so'
+   fi
 fi
 
 
@@ -13527,6 +13830,7 @@ fi
 
 
 
+
 # Check for Tkinter/Tix
 if test "x$tkinter" = "x"; then
    if test "x$pythonprog" != "x"; then
@@ -13550,17 +13854,26 @@ fi
 
 
 # Now check for swig
-if test "x$swigprog" = "x" -a "x$tryswig" = "xyes"; then
-   # Extract the first word of "swig", so it can be a program name with args.
-set dummy swig; ac_word=$2
+SWIG_DIR=
+SWIG=
+if test "x$tryswig" = "xyes"; then
+   if test "x$swigprog" != "x"; then
+      SWIG="$swigprog"
+   fi
+
+        # Ubuntu has swig 2.0 as /usr/bin/swig2.0
+        for ac_prog in swig swig2.0
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_swigprog+:} false; then :
+if ${ac_cv_path_SWIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $swigprog in
+  case $SWIG in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_swigprog="$swigprog" # Let the user override the test with a path.
+  ac_cv_path_SWIG="$SWIG" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -13570,7 +13883,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_swigprog="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_SWIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -13581,35 +13894,96 @@ IFS=$as_save_IFS
   ;;
 esac
 fi
-swigprog=$ac_cv_path_swigprog
-if test -n "$swigprog"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $swigprog" >&5
-$as_echo "$swigprog" >&6; }
+SWIG=$ac_cv_path_SWIG
+if test -n "$SWIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWIG" >&5
+$as_echo "$SWIG" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-fi
-if test "x$swigprog" != "x"; then
-   swigver=`$swigprog -version 2>&1 | grep 'SWIG Version' | sed 's/SWIG Version //'`
-   swigmajor=`echo $swigver | sed 's/\.[0-9]*\.[0-9]*$//'`
-   swigminor=`echo $swigver | sed 's/^[0-9]*\.\([0-9]*\)\.[0-9]*$/\1/'`
-   swigrel=`echo $swigver | sed 's/^[0-9]*\.[0-9]*\.//'`
-   if test '(' "$swigmajor" -lt 1 ')' -o '(' '(' "$swigmajor" -eq 1 ')' -a '(' "$swigminor" -lt 3 ')' ')' -o '(' '(' "$swigmajor" -eq 1 ')' -a '(' "$swigminor" -eq 3 ')' -a '(' "$swigrel" -lt 21 ')' ')'; then
-      echo "***swig must be version 1.3.21 or greater, disabling swig and perl/python"
-   else
-      echo "swig version $swigver"
+  test -n "$SWIG" && break
+done
+
+        if test -z "$SWIG" ; then
+                :
+        elif test -n "1.3.21" ; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking SWIG version" >&5
+$as_echo_n "checking SWIG version... " >&6; }
+                swig_version=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $swig_version" >&5
+$as_echo "$swig_version" >&6; }
+                if test -n "$swig_version" ; then
+                        # Calculate the required version number components
+                        required=1.3.21
+                        required_major=`echo $required | sed 's/[^0-9].*//'`
+                        if test -z "$required_major" ; then
+                                required_major=0
+                        fi
+                        required=`echo $required | sed 's/[0-9]*[^0-9]//'`
+                        required_minor=`echo $required | sed 's/[^0-9].*//'`
+                        if test -z "$required_minor" ; then
+                                required_minor=0
+                        fi
+                        required=`echo $required | sed 's/[0-9]*[^0-9]//'`
+                        required_patch=`echo $required | sed 's/[^0-9].*//'`
+                        if test -z "$required_patch" ; then
+                                required_patch=0
+                        fi
+                        # Calculate the available version number components
+                        available=$swig_version
+                        available_major=`echo $available | sed 's/[^0-9].*//'`
+                        if test -z "$available_major" ; then
+                                available_major=0
+                        fi
+                        available=`echo $available | sed 's/[0-9]*[^0-9]//'`
+                        available_minor=`echo $available | sed 's/[^0-9].*//'`
+                        if test -z "$available_minor" ; then
+                                available_minor=0
+                        fi
+                        available=`echo $available | sed 's/[0-9]*[^0-9]//'`
+                        available_patch=`echo $available | sed 's/[^0-9].*//'`
+                        if test -z "$available_patch" ; then
+                                available_patch=0
+                        fi
+                        # Convert the version tuple into a single number for easier comparison.
+                        # Using base 100 should be safe since SWIG internally uses BCD values
+                        # to encode its version number.
+                        required_swig_vernum=`expr $required_major \* 10000 \
+                            \+ $required_minor \* 100 \+ $required_patch`
+                        available_swig_vernum=`expr $available_major \* 10000 \
+                            \+ $available_minor \* 100 \+ $available_patch`
+
+                        if test $available_swig_vernum -lt $required_swig_vernum; then
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SWIG version >= 1.3.21 is required.  You have $swig_version." >&5
+$as_echo "$as_me: WARNING: SWIG version >= 1.3.21 is required.  You have $swig_version." >&2;}
+                                SWIG=''
+
+                        else
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SWIG library" >&5
+$as_echo_n "checking for SWIG library... " >&6; }
+                                SWIG_LIB=`$SWIG -swiglib`
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWIG_LIB" >&5
+$as_echo "$SWIG_LIB" >&6; }
+
+                        fi
+                else
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot determine SWIG version" >&5
+$as_echo "$as_me: WARNING: cannot determine SWIG version" >&2;}
+                        SWIG=''
+
+                fi
+        fi
+
+
+   if test "x$SWIG" != "x"; then
 
 $as_echo "#define HAVE_SWIG /**/" >>confdefs.h
 
       SWIG_DIR=swig
-      SWIG=$swigprog
    fi
-else
-   SWIG_DIR=
-   SWIG=
 fi
 
 
@@ -14073,11 +14447,12 @@ fi
 
 
 if test "x$diaprog" != "x"; then
-   diaver=`$diaprog --version 2>&1 | sed 's/Dia version \([^,]*\), .*$/\1/'`
+   diaver=`$diaprog --version 2>&1 | grep 'Dia version' | sed 's/Dia version \([^,]*\), .*$/\1/' | sed 's/^\([0-9.]\+\)+.*$/\1/'`
    tmp=`echo $diaver | sed 's/^[0-9.]\+$//'`
    if test "x$diaver" = "x" -o "x$tmp" != 'x'; then
       # Couldn't get the dia version, give up.
       echo "Couldn't determine the dia version from '$diaver'"
+      exit 1
    else
       DIA="$diaprog"
       diaver_major=`echo $diaver | sed 's/\.[0-9.]\+$//'`
@@ -14225,8 +14600,8 @@ fi
 
 
 
-OPENIPMI_SWIG_LIBS="${PYTHON_POSIX_LIB} \$(top_builddir)/lib/libOpenIPMI.la \$(top_builddir)/utils/libOpenIPMIutils.la \$(top_builddir)/cmdlang/libOpenIPMIcmdlang.la ${GLIB_SINGLE_LIB} ${TCL_LIB}"
-OPENIPMI_SWIG_SO="${PYTHON_POSIX_SO}:\$(top_builddir)/lib/.libs/libOpenIPMI.so:\$(top_builddir)/utils/.libs/libOpenIPMIutils.so:\$(top_builddir)/cmdlang/.libs/libOpenIPMIcmdlang.so:${GLIB_SINGLE_SO}:${TCL_SO}"
+OPENIPMI_SWIG_LIBS="${PYTHON_POSIX_LIB} \$(top_builddir)/lib/libOpenIPMI.la \$(top_builddir)/utils/libOpenIPMIutils.la \$(top_builddir)/cmdlang/libOpenIPMIcmdlang.la ${GLIB_LIB} ${TCL_LIB}"
+OPENIPMI_SWIG_SO="${PYTHON_POSIX_SO}:\$(top_builddir)/lib/.libs/libOpenIPMI.so:\$(top_builddir)/utils/.libs/libOpenIPMIutils.so:\$(top_builddir)/cmdlang/.libs/libOpenIPMIcmdlang.so:${GLIB_SO}:${TCL_SO}"
 
 
 
@@ -14330,15 +14705,6 @@ fi
 
 
 
-# Everything from here to AC_OUTPUT is for libedit
-
-# AC_PROG_LIBTOOL runs AC_CANONICAL_HOST
-case $host in
-   *-sun-*)
-$as_echo "#define _SUNOS /**/" >>confdefs.h
-;;
-esac
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lcurses" >&5
 $as_echo_n "checking for tgetent in -lcurses... " >&6; }
 if ${ac_cv_lib_curses_tgetent+:} false; then :
@@ -14464,1212 +14830,18 @@ fi
 fi
 
 
-# Checks for header files.
-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
-
-fi
 
-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-# for constant arguments.  Useless!
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
-$as_echo_n "checking for working alloca.h... " >&6; }
-if ${ac_cv_working_alloca_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <alloca.h>
-int
-main ()
-{
-char *p = (char *) alloca (2 * sizeof (int));
-			  if (p) return 0;
-  ;
-  return 0;
-}
+for ac_func in cfmakeraw
+do :
+  ac_fn_c_check_func "$LINENO" "cfmakeraw" "ac_cv_func_cfmakeraw"
+if test "x$ac_cv_func_cfmakeraw" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_CFMAKERAW 1
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_working_alloca_h=yes
-else
-  ac_cv_working_alloca_h=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
-$as_echo "$ac_cv_working_alloca_h" >&6; }
-if test $ac_cv_working_alloca_h = yes; then
-
-$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
 
 fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
-$as_echo_n "checking for alloca... " >&6; }
-if ${ac_cv_func_alloca_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
-# else
-#  ifdef HAVE_ALLOCA_H
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
- #pragma alloca
-#   else
-#    ifndef alloca /* predefined by HP cc +Olibcalls */
-void *alloca (size_t);
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-int
-main ()
-{
-char *p = (char *) alloca (1);
-				    if (p) return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_func_alloca_works=yes
-else
-  ac_cv_func_alloca_works=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
-$as_echo "$ac_cv_func_alloca_works" >&6; }
-
-if test $ac_cv_func_alloca_works = yes; then
-
-$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
-
-else
-  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-# that cause trouble.  Some versions do not even contain alloca or
-# contain a buggy version.  If you still want to use their alloca,
-# use ar to extract alloca.o from them instead of compiling alloca.c.
-
-ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
-
-$as_echo "#define C_ALLOCA 1" >>confdefs.h
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
-$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if ${ac_cv_os_cray+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined CRAY && ! defined CRAY2
-webecray
-#else
-wenotbecray
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "webecray" >/dev/null 2>&1; then :
-  ac_cv_os_cray=yes
-else
-  ac_cv_os_cray=no
-fi
-rm -f conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
-$as_echo "$ac_cv_os_cray" >&6; }
-if test $ac_cv_os_cray = yes; then
-  for ac_func in _getb67 GETB67 getb67; do
-    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-
-cat >>confdefs.h <<_ACEOF
-#define CRAY_STACKSEG_END $ac_func
-_ACEOF
-
-    break
-fi
-
-  done
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
-$as_echo_n "checking stack direction for C alloca... " >&6; }
-if ${ac_cv_c_stack_direction+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_c_stack_direction=0
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-int
-find_stack_direction (int *addr, int depth)
-{
-  int dir, dummy = 0;
-  if (! addr)
-    addr = &dummy;
-  *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
-  dir = depth ? find_stack_direction (addr, depth - 1) : 0;
-  return dir + dummy;
-}
-
-int
-main (int argc, char **argv)
-{
-  return find_stack_direction (0, argc + !argv + 20) < 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_c_stack_direction=1
-else
-  ac_cv_c_stack_direction=-1
-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_c_stack_direction" >&5
-$as_echo "$ac_cv_c_stack_direction" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
-_ACEOF
-
-
-fi
-
-ac_header_dirent=no
-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-  as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
-$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-if eval \${$as_ac_Header+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <$ac_hdr>
-
-int
-main ()
-{
-if ((DIR *) 0)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$as_ac_Header=yes"
-else
-  eval "$as_ac_Header=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_ac_Header
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-_ACEOF
-
-ac_header_dirent=$ac_hdr; break
-fi
-
-done
-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
-if test $ac_header_dirent = dirent.h; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
-$as_echo_n "checking for library containing opendir... " >&6; }
-if ${ac_cv_search_opendir+:} 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 opendir ();
-int
-main ()
-{
-return opendir ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' dir; 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_opendir=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_opendir+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_opendir+:} false; then :
-
-else
-  ac_cv_search_opendir=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
-$as_echo "$ac_cv_search_opendir" >&6; }
-ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
-$as_echo_n "checking for library containing opendir... " >&6; }
-if ${ac_cv_search_opendir+:} 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 opendir ();
-int
-main ()
-{
-return opendir ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' x; 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_opendir=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_opendir+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_opendir+:} false; then :
-
-else
-  ac_cv_search_opendir=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
-$as_echo "$ac_cv_search_opendir" >&6; }
-ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=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
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
-$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
-if ${ac_cv_header_sys_wait_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/wait.h>
-#ifndef WEXITSTATUS
-# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
-#endif
-#ifndef WIFEXITED
-# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
-#endif
-
-int
-main ()
-{
-  int s;
-  wait (&s);
-  s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_sys_wait_h=yes
-else
-  ac_cv_header_sys_wait_h=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5
-$as_echo "$ac_cv_header_sys_wait_h" >&6; }
-if test $ac_cv_header_sys_wait_h = yes; then
-
-$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
-
-fi
-
-for ac_header in fcntl.h limits.h malloc.h stdlib.h string.h sys/ioctl.h sys/param.h termios.h unistd.h curses.h ncurses.h sys/cdefs.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-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
-
-
-## include curses.h to prevent "Present But Cannot Be Compiled"
-for ac_header in term.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "term.h" "ac_cv_header_term_h" "#if HAVE_CURSES_H
-# include <curses.h>
-#elif HAVE_NCURSES_H
-# include <ncurses.h>
-#endif
-
-"
-if test "x$ac_cv_header_term_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_TERM_H 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_func in wresize vw_printw cfmakeraw
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-# Checks for typedefs, structures, and compiler characteristics.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if ${ac_cv_c_const+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-#ifndef __cplusplus
-  /* Ultrix mips cc rejects this sort of thing.  */
-  typedef int charset[2];
-  const charset cs = { 0, 0 };
-  /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *pcpcc;
-  char **ppc;
-  /* NEC SVR4.0.2 mips cc rejects this.  */
-  struct point {int x, y;};
-  static struct point const zero = {0,0};
-  /* AIX XL C 1.02.0.0 rejects this.
-     It does not let you subtract one const X* pointer from another in
-     an arm of an if-expression whose if-part is not a constant
-     expression */
-  const char *g = "string";
-  pcpcc = &g + (g ? g-g : 0);
-  /* HPUX 7.0 cc rejects these. */
-  ++pcpcc;
-  ppc = (char**) pcpcc;
-  pcpcc = (char const *const *) ppc;
-  { /* SCO 3.2v4 cc rejects this sort of thing.  */
-    char tx;
-    char *t = &tx;
-    char const *s = 0 ? (char *) 0 : (char const *) 0;
-
-    *t++ = 0;
-    if (s) return 0;
-  }
-  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-    int x[] = {25, 17};
-    const int *foo = &x[0];
-    ++foo;
-  }
-  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-    typedef const int *iptr;
-    iptr p = 0;
-    ++p;
-  }
-  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
-       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; } bx;
-    struct s *b = &bx; b->j = 5;
-  }
-  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-    const int foo = 10;
-    if (!foo) return 0;
-  }
-  return !cs[0] && !zero.x;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_const=yes
-else
-  ac_cv_c_const=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-$as_echo "$ac_cv_c_const" >&6; }
-if test $ac_cv_c_const = no; then
-
-$as_echo "#define const /**/" >>confdefs.h
-
-fi
-
-ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-if test "x$ac_cv_type_pid_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define pid_t int
-_ACEOF
-
-fi
-
-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
-
-fi
-
-ac_fn_c_check_type "$LINENO" "u_int32_t" "ac_cv_type_u_int32_t" "$ac_includes_default"
-if test "x$ac_cv_type_u_int32_t" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_U_INT32_T 1
-_ACEOF
-
-
-fi
-
-
-# Checks for library functions.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether closedir returns void" >&5
-$as_echo_n "checking whether closedir returns void... " >&6; }
-if ${ac_cv_func_closedir_void+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_closedir_void=yes
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header_dirent>
-#ifndef __cplusplus
-int closedir ();
-#endif
-
-int
-main ()
-{
-return closedir (opendir (".")) != 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_func_closedir_void=no
-else
-  ac_cv_func_closedir_void=yes
-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_closedir_void" >&5
-$as_echo "$ac_cv_func_closedir_void" >&6; }
-if test $ac_cv_func_closedir_void = yes; then
-
-$as_echo "#define CLOSEDIR_VOID 1" >>confdefs.h
-
-fi
-
-for ac_header in vfork.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default"
-if test "x$ac_cv_header_vfork_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_VFORK_H 1
-_ACEOF
-
-fi
-
 done
 
-for ac_func in fork vfork
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-if test "x$ac_cv_func_fork" = xyes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5
-$as_echo_n "checking for working fork... " >&6; }
-if ${ac_cv_func_fork_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_fork_works=cross
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-
-	  /* By Ruediger Kuhlmann. */
-	  return fork () < 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_func_fork_works=yes
-else
-  ac_cv_func_fork_works=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_fork_works" >&5
-$as_echo "$ac_cv_func_fork_works" >&6; }
-
-else
-  ac_cv_func_fork_works=$ac_cv_func_fork
-fi
-if test "x$ac_cv_func_fork_works" = xcross; then
-  case $host in
-    *-*-amigaos* | *-*-msdosdjgpp*)
-      # Override, as these systems have only a dummy fork() stub
-      ac_cv_func_fork_works=no
-      ;;
-    *)
-      ac_cv_func_fork_works=yes
-      ;;
-  esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5
-$as_echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;}
-fi
-ac_cv_func_vfork_works=$ac_cv_func_vfork
-if test "x$ac_cv_func_vfork" = xyes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5
-$as_echo_n "checking for working vfork... " >&6; }
-if ${ac_cv_func_vfork_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_vfork_works=cross
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Thanks to Paul Eggert for this test.  */
-$ac_includes_default
-#include <sys/wait.h>
-#ifdef HAVE_VFORK_H
-# include <vfork.h>
-#endif
-/* On some sparc systems, changes by the child to local and incoming
-   argument registers are propagated back to the parent.  The compiler
-   is told about this with #include <vfork.h>, but some compilers
-   (e.g. gcc -O) don't grok <vfork.h>.  Test for this by using a
-   static variable whose address is put into a register that is
-   clobbered by the vfork.  */
-static void
-#ifdef __cplusplus
-sparc_address_test (int arg)
-# else
-sparc_address_test (arg) int arg;
-#endif
-{
-  static pid_t child;
-  if (!child) {
-    child = vfork ();
-    if (child < 0) {
-      perror ("vfork");
-      _exit(2);
-    }
-    if (!child) {
-      arg = getpid();
-      write(-1, "", 0);
-      _exit (arg);
-    }
-  }
-}
-
-int
-main ()
-{
-  pid_t parent = getpid ();
-  pid_t child;
-
-  sparc_address_test (0);
-
-  child = vfork ();
-
-  if (child == 0) {
-    /* Here is another test for sparc vfork register problems.  This
-       test uses lots of local variables, at least as many local
-       variables as main has allocated so far including compiler
-       temporaries.  4 locals are enough for gcc 1.40.3 on a Solaris
-       4.1.3 sparc, but we use 8 to be safe.  A buggy compiler should
-       reuse the register of parent for one of the local variables,
-       since it will think that parent can't possibly be used any more
-       in this routine.  Assigning to the local variable will thus
-       munge parent in the parent process.  */
-    pid_t
-      p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(),
-      p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid();
-    /* Convince the compiler that p..p7 are live; otherwise, it might
-       use the same hardware register for all 8 local variables.  */
-    if (p != p1 || p != p2 || p != p3 || p != p4
-	|| p != p5 || p != p6 || p != p7)
-      _exit(1);
-
-    /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent
-       from child file descriptors.  If the child closes a descriptor
-       before it execs or exits, this munges the parent's descriptor
-       as well.  Test for this by closing stdout in the child.  */
-    _exit(close(fileno(stdout)) != 0);
-  } else {
-    int status;
-    struct stat st;
-
-    while (wait(&status) != child)
-      ;
-    return (
-	 /* Was there some problem with vforking?  */
-	 child < 0
-
-	 /* Did the child fail?  (This shouldn't happen.)  */
-	 || status
-
-	 /* Did the vfork/compiler bug occur?  */
-	 || parent != getpid()
-
-	 /* Did the file descriptor bug occur?  */
-	 || fstat(fileno(stdout), &st) != 0
-	 );
-  }
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_func_vfork_works=yes
-else
-  ac_cv_func_vfork_works=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_vfork_works" >&5
-$as_echo "$ac_cv_func_vfork_works" >&6; }
-
-fi;
-if test "x$ac_cv_func_fork_works" = xcross; then
-  ac_cv_func_vfork_works=$ac_cv_func_vfork
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5
-$as_echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;}
-fi
-
-if test "x$ac_cv_func_vfork_works" = xyes; then
-
-$as_echo "#define HAVE_WORKING_VFORK 1" >>confdefs.h
-
-else
-
-$as_echo "#define vfork fork" >>confdefs.h
-
-fi
-if test "x$ac_cv_func_fork_works" = xyes; then
-
-$as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h
-
-fi
-
-for ac_func in strlcpy strlcat fgetln
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-if test $ac_cv_c_compiler_gnu = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5
-$as_echo_n "checking whether $CC needs -traditional... " >&6; }
-if ${ac_cv_prog_gcc_traditional+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-    ac_pattern="Autoconf.*'x'"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sgtty.h>
-Autoconf TIOCGETP
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "$ac_pattern" >/dev/null 2>&1; then :
-  ac_cv_prog_gcc_traditional=yes
-else
-  ac_cv_prog_gcc_traditional=no
-fi
-rm -f conftest*
-
-
-  if test $ac_cv_prog_gcc_traditional = no; then
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <termio.h>
-Autoconf TCGETA
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "$ac_pattern" >/dev/null 2>&1; then :
-  ac_cv_prog_gcc_traditional=yes
-fi
-rm -f conftest*
-
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5
-$as_echo "$ac_cv_prog_gcc_traditional" >&6; }
-  if test $ac_cv_prog_gcc_traditional = yes; then
-    CC="$CC -traditional"
-  fi
-fi
-
-## _AIX is offended by rpl_malloc and rpl_realloc
-#AC_FUNC_MALLOC
-#AC_FUNC_REALLOC
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
-$as_echo_n "checking return type of signal handlers... " >&6; }
-if ${ac_cv_type_signal+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <signal.h>
-
-int
-main ()
-{
-return *(signal (0, 0)) (0) == 1;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_type_signal=int
-else
-  ac_cv_type_signal=void
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
-$as_echo "$ac_cv_type_signal" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
-$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
-if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  rm -f conftest.sym conftest.file
-echo >conftest.file
-if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_lstat_dereferences_slashed_symlink=no
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-struct stat sbuf;
-     /* Linux will dereference the symlink and fail, as required by POSIX.
-	That is better in the sense that it means we will not
-	have to compile and use the lstat wrapper.  */
-     return lstat ("conftest.sym/", &sbuf) == 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_func_lstat_dereferences_slashed_symlink=yes
-else
-  ac_cv_func_lstat_dereferences_slashed_symlink=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-else
-  # If the `ln -s' command failed, then we probably don't even
-  # have an lstat function.
-  ac_cv_func_lstat_dereferences_slashed_symlink=no
-fi
-rm -f conftest.sym conftest.file
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
-$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
-
-test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
-
-cat >>confdefs.h <<_ACEOF
-#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
-_ACEOF
-
-
-if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then
-  case " $LIBOBJS " in
-  *" lstat.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS lstat.$ac_objext"
- ;;
-esac
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5
-$as_echo_n "checking whether stat accepts an empty string... " >&6; }
-if ${ac_cv_func_stat_empty_string_bug+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_stat_empty_string_bug=yes
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-struct stat sbuf;
-  return stat ("", &sbuf) == 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_func_stat_empty_string_bug=no
-else
-  ac_cv_func_stat_empty_string_bug=yes
-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_stat_empty_string_bug" >&5
-$as_echo "$ac_cv_func_stat_empty_string_bug" >&6; }
-if test $ac_cv_func_stat_empty_string_bug = yes; then
-  case " $LIBOBJS " in
-  *" stat.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS stat.$ac_objext"
- ;;
-esac
-
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STAT_EMPTY_STRING_BUG 1
-_ACEOF
-
-fi
-
-for ac_func in endpwent isascii memchr memset re_comp regcomp strcasecmp strchr strcspn strdup strerror strrchr strstr strtol issetugid
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpwnam_r and getpwuid_r are posix like" >&5
-$as_echo_n "checking whether getpwnam_r and getpwuid_r are posix like... " >&6; }
-      # The prototype for the POSIX version is:
-      # int getpwnam_r(char *, struct passwd *, char *, size_t, struct passwd **)
-      # int getpwuid_r(uid_t, struct passwd *, char *, size_t, struct passwd **);
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-                #include <sys/types.h>
-                #include <pwd.h>
-int
-main ()
-{
-getpwnam_r(NULL, NULL, NULL, (size_t)0, NULL);
-                getpwuid_r((uid_t)0, NULL, NULL, (size_t)0, NULL);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-$as_echo "#define HAVE_GETPW_R_POSIX 1" >>confdefs.h
-
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpwnam_r and getpwuid_r are posix _draft_ like" >&5
-$as_echo_n "checking whether getpwnam_r and getpwuid_r are posix _draft_ like... " >&6; }
-      # The prototype for the POSIX draft version is:
-      # struct passwd *getpwuid_r(uid_t, struct passwd *, char *, int);
-      # struct passwd *getpwnam_r(char *, struct passwd *,  char *, int);
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-                #include <sys/types.h>
-                #include <pwd.h>
-int
-main ()
-{
-getpwnam_r(NULL, NULL, NULL, (size_t)0);
-                getpwuid_r((uid_t)0, NULL, NULL, (size_t)0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-$as_echo "#define HAVE_GETPW_R_DRAFT 1" >>confdefs.h
-
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-
-
-# End of libedit inclusions
 
 if test "${build}" != "${host}" ; then
 	for ac_prog in ${build_alias}-gcc ${build}-gcc gcc
@@ -15719,7 +14891,7 @@ else
 fi
 
 
-ac_config_files="$ac_config_files Makefile utils/Makefile lib/Makefile unix/Makefile glib/Makefile tcl/Makefile ui/Makefile lanserv/Makefile lanserv/OpenIPMI/Makefile lanserv/sdrcomp/Makefile lanserv/marvell-bmc/Makefile sample/Makefile doc/Makefile man/Makefile swig/Makefile swig/perl/Makefile swig/python/Makefile swig/python/openipmigui/Makefile libedit/Makefile cmdlang/Makefile include/Makefile include/OpenIPMI/Makefile include/OpenIPMI/ipmiif.h include/OpenIPMI/internal/Makefile OpenIPMI.spec OpenIPMIutils.pc OpenIPMI.pc OpenIPMIpthread.pc OpenIPMIposix.pc OpenIPMIglib.pc OpenIPMItcl.pc OpenIPMIcmdlang.pc OpenIPMIui.pc"
+ac_config_files="$ac_config_files Makefile utils/Makefile lib/Makefile unix/Makefile glib/Makefile tcl/Makefile ui/Makefile lanserv/Makefile lanserv/OpenIPMI/Makefile lanserv/sdrcomp/Makefile lanserv/marvell-bmc/Makefile sample/Makefile doc/Makefile man/Makefile swig/Makefile swig/perl/Makefile swig/python/Makefile swig/python/openipmigui/Makefile cmdlang/Makefile include/Makefile include/OpenIPMI/Makefile include/OpenIPMI/ipmiif.h include/OpenIPMI/internal/Makefile OpenIPMI.spec OpenIPMIutils.pc OpenIPMI.pc OpenIPMIpthread.pc OpenIPMIposix.pc OpenIPMIglib.pc OpenIPMItcl.pc OpenIPMIcmdlang.pc OpenIPMIui.pc"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -16255,7 +15427,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by OpenIPMI $as_me 2.0.25, which was
+This file was extended by OpenIPMI $as_me 2.0.27, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16321,7 +15493,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-OpenIPMI config.status 2.0.25
+OpenIPMI config.status 2.0.27
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -16754,7 +15926,6 @@ do
     "swig/perl/Makefile") CONFIG_FILES="$CONFIG_FILES swig/perl/Makefile" ;;
     "swig/python/Makefile") CONFIG_FILES="$CONFIG_FILES swig/python/Makefile" ;;
     "swig/python/openipmigui/Makefile") CONFIG_FILES="$CONFIG_FILES swig/python/openipmigui/Makefile" ;;
-    "libedit/Makefile") CONFIG_FILES="$CONFIG_FILES libedit/Makefile" ;;
     "cmdlang/Makefile") CONFIG_FILES="$CONFIG_FILES cmdlang/Makefile" ;;
     "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
     "include/OpenIPMI/Makefile") CONFIG_FILES="$CONFIG_FILES include/OpenIPMI/Makefile" ;;
@@ -17472,7 +16643,6 @@ $as_echo X"$file" |
     cat <<_LT_EOF >> "$cfgfile"
 #! $SHELL
 # Generated automatically by $as_me ($PACKAGE) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 
 # Provide generalized library-building support services.
diff --git a/configure.ac b/configure.ac
index f8bb95f..0461041 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 OPENIPMI_PKG_NAME=OpenIPMI
-AC_INIT([OpenIPMI], [2.0.25], [[e-mail]], [OpenIPMI])
+AC_INIT([OpenIPMI], [2.0.27], [[e-mail]], [OpenIPMI])
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([-Wall])
 AC_CONFIG_HEADER([config.h])
@@ -9,7 +9,7 @@ AC_CONFIG_MACRO_DIR([m4])
 
 AC_SUBST(OPENIPMI_VERSION_MAJOR, 2)
 AC_SUBST(OPENIPMI_VERSION_MINOR, 0)
-AC_SUBST(OPENIPMI_VERSION_RELEASE, 25)
+AC_SUBST(OPENIPMI_VERSION_RELEASE, 27)
 AC_SUBST(OPENIPMI_VERSION_EXTRA, )
 
 
@@ -187,14 +187,18 @@ AC_ARG_WITH(perlusepthreads,
    fi,
 )
 
+pythonprog=
 trypython=yes
 AC_ARG_WITH(python,
 [  --with-python[[=yes|no|PATH]]     Look for python, with the optional path.],
-    if test "x$withval" = "xyes"; then
+    if test "x$withval" = "x"; then
+      trypython=yes
+    elif test "x$withval" = "xyes"; then
       trypython=yes
     elif test "x$withval" = "xno"; then
       trypython=no
-    elif test -d "$withval"; then
+    else
+      pythonprog="$withval"
       trypython=yes
     fi,
 )
@@ -340,33 +344,22 @@ if test "x$haveglib" = "xyes"; then
    GLIB_SO='$(top_builddir)/glib/.libs/libOpenIPMIglib.so'
    GLIB_PKGCONF=OpenIPMIglib.pc
    GLIB_TARGET=libOpenIPMIglib.la
+   GLIB_DIR=glib
 else
    GLIB_LIB=
    GLIB_SO=
    GLIB_PKGCONF=
    GLIB_TARGET=
+   GLIB_DIR=
 fi
 AC_SUBST(GLIB_VERSION)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
-
 AC_SUBST(GLIB_LIB)
 AC_SUBST(GLIB_SO)
 AC_SUBST(GLIB_PKGCONF)
 AC_SUBST(GLIB_TARGET)
-
-if test "x$haveglib" = "xyes"; then
-   GLIB_DIR=glib
-   GLIB_SINGLE_LIB=$GLIB_LIB
-   GLIB_SINGLE_SO=$GLIB_SO
-else
-   GLIB_DIR=
-   GLIB_SINGLE_LIB=
-   GLIB_SINGLE_SO=
-fi
 AC_SUBST(GLIB_DIR)
-AC_SUBST(GLIB_SINGLE_LIB)
-AC_SUBST(GLIB_SINGLE_SO)
 
 # Handle TCL support
 TCL_LIBS=
@@ -376,17 +369,16 @@ if test "x$trytcl" != "xno"; then
    FOUND_TCL_HEADER=no
    ver=`echo 'puts \$tcl_version' | tclsh`
    if test "x$tclcflags" = "x"; then
-      AC_CHECK_HEADER(tcl.h, FOUND_TCL_HEADER=yes; )
+      AC_CHECK_HEADER(tcl/tcl.h, FOUND_TCL_HEADER=yes; )
       if test "x$FOUND_TCL_HEADER" != "xyes"; then
-         echo -n "checking for /usr/include/tcl$ver... "
-	 if test 'x$ver' != 'x' -a -d "/usr/include/tcl$ver"; then
-	    echo "yes"
+         AC_CHECK_HEADER(tcl/tcl.h, FOUND_TCL_HEADER=yes; )
+	 if test "x$FOUND_TCL_HEADER" == "xyes"; then
 	    tclcflags="-I /usr/include/tcl$ver"
             TCL_CFLAGS="$tclcflags"
-            FOUND_TCL_HEADER=yes
-         else
-	    echo "no"
 	 fi
+      else
+	tclcflags="-I /usr/include/tcl"
+        TCL_CFLAGS="$tclcflags"
       fi
    else
       TCL_CFLAGS="$tclcflags"
@@ -523,87 +515,65 @@ AC_SUBST(PERL_POSIX_LIB)
 AC_SUBST(PERL_POSIX_SO)
 
 # Handle PYTHON support
-if test "x$pythoncflags" = "x" -o "x$pythoninstalldir" = "x"; then
-   pythonprog=
-   if test "x$trypython" != "xno"; then
-      AC_PATH_PROG(pythonprog, python)
-   fi
+PYTHON_DIR=
+PYTHON_INSTALL_DIR=
+PYTHON_INSTALL_LIB_DIR=
+PYTHON_SWIG_FLAGS=
+if test "x$trypython" = "xyes"; then
    if test "x$pythonprog" != "x"; then
-      # Now find a proper installation location.
-      if test "x$pythoninstalldir" = "x"; then
-	 pythoninstalldir=`$pythonprog -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib());'`
-	 if test "x$pythoninstalldir" = "x" -o ! -d "$pythoninstalldir"; then
-	    pythoninstalldir=
-	 fi
-      fi
+      PYTHON="$pythonprog"
    fi
-
-   if test "x$pythoncflags" = "x"; then
-      pythoninc=`$pythonprog -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc());'`
-      if test "x$pythoninc" != "x"; then
-         pythoncflags="-I$pythoninc"
-      else
-         pythoncflags=""
-      fi
-   else
-      PYTHON_CFLAGS="$pythoncflags"
+   if test "x$pythoncflags" != "x"; then
+      PYTHON_CPPFLAGS="$pythoncflags"
    fi
-
-   if test "x$pythoninstalldir" != "x"; then
-      if test "x$pythoninstalllibdir" = "x"; then
-	 pythoninstalllibdir=$pythoninstalldir
-      fi
-      AC_DEFINE([HAVE_PYTHON], [], [Have Python installed])
-      PYTHON_DIR=python
-      PYTHON_CFLAGS="$pythoncflags"
-      PYTHON_INSTALL_DIR="$pythoninstalldir"
-      PYTHON_INSTALL_LIB_DIR="$pythoninstalllibdir"
+   AX_PYTHON_DEVEL
+fi
+if test "x$PYTHON" != "x"; then
+   AX_PROG_PYTHON_VERSION([3.0.0], [PYTHON_SWIG_FLAGS=-py3], [])
+   AC_DEFINE([HAVE_PYTHON], [], [Have Python installed])
+   PYTHON_DIR=python
+   if test "x$pythoninstalldir" = "x"; then
+      PYTHON_INSTALL_DIR="$PYTHON_SITE_PKG"
    else
-      PYTHON_DIR=
-      PYTHON_CFLAGS=
-      PYTHON_INSTALL_DIR=
-      PYTHON_INSTALL_LIB_DIR=
+      PYTHON_INSTALL_DIR="$pythoninstalldir"
    fi
-else
    if test "x$pythoninstalllibdir" = "x"; then
-      pythoninstalllibdir=$pythoninstalldir
+      PYTHON_INSTALL_LIB_DIR="$PYTHON_INSTALL_DIR"
+   else
+      PYTHON_INSTALL_LIB_DIR="$pythoninstalllibdir"
    fi
-   AC_DEFINE([HAVE_PYTHON], [], [Have Python installed])
-   PYTHON_DIR=python
-   PYTHON_CFLAGS="$pythoncflags"
-   PYTHON_INSTALL_DIR="$pythoninstalldir"
-   PYTHON_INSTALL_LIB_DIR="$pythoninstalllibdir"
-fi
-if test "x$pythonprog" != "x"; then
+
    if test "x$pythonusepthreads" = "x"; then
       cat - <<_ACEOF >conftest.py
 try:
-  import thread
+  import threading
   print('yes')
 except:
   print('no')
 _ACEOF
-      pythonusepthreads=`python conftest.py`
+      pythonusepthreads=`$PYTHON conftest.py`
       rm -f conftest.py
    fi
    echo "checking for python threads... $pythonusepthreads"
+
+   if test "x$pythonusepthreads" = "xyes"; then
+      PYTHON_HAS_POSIX_THREADS=1
+      PYTHON_POSIX_LIB='$(top_builddir)/unix/libOpenIPMIpthread.la'
+      PYTHON_POSIX_SO='$(top_builddir)/unix/.libs/libOpenIPMIpthread.so'
+   else
+      PYTHON_HAS_POSIX_THREADS=0
+      PYTHON_POSIX_LIB='$(top_builddir)/unix/libOpenIPMIposix.la'
+      PYTHON_POSIX_SO='$(top_builddir)/unix/.libs/libOpenIPMIposix.so'
+   fi
 fi
-if test "x$pythonusepthreads" = "xyes"; then
-   PYTHON_HAS_POSIX_THREADS=1
-   PYTHON_POSIX_LIB='$(top_builddir)/unix/libOpenIPMIpthread.la'
-   PYTHON_POSIX_SO='$(top_builddir)/unix/.libs/libOpenIPMIpthread.so'
-else
-   PYTHON_HAS_POSIX_THREADS=0
-   PYTHON_POSIX_LIB='$(top_builddir)/unix/libOpenIPMIposix.la'
-   PYTHON_POSIX_SO='$(top_builddir)/unix/.libs/libOpenIPMIposix.so'
-fi
+
 AC_SUBST(PYTHON_DIR)
-AC_SUBST(PYTHON_CFLAGS)
 AC_SUBST(PYTHON_INSTALL_DIR)
 AC_SUBST(PYTHON_INSTALL_LIB_DIR)
 AC_SUBST(PYTHON_HAS_POSIX_THREADS)
 AC_SUBST(PYTHON_POSIX_LIB)
 AC_SUBST(PYTHON_POSIX_SO)
+AC_SUBST(PYTHON_SWIG_FLAGS)
 
 # Check for Tkinter/Tix
 if test "x$tkinter" = "x"; then
@@ -628,25 +598,17 @@ fi
 AC_SUBST(PYTHON_GUI_DIR)
 
 # Now check for swig
-if test "x$swigprog" = "x" -a "x$tryswig" = "xyes"; then
-   AC_PATH_PROG(swigprog, swig)
-fi
-if test "x$swigprog" != "x"; then
-   swigver=`$swigprog -version 2>&1 | grep 'SWIG Version' | sed 's/SWIG Version //'`
-   swigmajor=`echo $swigver | sed 's/\.[[0-9]]*\.[[0-9]]*$//'`
-   swigminor=`echo $swigver | sed 's/^[[0-9]]*\.\([[0-9]]*\)\.[[0-9]]*$/\1/'`
-   swigrel=`echo $swigver | sed 's/^[[0-9]]*\.[[0-9]]*\.//'`
-   if test '(' "$swigmajor" -lt 1 ')' -o '(' '(' "$swigmajor" -eq 1 ')' -a '(' "$swigminor" -lt 3 ')' ')' -o '(' '(' "$swigmajor" -eq 1 ')' -a '(' "$swigminor" -eq 3 ')' -a '(' "$swigrel" -lt 21 ')' ')'; then
-      echo "***swig must be version 1.3.21 or greater, disabling swig and perl/python"
-   else
-      echo "swig version $swigver"
+SWIG_DIR=
+SWIG=
+if test "x$tryswig" = "xyes"; then
+   if test "x$swigprog" != "x"; then
+      SWIG="$swigprog"
+   fi
+   AX_PKG_SWIG([1.3.21])
+   if test "x$SWIG" != "x"; then
       AC_DEFINE([HAVE_SWIG], [], [Have swig installed])
       SWIG_DIR=swig
-      SWIG=$swigprog
    fi
-else
-   SWIG_DIR=
-   SWIG=
 fi
 AC_SUBST(SWIG_DIR)
 AC_SUBST(SWIG)
@@ -753,11 +715,12 @@ AC_HAVE_FUNCS(syslog)
 DIA=
 AC_PATH_PROG(diaprog, dia)
 if test "x$diaprog" != "x"; then
-   diaver=`$diaprog --version 2>&1 | sed 's/Dia version \([[^,]]*\), .*$/\1/'`
+   diaver=`$diaprog --version 2>&1 | grep 'Dia version' | sed 's/Dia version \([[^,]]*\), .*$/\1/' | sed 's/^\([[0-9.]]\+\)+.*$/\1/'`
    tmp=`echo $diaver | sed 's/^[[0-9.]]\+$//'`
    if test "x$diaver" = "x" -o "x$tmp" != 'x'; then
       # Couldn't get the dia version, give up.
       echo "Couldn't determine the dia version from '$diaver'"
+      exit 1
    else
       DIA="$diaprog"
       diaver_major=`echo $diaver | sed 's/\.[[0-9.]]\+$//'`
@@ -788,8 +751,8 @@ AC_SUBST(LATEX)
 AC_SUBST(BIBTEX)
 AC_SUBST(DVIPDF)
 
-OPENIPMI_SWIG_LIBS="${PYTHON_POSIX_LIB} \$(top_builddir)/lib/libOpenIPMI.la \$(top_builddir)/utils/libOpenIPMIutils.la \$(top_builddir)/cmdlang/libOpenIPMIcmdlang.la ${GLIB_SINGLE_LIB} ${TCL_LIB}"
-OPENIPMI_SWIG_SO="${PYTHON_POSIX_SO}:\$(top_builddir)/lib/.libs/libOpenIPMI.so:\$(top_builddir)/utils/.libs/libOpenIPMIutils.so:\$(top_builddir)/cmdlang/.libs/libOpenIPMIcmdlang.so:${GLIB_SINGLE_SO}:${TCL_SO}"
+OPENIPMI_SWIG_LIBS="${PYTHON_POSIX_LIB} \$(top_builddir)/lib/libOpenIPMI.la \$(top_builddir)/utils/libOpenIPMIutils.la \$(top_builddir)/cmdlang/libOpenIPMIcmdlang.la ${GLIB_LIB} ${TCL_LIB}"
+OPENIPMI_SWIG_SO="${PYTHON_POSIX_SO}:\$(top_builddir)/lib/.libs/libOpenIPMI.so:\$(top_builddir)/utils/.libs/libOpenIPMIutils.so:\$(top_builddir)/cmdlang/.libs/libOpenIPMIcmdlang.so:${GLIB_SO}:${TCL_SO}"
 AC_SUBST(OPENIPMI_SWIG_LIBS)
 AC_SUBST(OPENIPMI_SWIG_SO)
 
@@ -800,58 +763,13 @@ AX_CONFIG_FEATURE(
    [epoll_pwait], [This platform supports epoll(7) with epoll_pwait(2)],
    [HAVE_EPOLL_PWAIT], [This platform supports epoll(7) with epoll_pwait(2).])
 
-# Everything from here to AC_OUTPUT is for libedit
-
-# AC_PROG_LIBTOOL runs AC_CANONICAL_HOST
-case $host in 
-   *-sun-*) AC_DEFINE([_SUNOS], [], [Solaris's term.h does horrid things.]);;
-esac
-
 AC_CHECK_LIB(curses, tgetent, TERM_LIBS=-lcurses,
    [AC_CHECK_LIB(ncursesw, tgetent, TERM_LIBS=-lncursesw,
     [AC_CHECK_LIB(ncurses, tgetent, TERM_LIBS=-lncurses,
       [AC_MSG_ERROR([libtermcap, libcurses or libncurses are required!])])] )] )
-
-# Checks for header files.
-AC_FUNC_ALLOCA
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdlib.h string.h sys/ioctl.h sys/param.h termios.h unistd.h curses.h ncurses.h sys/cdefs.h])
-
-## include curses.h to prevent "Present But Cannot Be Compiled"
-AC_CHECK_HEADERS([term.h],,,
-[[#if HAVE_CURSES_H
-# include <curses.h>
-#elif HAVE_NCURSES_H
-# include <ncurses.h>
-#endif
-]])
-
-AC_CHECK_FUNCS(wresize vw_printw cfmakeraw)
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_CHECK_TYPES([u_int32_t])
-
-# Checks for library functions.
-AC_FUNC_CLOSEDIR_VOID
-AC_FUNC_FORK
-AC_CHECK_FUNCS(strlcpy strlcat fgetln)
-AC_PROG_GCC_TRADITIONAL
-## _AIX is offended by rpl_malloc and rpl_realloc
-#AC_FUNC_MALLOC
-#AC_FUNC_REALLOC
-AC_TYPE_SIGNAL
-AC_FUNC_STAT
-AC_CHECK_FUNCS([endpwent isascii memchr memset re_comp regcomp strcasecmp strchr strcspn strdup strerror strrchr strstr strtol issetugid])
-EL_GETPW_R_POSIX
-EL_GETPW_R_DRAFT
 AC_SUBST(TERM_LIBS)
 
-# End of libedit inclusions
+AC_CHECK_FUNCS(cfmakeraw)
 
 if test "${build}" != "${host}" ; then
 	AC_CHECK_PROGS(BUILD_CC, [${build_alias}-gcc ${build}-gcc gcc])
@@ -878,7 +796,6 @@ AC_OUTPUT(Makefile
 	  swig/perl/Makefile
 	  swig/python/Makefile
 	  swig/python/openipmigui/Makefile
-	  libedit/Makefile
 	  cmdlang/Makefile
 	  include/Makefile
 	  include/OpenIPMI/Makefile
diff --git a/debian/changelog b/debian/changelog
index 10621bc..7eaf73b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+openipmi (2.0.27-0ubuntu1) focal; urgency=medium
+
+  * New upstream release 2.0.27
+    - d/rules: disable the now default-on python support
+    - d/control: now needs libreadline-dev as build-depends
+    - d/p/sample-fix-readline-include-in-ipmi_serial_bmc_emu.c.patch: fix
+      FTBFS due to readline include in ipmi_serial_bmc_emu.c
+  * d/openipmi.init: fix various issues identified upstream (LP: #1844448)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 28 Nov 2019 14:12:35 +0100
+
 openipmi (2.0.25-2.1ubuntu1) disco; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:
diff --git a/debian/control b/debian/control
index 2eecdfe..ccc7526 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Noël Köthe <[e-mail]>
-Build-Depends: debhelper (>> 11.0.0), libsnmp-dev, libpopt-dev, libncurses5-dev, chrpath, libssl-dev
+Build-Depends: debhelper (>> 11.0.0), libsnmp-dev, libpopt-dev, libncurses5-dev, chrpath, libssl-dev, libreadline-dev
 Standards-Version: 4.1.4
 Homepage: http://openipmi.sourceforge.net/
 
diff --git a/debian/openipmi.init b/debian/openipmi.init
index 2eac8e3..3e452a1 100644
--- a/debian/openipmi.init
+++ b/debian/openipmi.init
@@ -11,8 +11,8 @@
 #
 ### BEGIN INIT INFO
 # Provides: ipmidrv
-# Required-Start: $local_fs $remote_fs $syslog
-# Required-Stop: $local_fs $remote_fs $syslog
+# Required-Start: $local_fs $remote_fs
+# Required-Stop: $local_fs $remote_fs
 # Default-Start: 2 3 4 5
 # Default-Stop: 0 1 6
 # Short-Description: OpenIPMI Driver init script
@@ -52,7 +52,7 @@ case $(uname -m) in
         IPMI_SI_MODULE_NAME="ipmi_si" ;;
 esac
 kernel=`uname -r | cut -d. -f1-2`
-if [ "${kernel}" == "2.4" ]; then
+if [ "${kernel}" = "2.4" ]; then
     IPMI_SMB_MODULE_NAME="ipmi_smb_intf"
     IPMI_SI_MODULE_NAME="ipmi_si_drv"
 fi
@@ -77,7 +77,7 @@ LOCKFILE=/run/lock/ipmi
 DEV_IPMI_TIMEOUT=15
 
 UDEV_EXISTS=0
-if [ -e /sbin/udev -o -e /sbin/udevd ]; then
+if [ -e /sbin/udev -o -e /sbin/udevd -o -e /bin/udevadm ]; then
     UDEV_EXISTS=1
 fi
 
@@ -173,6 +173,16 @@ load_hw_modules()
 
 start_watchdog_common()
 {
+	modules_loaded ipmi_watchdog
+	if [ ${OnePlusUnloaded} -eq 0 ]; then
+		log_success_msg &&
+		return
+	fi
+	if [ -e /dev/watchdog ]; then
+		log_failure_msg "/dev/watchdog already exists "
+		RETVAL=$((RETVAL | 8))
+		return
+	fi
 	load_hw_modules
 	modprobe ipmi_watchdog ${IPMI_WATCHDOG_OPTIONS} > /dev/null 2>&1
 	modules_loaded ipmi_watchdog
@@ -242,7 +252,7 @@ start_powercontrol_common()
 {
 	local poweroff_opts=""
 	load_hw_modules
-	if [ "${IPMI_POWERCYCLE}" == "yes" ]; then
+	if [ "${IPMI_POWERCYCLE}" = "yes" ]; then
 	    modinfo ipmi_poweroff 2>/dev/null | grep poweroff_control > /dev/null 2>&1 && \
 		poweroff_opts="poweroff_control=2"
 	    modinfo ipmi_poweroff 2>/dev/null | grep poweroff_powercycle > /dev/null 2>&1 && \
diff --git a/debian/patches/sample-fix-readline-include-in-ipmi_serial_bmc_emu.c.patch b/debian/patches/sample-fix-readline-include-in-ipmi_serial_bmc_emu.c.patch
new file mode 100644
index 0000000..e5f1e0d
--- /dev/null
+++ b/debian/patches/sample-fix-readline-include-in-ipmi_serial_bmc_emu.c.patch
@@ -0,0 +1,36 @@
+From d1dd570cf77cb2c63bc32bef12d5353e3a197146 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <[e-mail]>
+Date: Fri, 16 Aug 2019 09:54:57 +0300
+Subject: [PATCH] sample: fix readline include in ipmi_serial_bmc_emu.c
+
+Bundled editline has been removed. Use the readline headers instead. Fix
+the build when editline is not installed on host.
+
+Signed-off-by: Baruch Siach <[e-mail]>
+Message-Id: <[e-mail]>
+Signed-off-by: Corey Minyard <[e-mail]>
+
+Origin: upstream, https://sourceforge.net/p/openipmi/code/ci/d1dd570cf77cb2c63bc32bef12d5353e3a197146
+Applied-upstream: 2.0.28
+Last-Update: 2019-11-28
+
+---
+ sample/ipmi_serial_bmc_emu.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sample/ipmi_serial_bmc_emu.c b/sample/ipmi_serial_bmc_emu.c
+index e0ae0197..1b8bb9ac 100644
+--- a/sample/ipmi_serial_bmc_emu.c
++++ b/sample/ipmi_serial_bmc_emu.c
+@@ -42,7 +42,7 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <sys/select.h>
+-#include <editline/readline.h>
++#include <readline/readline.h>
+ 
+ #define _GNU_SOURCE
+ #include <getopt.h>
+-- 
+2.24.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 7112540..4580f42 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 increase-MAX_CONFIG_LINE.patch
 fix_pthread_pkg_config.patch
+sample-fix-readline-include-in-ipmi_serial_bmc_emu.c.patch
diff --git a/debian/rules b/debian/rules
index 230262a..72b33b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,8 @@ config.status:
 		--with-openssl \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
-		--disable-rpath
+		--disable-rpath \
+		--with-python=no
 
 build: build-arch build-indep
 
diff --git a/doc/IPMI.pdf b/doc/IPMI.pdf
index 15aedf1..e5fba7b 100644
Binary files a/doc/IPMI.pdf and b/doc/IPMI.pdf differ
diff --git a/doc/Makefile.in b/doc/Makefile.in
index ac0b060..6a43798 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -90,11 +90,16 @@ host_triplet = @host@
 target_triplet = @target@
 subdir = doc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_config_feature.m4 \
-	$(top_srcdir)/m4/ax_have_epoll.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
+	$(top_srcdir)/m4/ax_config_feature.m4 \
+	$(top_srcdir)/m4/ax_have_epoll.m4 \
+	$(top_srcdir)/m4/ax_pkg_swig.m4 \
+	$(top_srcdir)/m4/ax_prog_python_version.m4 \
+	$(top_srcdir)/m4/ax_python_devel.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -125,7 +130,6 @@ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -161,8 +165,6 @@ GLIB_DIR = @GLIB_DIR@
 GLIB_LIB = @GLIB_LIB@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_PKGCONF = @GLIB_PKGCONF@
-GLIB_SINGLE_LIB = @GLIB_SINGLE_LIB@
-GLIB_SINGLE_SO = @GLIB_SINGLE_SO@
 GLIB_SO = @GLIB_SO@
 GLIB_TARGET = @GLIB_TARGET@
 GLIB_VERSION = @GLIB_VERSION@
@@ -215,14 +217,21 @@ PERL_INSTALL_DIR = @PERL_INSTALL_DIR@
 PERL_POSIX_LIB = @PERL_POSIX_LIB@
 PERL_POSIX_SO = @PERL_POSIX_SO@
 POPTLIBS = @POPTLIBS@
-PYTHON_CFLAGS = @PYTHON_CFLAGS@
+PYTHON = @PYTHON@
+PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
 PYTHON_DIR = @PYTHON_DIR@
+PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
+PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
 PYTHON_GUI_DIR = @PYTHON_GUI_DIR@
 PYTHON_HAS_POSIX_THREADS = @PYTHON_HAS_POSIX_THREADS@
 PYTHON_INSTALL_DIR = @PYTHON_INSTALL_DIR@
 PYTHON_INSTALL_LIB_DIR = @PYTHON_INSTALL_LIB_DIR@
+PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_POSIX_LIB = @PYTHON_POSIX_LIB@
 PYTHON_POSIX_SO = @PYTHON_POSIX_SO@
+PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
+PYTHON_SWIG_FLAGS = @PYTHON_SWIG_FLAGS@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RT_LIB = @RT_LIB@
 SED = @SED@
@@ -233,6 +242,7 @@ SOCKETLIB = @SOCKETLIB@
 STRIP = @STRIP@
 SWIG = @SWIG@
 SWIG_DIR = @SWIG_DIR@
+SWIG_LIB = @SWIG_LIB@
 TCL_CFLAGS = @TCL_CFLAGS@
 TCL_DIR = @TCL_DIR@
 TCL_LIB = @TCL_LIB@
@@ -289,12 +299,10 @@ pkgprog = @pkgprog@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-pythonprog = @pythonprog@
 runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
-swigprog = @swigprog@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
diff --git a/glib/Makefile.in b/glib/Makefile.in
index dbd9e3c..728b01d 100644
--- a/glib/Makefile.in
+++ b/glib/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -91,11 +91,16 @@ host_triplet = @host@
 target_triplet = @target@
 subdir = glib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_config_feature.m4 \
-	$(top_srcdir)/m4/ax_have_epoll.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
+	$(top_srcdir)/m4/ax_config_feature.m4 \
+	$(top_srcdir)/m4/ax_have_epoll.m4 \
+	$(top_srcdir)/m4/ax_pkg_swig.m4 \
+	$(top_srcdir)/m4/ax_prog_python_version.m4 \
+	$(top_srcdir)/m4/ax_python_devel.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -207,7 +212,6 @@ CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -243,8 +247,6 @@ GLIB_DIR = @GLIB_DIR@
 GLIB_LIB = @GLIB_LIB@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_PKGCONF = @GLIB_PKGCONF@
-GLIB_SINGLE_LIB = @GLIB_SINGLE_LIB@
-GLIB_SINGLE_SO = @GLIB_SINGLE_SO@
 GLIB_SO = @GLIB_SO@
 GLIB_TARGET = @GLIB_TARGET@
 GLIB_VERSION = @GLIB_VERSION@
@@ -297,14 +299,21 @@ PERL_INSTALL_DIR = @PERL_INSTALL_DIR@
 PERL_POSIX_LIB = @PERL_POSIX_LIB@
 PERL_POSIX_SO = @PERL_POSIX_SO@
 POPTLIBS = @POPTLIBS@
-PYTHON_CFLAGS = @PYTHON_CFLAGS@
+PYTHON = @PYTHON@
+PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
 PYTHON_DIR = @PYTHON_DIR@
+PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
+PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
 PYTHON_GUI_DIR = @PYTHON_GUI_DIR@
 PYTHON_HAS_POSIX_THREADS = @PYTHON_HAS_POSIX_THREADS@
 PYTHON_INSTALL_DIR = @PYTHON_INSTALL_DIR@
 PYTHON_INSTALL_LIB_DIR = @PYTHON_INSTALL_LIB_DIR@
+PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_POSIX_LIB = @PYTHON_POSIX_LIB@
 PYTHON_POSIX_SO = @PYTHON_POSIX_SO@
+PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
+PYTHON_SWIG_FLAGS = @PYTHON_SWIG_FLAGS@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RT_LIB = @RT_LIB@
 SED = @SED@
@@ -315,6 +324,7 @@ SOCKETLIB = @SOCKETLIB@
 STRIP = @STRIP@
 SWIG = @SWIG@
 SWIG_DIR = @SWIG_DIR@
+SWIG_LIB = @SWIG_LIB@
 TCL_CFLAGS = @TCL_CFLAGS@
 TCL_DIR = @TCL_DIR@
 TCL_LIB = @TCL_LIB@
@@ -371,12 +381,10 @@ pkgprog = @pkgprog@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-pythonprog = @pythonprog@
 runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
-swigprog = @swigprog@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
diff --git a/include/Makefile.in b/include/Makefile.in
index 7a19e22..6c1b3cc 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -90,11 +90,16 @@ host_triplet = @host@
 target_triplet = @target@
 subdir = include
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_config_feature.m4 \
-	$(top_srcdir)/m4/ax_have_epoll.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
+	$(top_srcdir)/m4/ax_config_feature.m4 \
+	$(top_srcdir)/m4/ax_have_epoll.m4 \
+	$(top_srcdir)/m4/ax_pkg_swig.m4 \
+	$(top_srcdir)/m4/ax_prog_python_version.m4 \
+	$(top_srcdir)/m4/ax_python_devel.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -185,7 +190,6 @@ am__relativize = \
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -221,8 +225,6 @@ GLIB_DIR = @GLIB_DIR@
 GLIB_LIB = @GLIB_LIB@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_PKGCONF = @GLIB_PKGCONF@
-GLIB_SINGLE_LIB = @GLIB_SINGLE_LIB@
-GLIB_SINGLE_SO = @GLIB_SINGLE_SO@
 GLIB_SO = @GLIB_SO@
 GLIB_TARGET = @GLIB_TARGET@
 GLIB_VERSION = @GLIB_VERSION@
@@ -275,14 +277,21 @@ PERL_INSTALL_DIR = @PERL_INSTALL_DIR@
 PERL_POSIX_LIB = @PERL_POSIX_LIB@
 PERL_POSIX_SO = @PERL_POSIX_SO@
 POPTLIBS = @POPTLIBS@
-PYTHON_CFLAGS = @PYTHON_CFLAGS@
+PYTHON = @PYTHON@
+PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
 PYTHON_DIR = @PYTHON_DIR@
+PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
+PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
 PYTHON_GUI_DIR = @PYTHON_GUI_DIR@
 PYTHON_HAS_POSIX_THREADS = @PYTHON_HAS_POSIX_THREADS@
 PYTHON_INSTALL_DIR = @PYTHON_INSTALL_DIR@
 PYTHON_INSTALL_LIB_DIR = @PYTHON_INSTALL_LIB_DIR@
+PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_POSIX_LIB = @PYTHON_POSIX_LIB@
 PYTHON_POSIX_SO = @PYTHON_POSIX_SO@
+PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
+PYTHON_SWIG_FLAGS = @PYTHON_SWIG_FLAGS@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RT_LIB = @RT_LIB@
 SED = @SED@
@@ -293,6 +302,7 @@ SOCKETLIB = @SOCKETLIB@
 STRIP = @STRIP@
 SWIG = @SWIG@
 SWIG_DIR = @SWIG_DIR@
+SWIG_LIB = @SWIG_LIB@
 TCL_CFLAGS = @TCL_CFLAGS@
 TCL_DIR = @TCL_DIR@
 TCL_LIB = @TCL_LIB@
@@ -349,12 +359,10 @@ pkgprog = @pkgprog@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-pythonprog = @pythonprog@
 runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
-swigprog = @swigprog@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
diff --git a/include/OpenIPMI/Makefile.in b/include/OpenIPMI/Makefile.in
index a3a7a1d..8ed120d 100644
--- a/include/OpenIPMI/Makefile.in
+++ b/include/OpenIPMI/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -91,11 +91,16 @@ host_triplet = @host@
 target_triplet = @target@
 subdir = include/OpenIPMI
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_config_feature.m4 \
-	$(top_srcdir)/m4/ax_have_epoll.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
+	$(top_srcdir)/m4/ax_config_feature.m4 \
+	$(top_srcdir)/m4/ax_have_epoll.m4 \
+	$(top_srcdir)/m4/ax_pkg_swig.m4 \
+	$(top_srcdir)/m4/ax_prog_python_version.m4 \
+	$(top_srcdir)/m4/ax_python_devel.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(pkginclude_HEADERS) \
@@ -216,7 +221,6 @@ am__relativize = \
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -252,8 +256,6 @@ GLIB_DIR = @GLIB_DIR@
 GLIB_LIB = @GLIB_LIB@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_PKGCONF = @GLIB_PKGCONF@
-GLIB_SINGLE_LIB = @GLIB_SINGLE_LIB@
-GLIB_SINGLE_SO = @GLIB_SINGLE_SO@
 GLIB_SO = @GLIB_SO@
 GLIB_TARGET = @GLIB_TARGET@
 GLIB_VERSION = @GLIB_VERSION@
@@ -306,14 +308,21 @@ PERL_INSTALL_DIR = @PERL_INSTALL_DIR@
 PERL_POSIX_LIB = @PERL_POSIX_LIB@
 PERL_POSIX_SO = @PERL_POSIX_SO@
 POPTLIBS = @POPTLIBS@
-PYTHON_CFLAGS = @PYTHON_CFLAGS@
+PYTHON = @PYTHON@
+PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
 PYTHON_DIR = @PYTHON_DIR@
+PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
+PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
 PYTHON_GUI_DIR = @PYTHON_GUI_DIR@
 PYTHON_HAS_POSIX_THREADS = @PYTHON_HAS_POSIX_THREADS@
 PYTHON_INSTALL_DIR = @PYTHON_INSTALL_DIR@
 PYTHON_INSTALL_LIB_DIR = @PYTHON_INSTALL_LIB_DIR@
+PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_POSIX_LIB = @PYTHON_POSIX_LIB@
 PYTHON_POSIX_SO = @PYTHON_POSIX_SO@
+PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
+PYTHON_SWIG_FLAGS = @PYTHON_SWIG_FLAGS@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RT_LIB = @RT_LIB@
 SED = @SED@
@@ -324,6 +333,7 @@ SOCKETLIB = @SOCKETLIB@
 STRIP = @STRIP@
 SWIG = @SWIG@
 SWIG_DIR = @SWIG_DIR@
+SWIG_LIB = @SWIG_LIB@
 TCL_CFLAGS = @TCL_CFLAGS@
 TCL_DIR = @TCL_DIR@
 TCL_LIB = @TCL_LIB@
@@ -380,12 +390,10 @@ pkgprog = @pkgprog@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-pythonprog = @pythonprog@
 runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
-swigprog = @swigprog@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
diff --git a/include/OpenIPMI/internal/Makefile.in b/include/OpenIPMI/internal/Makefile.in
index 92199cb..58c8d5e 100644
--- a/include/OpenIPMI/internal/Makefile.in
+++ b/include/OpenIPMI/internal/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -91,11 +91,16 @@ host_triplet = @host@
 target_triplet = @target@
 subdir = include/OpenIPMI/internal
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_config_feature.m4 \
-	$(top_srcdir)/m4/ax_have_epoll.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
+	$(top_srcdir)/m4/ax_config_feature.m4 \
+	$(top_srcdir)/m4/ax_have_epoll.m4 \
+	$(top_srcdir)/m4/ax_pkg_swig.m4 \
+	$(top_srcdir)/m4/ax_prog_python_version.m4 \
+	$(top_srcdir)/m4/ax_python_devel.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(internalinclude_HEADERS) \
@@ -174,7 +179,6 @@ CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -210,8 +214,6 @@ GLIB_DIR = @GLIB_DIR@
 GLIB_LIB = @GLIB_LIB@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_PKGCONF = @GLIB_PKGCONF@
-GLIB_SINGLE_LIB = @GLIB_SINGLE_LIB@
-GLIB_SINGLE_SO = @GLIB_SINGLE_SO@
 GLIB_SO = @GLIB_SO@
 GLIB_TARGET = @GLIB_TARGET@
 GLIB_VERSION = @GLIB_VERSION@
@@ -264,14 +266,21 @@ PERL_INSTALL_DIR = @PERL_INSTALL_DIR@
 PERL_POSIX_LIB = @PERL_POSIX_LIB@
 PERL_POSIX_SO = @PERL_POSIX_SO@
 POPTLIBS = @POPTLIBS@
-PYTHON_CFLAGS = @PYTHON_CFLAGS@
+PYTHON = @PYTHON@
+PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
 PYTHON_DIR = @PYTHON_DIR@
+PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
+PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
 PYTHON_GUI_DIR = @PYTHON_GUI_DIR@
 PYTHON_HAS_POSIX_THREADS = @PYTHON_HAS_POSIX_THREADS@
 PYTHON_INSTALL_DIR = @PYTHON_INSTALL_DIR@
 PYTHON_INSTALL_LIB_DIR = @PYTHON_INSTALL_LIB_DIR@
+PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_POSIX_LIB = @PYTHON_POSIX_LIB@
 PYTHON_POSIX_SO = @PYTHON_POSIX_SO@
+PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
+PYTHON_SWIG_FLAGS = @PYTHON_SWIG_FLAGS@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RT_LIB = @RT_LIB@
 SED = @SED@
@@ -282,6 +291,7 @@ SOCKETLIB = @SOCKETLIB@
 STRIP = @STRIP@
 SWIG = @SWIG@
 SWIG_DIR = @SWIG_DIR@
+SWIG_LIB = @SWIG_LIB@
 TCL_CFLAGS = @TCL_CFLAGS@
 TCL_DIR = @TCL_DIR@
 TCL_LIB = @TCL_LIB@
@@ -338,12 +348,10 @@ pkgprog = @pkgprog@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-pythonprog = @pythonprog@
 runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
-swigprog = @swigprog@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
diff --git a/include/OpenIPMI/ipmi_conn.h b/include/OpenIPMI/ipmi_conn.h
index e5d8294..94ade34 100644
--- a/include/OpenIPMI/ipmi_conn.h
+++ b/include/OpenIPMI/ipmi_conn.h
@@ -414,6 +414,13 @@ struct ipmi_con_s
        not long enough to hold it. */
     int (*get_port_info)(ipmi_con_t *ipmi, unsigned int port,
 			 char *info, int *info_len);
+
+    /* Disable the connection.  This is primarily for handling a fork,
+       make sure nothing happens on the connection after this is
+       called.  To call this, you should make sure that no thread is
+       in any event loop (before the fork) and there are no calls into
+       the library.  After calling this you should call close. */
+    void (*disable)(ipmi_con_t *ipmi);
 };
 
 #define IPMI_CONN_NAME(c) (c->name ? c->name : "")
diff --git a/include/OpenIPMI/ipmi_sol.h b/include/OpenIPMI/ipmi_sol.h
index 57682f1..c136b06 100644
--- a/include/OpenIPMI/ipmi_sol.h
+++ b/include/OpenIPMI/ipmi_sol.h
@@ -519,13 +519,6 @@ int ipmi_sol_open(ipmi_sol_conn_t *conn);
  * initial state.
  * 
  * @param [in] conn	The IPMI SoL connection to close.
- * @param [in] force	Nonzero if the connection should be forced to close.
- *			Forcing the connection to close will be a synchronous
- *			operation.  All outstanding transmits will be cancelled
- *			and the transmit_complete callbacks will be called
- *			indicating that the transmit failed.  The connection_
- *			state callback will also be called before this function
- *			returns.
  * @return	Zero on success.
  *		EINVAL if this handle was already closing or closed.  If the
  * 			handle is closing, consider using ipmi_sol_force_close
@@ -534,6 +527,23 @@ int ipmi_sol_open(ipmi_sol_conn_t *conn);
  */
 int ipmi_sol_close(ipmi_sol_conn_t *conn);
 
+/**
+ * Requests the closure of the SoL session.
+ *
+ * Closing the SoL session also restores the baseboard serial mux to its
+ * initial state.
+ *
+ * @param [in] conn	The IPMI SoL connection to close.
+ * @param [in] rem_close Nonzero if the connection should send a close to
+ *			the remote end.  If false, don't inform the remote
+ *			end of the close.
+ * @return	Zero on success.
+ *		EINVAL if this handle was already closing or closed.  If the
+ * 			handle is closing, consider using ipmi_sol_force_close
+ *			to hurry it along.
+ *		A nonzero error code on other failure.
+ */
+int ipmi_sol_force_close_wsend(ipmi_sol_conn_t *conn, int rem_close);
 
 /**
  * Forces the closure of the SoL session.
diff --git a/include/OpenIPMI/ipmiif.h b/include/OpenIPMI/ipmiif.h
index cb04a1b..9665940 100644
--- a/include/OpenIPMI/ipmiif.h
+++ b/include/OpenIPMI/ipmiif.h
@@ -47,7 +47,7 @@ extern "C" {
 /* For version detection */
 #define OPENIPMI_VERSION_MAJOR 2
 #define OPENIPMI_VERSION_MINOR 0
-#define OPENIPMI_VERSION_RELEASE 25
+#define OPENIPMI_VERSION_RELEASE 27
 #define OPENIPMI_VERSION_EXTRA 
 #define OPENIPMI_STRINGX(x) #x
 #define OPENIPMI_XSTRING(x) OPENIPMI_STRINGX(x)
diff --git a/include/OpenIPMI/os_handler.h b/include/OpenIPMI/os_handler.h
index 86df24f..8a8495c 100644
--- a/include/OpenIPMI/os_handler.h
+++ b/include/OpenIPMI/os_handler.h
@@ -158,12 +158,12 @@ struct os_handler_s
        stop it first. */
     int (*free_timer)(os_handler_t      *handler,
 		      os_hnd_timer_id_t *id);
-    /* This is called to register a callback handler to be called at
-       the given time or after (absolute time, as seen by
-       gettimeofday).  After the given time has passed, the
-       "timed_out" will be called with the given cb_data.  The
-       identifier in "id" just be one previously allocated with
-       alloc_timer().  Note that timed_out may NOT block. */
+    /* This is called to register a callback handler to be called
+       after the given amount of time (relative).  After the given
+       time has passed, the "timed_out" will be called with the given
+       cb_data.  The identifier in "id" just be one previously
+       allocated with alloc_timer().  Note that timed_out may NOT
+       block. */
     int (*start_timer)(os_handler_t      *handler,
 		       os_hnd_timer_id_t *id,
 		       struct timeval    *timeout,
diff --git a/include/OpenIPMI/selector.h b/include/OpenIPMI/selector.h
index 29c0f18..1e87b61 100644
--- a/include/OpenIPMI/selector.h
+++ b/include/OpenIPMI/selector.h
@@ -95,6 +95,11 @@ int sel_set_fd_handlers(struct selector_s *sel,
    sure to not be called again. */
 void sel_clear_fd_handlers(struct selector_s *sel,
 			   int        fd);
+/* Like above, but can only be called if no handlers are active.
+   If it detects a handler is active, it will assert.  This should
+   only be used at startup to clear the fd handler after an error
+   before any handlers are enabled. */
+void sel_clear_fd_handlers_imm(struct selector_s *sel, int fd);
 
 /* Turn on and off handling for I/O from a file descriptor. */
 #define SEL_FD_HANDLER_ENABLED	0
@@ -121,6 +126,11 @@ int sel_start_timer(sel_timer_t    *timer,
 		    struct timeval *timeout);
 
 int sel_stop_timer(sel_timer_t *timer);
+
+/* Stops the timer and calls the done handler when the stop is
+   complete.  This will return an error if the timer is not
+   running or if another done handler is pending running, and
+   the done handler will not be called. */
 int sel_stop_timer_with_done(sel_timer_t *timer,
 			     sel_timeout_handler_t done_handler,
 			     void *cb_data);
@@ -157,6 +167,15 @@ int sel_select(struct selector_s *sel,
 	       void            *cb_data,
 	       struct timeval  *timeout);
 
+/*
+ * Like the above call, but it will return EINTR if interrupted.
+ */
+int sel_select_intr(struct selector_s *sel,
+		    sel_send_sig_cb send_sig,
+		    long            thread_id,
+		    void            *cb_data,
+		    struct timeval  *timeout);
+
 /* This is the main loop for the program.  If NULL is passed in to
    send_sig, then the signal sender is not used.  If this encounters
    an unrecoverable problem with select(), it will return the errno.
@@ -166,6 +185,9 @@ int sel_select_loop(struct selector_s *sel,
 		    long            thread_id,
 		    void            *cb_data);
 
+/* Wake all threads in all select loops. */
+void sel_wake_all(struct selector_s *sel);
+
 typedef void (*ipmi_sel_add_read_fds_cb)(struct selector_s *sel,
 					 int            *num_fds,
 					 fd_set         *fdset,
diff --git a/lanserv/Makefile.in b/lanserv/Makefile.in
index 3712baf..a909695 100644
--- a/lanserv/Makefile.in
+++ b/lanserv/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -96,11 +96,16 @@ bin_PROGRAMS = ipmi_sim$(EXEEXT) $(am__EXEEXT_1)
 noinst_PROGRAMS = ipmi_checksum$(EXEEXT)
 subdir = lanserv
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_config_feature.m4 \
-	$(top_srcdir)/m4/ax_have_epoll.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
+	$(top_srcdir)/m4/ax_config_feature.m4 \
+	$(top_srcdir)/m4/ax_have_epoll.m4 \
+	$(top_srcdir)/m4/ax_pkg_swig.m4 \
+	$(top_srcdir)/m4/ax_prog_python_version.m4 \
+	$(top_srcdir)/m4/ax_python_devel.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
@@ -293,7 +298,6 @@ am__relativize = \
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -329,8 +333,6 @@ GLIB_DIR = @GLIB_DIR@
 GLIB_LIB = @GLIB_LIB@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_PKGCONF = @GLIB_PKGCONF@
-GLIB_SINGLE_LIB = @GLIB_SINGLE_LIB@
-GLIB_SINGLE_SO = @GLIB_SINGLE_SO@
 GLIB_SO = @GLIB_SO@
 GLIB_TARGET = @GLIB_TARGET@
 GLIB_VERSION = @GLIB_VERSION@
@@ -383,14 +385,21 @@ PERL_INSTALL_DIR = @PERL_INSTALL_DIR@
 PERL_POSIX_LIB = @PERL_POSIX_LIB@
 PERL_POSIX_SO = @PERL_POSIX_SO@
 POPTLIBS = @POPTLIBS@
-PYTHON_CFLAGS = @PYTHON_CFLAGS@
+PYTHON = @PYTHON@
+PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
 PYTHON_DIR = @PYTHON_DIR@
+PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
+PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
 PYTHON_GUI_DIR = @PYTHON_GUI_DIR@
 PYTHON_HAS_POSIX_THREADS = @PYTHON_HAS_POSIX_THREADS@
 PYTHON_INSTALL_DIR = @PYTHON_INSTALL_DIR@
 PYTHON_INSTALL_LIB_DIR = @PYTHON_INSTALL_LIB_DIR@
+PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_POSIX_LIB = @PYTHON_POSIX_LIB@
 PYTHON_POSIX_SO = @PYTHON_POSIX_SO@
+PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
+PYTHON_SWIG_FLAGS = @PYTHON_SWIG_FLAGS@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RT_LIB = @RT_LIB@
 SED = @SED@
@@ -401,6 +410,7 @@ SOCKETLIB = @SOCKETLIB@
 STRIP = @STRIP@
 SWIG = @SWIG@
 SWIG_DIR = @SWIG_DIR@
+SWIG_LIB = @SWIG_LIB@
 TCL_CFLAGS = @TCL_CFLAGS@
 TCL_DIR = @TCL_DIR@
 TCL_LIB = @TCL_LIB@
@@ -457,12 +467,10 @@ pkgprog = @pkgprog@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-pythonprog = @pythonprog@
 runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
-swigprog = @swigprog@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
diff --git a/lanserv/OpenIPMI/Makefile.in b/lanserv/OpenIPMI/Makefile.in
index 59dbdf7..fda5cb2 100644
--- a/lanserv/OpenIPMI/Makefile.in
+++ b/lanserv/OpenIPMI/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -91,11 +91,16 @@ host_triplet = @host@
 target_triplet = @target@
 subdir = lanserv/OpenIPMI
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_config_feature.m4 \
-	$(top_srcdir)/m4/ax_have_epoll.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
+	$(top_srcdir)/m4/ax_config_feature.m4 \
+	$(top_srcdir)/m4/ax_have_epoll.m4 \
+	$(top_srcdir)/m4/ax_pkg_swig.m4 \
+	$(top_srcdir)/m4/ax_prog_python_version.m4 \
+	$(top_srcdir)/m4/ax_python_devel.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(pkginclude_HEADERS) \
@@ -174,7 +179,6 @@ CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -210,8 +214,6 @@ GLIB_DIR = @GLIB_DIR@
 GLIB_LIB = @GLIB_LIB@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_PKGCONF = @GLIB_PKGCONF@
-GLIB_SINGLE_LIB = @GLIB_SINGLE_LIB@
-GLIB_SINGLE_SO = @GLIB_SINGLE_SO@
 GLIB_SO = @GLIB_SO@
 GLIB_TARGET = @GLIB_TARGET@
 GLIB_VERSION = @GLIB_VERSION@
@@ -264,14 +266,21 @@ PERL_INSTALL_DIR = @PERL_INSTALL_DIR@
 PERL_POSIX_LIB = @PERL_POSIX_LIB@
 PERL_POSIX_SO = @PERL_POSIX_SO@
 POPTLIBS = @POPTLIBS@
-PYTHON_CFLAGS = @PYTHON_CFLAGS@
+PYTHON = @PYTHON@
+PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
 PYTHON_DIR = @PYTHON_DIR@
+PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
+PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
 PYTHON_GUI_DIR = @PYTHON_GUI_DIR@
 PYTHON_HAS_POSIX_THREADS = @PYTHON_HAS_POSIX_THREADS@
 PYTHON_INSTALL_DIR = @PYTHON_INSTALL_DIR@
 PYTHON_INSTALL_LIB_DIR = @PYTHON_INSTALL_LIB_DIR@
+PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_POSIX_LIB = @PYTHON_POSIX_LIB@
 PYTHON_POSIX_SO = @PYTHON_POSIX_SO@
+PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
+PYTHON_SWIG_FLAGS = @PYTHON_SWIG_FLAGS@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RT_LIB = @RT_LIB@
 SED = @SED@
@@ -282,6 +291,7 @@ SOCKETLIB = @SOCKETLIB@
 STRIP = @STRIP@
 SWIG = @SWIG@
 SWIG_DIR = @SWIG_DIR@
+SWIG_LIB = @SWIG_LIB@
 TCL_CFLAGS = @TCL_CFLAGS@
 TCL_DIR = @TCL_DIR@
 TCL_LIB = @TCL_LIB@
@@ -338,12 +348,10 @@ pkgprog = @pkgprog@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-pythonprog = @pythonprog@
 runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
-swigprog = @swigprog@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
diff --git a/lanserv/OpenIPMI/msg.h b/lanserv/OpenIPMI/msg.h
index cd68d79..5927d85 100644
--- a/lanserv/OpenIPMI/msg.h
+++ b/lanserv/OpenIPMI/msg.h
@@ -111,7 +111,7 @@ typedef struct msg_s
     struct msg_s *next;
 } msg_t;
 
-#define IPMI_SIM_MAX_MSG_LENGTH 36
+#define IPMI_SIM_MAX_MSG_LENGTH 255
 
 typedef struct rsp_msg
 {
diff --git a/lanserv/bmc_storage.c b/lanserv/bmc_storage.c
index 17c0e51..528bbfe 100644
--- a/lanserv/bmc_storage.c
+++ b/lanserv/bmc_storage.c
@@ -233,8 +233,10 @@ ipmi_mc_add_to_sel(lmc_data_t    *mc,
 	   || find_sel_event_by_recid(mc, e->record_id, NULL))
     {
 	e->record_id++;
-	if (e->record_id == start_record_id)
+	if (e->record_id == start_record_id) {
+	    free(e);
 	    return EAGAIN;
+	}
 	mc->sel.next_entry++;
     }
 
@@ -714,8 +716,10 @@ new_sdr_entry(sdrs_t *sdrs, unsigned char length)
 	return NULL;
 
     entry->data = malloc(length + 6);
-    if (!entry->data)
+    if (!entry->data) {
+	free(entry);
 	return NULL;
+    }
 
     entry->record_id = sdrs->next_entry;
 
diff --git a/lanserv/config.c b/lanserv/config.c
index 6b969f3..f0dda9f 100644
--- a/lanserv/config.c
+++ b/lanserv/config.c
@@ -314,6 +314,8 @@ get_delim_str(char **rtokptr, char **rval, const char **err)
 	    val = tokptr;
 	    while (*tokptr != endc) {
 		if (*tokptr == '\0') {
+		    if (rv)
+			free(rv);
 		    *err = "End of line in string";
 		    return -1;
 		}
diff --git a/lanserv/emu_cmd.c b/lanserv/emu_cmd.c
index abdd98f..c6cc9d5 100644
--- a/lanserv/emu_cmd.c
+++ b/lanserv/emu_cmd.c
@@ -936,7 +936,7 @@ mc_add_fru_data(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
 				  (void *) frufn);
 	if (rv)
 	    out->eprintf(out, "**Unable to add FRU file, error 0x%x\n", rv);
-	
+	free(frufn);
     } else if (strcmp(tok, "data") == 0) {
 	for (i=0; i<length; i++) {
 	    rv = emu_get_uchar(out, toks, &data[i], "data byte", 1);
diff --git a/lanserv/ipmi_sim.c b/lanserv/ipmi_sim.c
index 30c4f27..c4e5b18 100644
--- a/lanserv/ipmi_sim.c
+++ b/lanserv/ipmi_sim.c
@@ -715,6 +715,15 @@ static struct poptOption poptOpts[]=
 	"nostdio",
 	""
     },
+    {
+	"nopersist",
+	'p',
+	POPT_ARG_NONE,
+	NULL,
+	'p',
+	"nopersist",
+	""
+    },
     POPT_AUTOHELP
     {
 	NULL,
@@ -1376,6 +1385,9 @@ main(int argc, const char *argv[])
 	    case 'v':
 		print_version = 1;
 		break;
+	    case 'p':
+		persist_enable = 0;
+		break;
 	}
     }
     poptFreeContext(poptCtx);
diff --git a/lanserv/lan.conf b/lanserv/lan.conf
index 13ba71e..37732d4 100644
--- a/lanserv/lan.conf
+++ b/lanserv/lan.conf
@@ -51,9 +51,7 @@ set_working_mc 0x20
   # startcmd is what to execute to start a VM associated with the
   # codec above (localhost 9002).  It also starts a console serial port
   # on port 9003 that is also used as the monitor interface.
-  startcmd "~/git/qemu/Z/x86_64-softmmu/qemu-system-x86_64 --machine q35 -enable-kvm -drive file=$HOME/userlands/complete-image.ext2,format=raw -nographic -kernel ~/git/linux-ipmi/Ox86_64/arch/x86/boot/bzImage -append 'root=/dev/sda console=ttyS0,115200' -chardev socket,id=ipmi0,host=localhost,port=9002,reconnect=10 -device ipmi-bmc-extern,id=bmc0,chardev=ipmi0 -device isa-ipmi-kcs,bmc=bmc0 -net nic,model=e1000,macaddr=52:54:00:12:34:61 -net user,hostfwd=tcp::5556-10.0.2.15:22 -device isa-irq,id=irq5 -serial mon:telnet::9003,server,telnet,nowait"
-
-  # qemu-system-x86_64 --enable-kvm -drive file=/opt/qemu/cge-complete-image-x86-generic-64-1.ext2,format=raw -nographic -kernel /opt/qemu/bzImage-1 -append 'root=/dev/sdb console=ttyS0,115200' -net nic,model=e1000,macaddr=52:54:00:12:34:59 -net user,hostfwd=tcp::5556-10.0.2.15:22 -chardev socket,id=ipmi0,host=localhost,port=9002,reconnect=10 -device ipmi-bmc-extern,id=bmc0,chardev=ipmi0 -device isa-ipmi-bt,bmc=bmc0 -serial mon:telnet::9003,server,telnet,nowait"
+  startcmd "qemu-system-x86_64 --enable-kvm -drive file=/opt/qemu/cge-complete-image-x86-generic-64-1.ext2,format=raw -nographic -kernel /opt/qemu/bzImage-1 -append 'root=/dev/sdb console=ttyS0,115200' -net nic,model=e1000,macaddr=52:54:00:12:34:59 -net user,hostfwd=tcp::5556-10.0.2.15:22 -chardev socket,id=ipmi0,host=localhost,port=9002,reconnect=10 -device ipmi-bmc-extern,id=bmc0,chardev=ipmi0 -device isa-ipmi-bt,bmc=bmc0 -serial mon:telnet::9003,server,telnet,nowait"
 
   sol "telnet:localhost:9003" 115200
 
diff --git a/lanserv/lanserv_ipmi.c b/lanserv/lanserv_ipmi.c
index e0f4687..dc77eb4 100644
--- a/lanserv/lanserv_ipmi.c
+++ b/lanserv/lanserv_ipmi.c
@@ -310,6 +310,7 @@ return_rmcpp_rsp(lanserv_data_t *lan, session_t *session, msg_t *msg,
 	pos[5] = msg->cmd;
 	pos[len] = -ipmb_checksum(pos+3, len-3, 0);
 	len++;
+	dlen++;
     }
 
     if (session && !session->in_startup) {
diff --git a/lanserv/marvell-bmc/Makefile.in b/lanserv/marvell-bmc/Makefile.in
index ffc9c4e..b4f83b6 100644
--- a/lanserv/marvell-bmc/Makefile.in
+++ b/lanserv/marvell-bmc/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -93,11 +93,16 @@ host_triplet = @host@
 target_triplet = @target@
 subdir = lanserv/marvell-bmc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_config_feature.m4 \
-	$(top_srcdir)/m4/ax_have_epoll.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
+	$(top_srcdir)/m4/ax_config_feature.m4 \
+	$(top_srcdir)/m4/ax_have_epoll.m4 \
+	$(top_srcdir)/m4/ax_pkg_swig.m4 \
+	$(top_srcdir)/m4/ax_prog_python_version.m4 \
+	$(top_srcdir)/m4/ax_python_devel.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
@@ -211,7 +216,6 @@ CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp TODO
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -247,8 +251,6 @@ GLIB_DIR = @GLIB_DIR@
 GLIB_LIB = @GLIB_LIB@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_PKGCONF = @GLIB_PKGCONF@
-GLIB_SINGLE_LIB = @GLIB_SINGLE_LIB@
-GLIB_SINGLE_SO = @GLIB_SINGLE_SO@
 GLIB_SO = @GLIB_SO@
 GLIB_TARGET = @GLIB_TARGET@
 GLIB_VERSION = @GLIB_VERSION@
@@ -301,14 +303,21 @@ PERL_INSTALL_DIR = @PERL_INSTALL_DIR@
 PERL_POSIX_LIB = @PERL_POSIX_LIB@
 PERL_POSIX_SO = @PERL_POSIX_SO@
 POPTLIBS = @POPTLIBS@
-PYTHON_CFLAGS = @PYTHON_CFLAGS@
+PYTHON = @PYTHON@
+PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
 PYTHON_DIR = @PYTHON_DIR@
+PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
+PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
 PYTHON_GUI_DIR = @PYTHON_GUI_DIR@
 PYTHON_HAS_POSIX_THREADS = @PYTHON_HAS_POSIX_THREADS@
 PYTHON_INSTALL_DIR = @PYTHON_INSTALL_DIR@
 PYTHON_INSTALL_LIB_DIR = @PYTHON_INSTALL_LIB_DIR@
+PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_POSIX_LIB = @PYTHON_POSIX_LIB@
 PYTHON_POSIX_SO = @PYTHON_POSIX_SO@
+PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
+PYTHON_SWIG_FLAGS = @PYTHON_SWIG_FLAGS@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RT_LIB = @RT_LIB@
 SED = @SED@
@@ -319,6 +328,7 @@ SOCKETLIB = @SOCKETLIB@
 STRIP = @STRIP@
 SWIG = @SWIG@
 SWIG_DIR = @SWIG_DIR@
+SWIG_LIB = @SWIG_LIB@
 TCL_CFLAGS = @TCL_CFLAGS@
 TCL_DIR = @TCL_DIR@
 TCL_LIB = @TCL_LIB@
@@ -375,12 +385,10 @@ pkgprog = @pkgprog@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-pythonprog = @pythonprog@
 runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
-swigprog = @swigprog@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
diff --git a/lanserv/persist.c b/lanserv/persist.c
index e15beab..5951fc2 100644
--- a/lanserv/persist.c
+++ b/lanserv/persist.c
@@ -97,6 +97,9 @@ persist_init(const char *papp, const char *instance, const char *ibasedir)
     char *n;
     int rv = 0;
 
+    if (!persist_enable)
+	return 0;
+
     if (app)
 	return EBUSY;
     
diff --git a/lanserv/sdrcomp/Makefile.in b/lanserv/sdrcomp/Makefile.in
index 71fabf4..83592f4 100644
--- a/lanserv/sdrcomp/Makefile.in
+++ b/lanserv/sdrcomp/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -93,11 +93,16 @@ bin_PROGRAMS = sdrcomp$(EXEEXT)
 noinst_PROGRAMS = sdrcomp_build$(EXEEXT)
 subdir = lanserv/sdrcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_config_feature.m4 \
-	$(top_srcdir)/m4/ax_have_epoll.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
+	$(top_srcdir)/m4/ax_config_feature.m4 \
+	$(top_srcdir)/m4/ax_have_epoll.m4 \
+	$(top_srcdir)/m4/ax_pkg_swig.m4 \
+	$(top_srcdir)/m4/ax_prog_python_version.m4 \
+	$(top_srcdir)/m4/ax_python_devel.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -183,7 +188,6 @@ CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -219,8 +223,6 @@ GLIB_DIR = @GLIB_DIR@
 GLIB_LIB = @GLIB_LIB@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_PKGCONF = @GLIB_PKGCONF@
-GLIB_SINGLE_LIB = @GLIB_SINGLE_LIB@
-GLIB_SINGLE_SO = @GLIB_SINGLE_SO@
 GLIB_SO = @GLIB_SO@
 GLIB_TARGET = @GLIB_TARGET@
 GLIB_VERSION = @GLIB_VERSION@
@@ -273,14 +275,21 @@ PERL_INSTALL_DIR = @PERL_INSTALL_DIR@
 PERL_POSIX_LIB = @PERL_POSIX_LIB@
 PERL_POSIX_SO = @PERL_POSIX_SO@
 POPTLIBS = @POPTLIBS@
-PYTHON_CFLAGS = @PYTHON_CFLAGS@
+PYTHON = @PYTHON@
+PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
 PYTHON_DIR = @PYTHON_DIR@
+PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
+PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
 PYTHON_GUI_DIR = @PYTHON_GUI_DIR@
 PYTHON_HAS_POSIX_THREADS = @PYTHON_HAS_POSIX_THREADS@
 PYTHON_INSTALL_DIR = @PYTHON_INSTALL_DIR@
 PYTHON_INSTALL_LIB_DIR = @PYTHON_INSTALL_LIB_DIR@
+PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_POSIX_LIB = @PYTHON_POSIX_LIB@
 PYTHON_POSIX_SO = @PYTHON_POSIX_SO@
+PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
+PYTHON_SWIG_FLAGS = @PYTHON_SWIG_FLAGS@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RT_LIB = @RT_LIB@
 SED = @SED@
@@ -291,6 +300,7 @@ SOCKETLIB = @SOCKETLIB@
 STRIP = @STRIP@
 SWIG = @SWIG@
 SWIG_DIR = @SWIG_DIR@
+SWIG_LIB = @SWIG_LIB@
 TCL_CFLAGS = @TCL_CFLAGS@
 TCL_DIR = @TCL_DIR@
 TCL_LIB = @TCL_LIB@
@@ -347,12 +357,10 @@ pkgprog = @pkgprog@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-pythonprog = @pythonprog@
 runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
-swigprog = @swigprog@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
diff --git a/lanserv/serv.c b/lanserv/serv.c
index a26b376..0aa6b9b 100644
--- a/lanserv/serv.c
+++ b/lanserv/serv.c
@@ -247,9 +247,12 @@ debug_log_raw_msg(sys_data_t *sys,
     int pos;
     char dummy;
     unsigned int i;
+    struct timeval tv;
 
+    gettimeofday(&tv, NULL);
     va_start(ap, format);
     slen = vsnprintf(&dummy, 1, format, ap);
+    slen += snprintf(&dummy, 1, " %ld.%6.6ld", tv.tv_sec, tv.tv_usec);
     va_end(ap);
     slen += len * 3 + 2;
     str = malloc(slen);
@@ -258,6 +261,7 @@ debug_log_raw_msg(sys_data_t *sys,
     va_start(ap, format);
     pos = vsprintf(str, format, ap);
     va_end(ap);
+    pos += sprintf(str + pos, " %ld.%6.6ld", tv.tv_sec, tv.tv_usec);
     str[pos++] = '\n';
     str[pos] = '\0';
     for (i = 0; i < len; i++)
diff --git a/lanserv/sol.c b/lanserv/sol.c