Update automatically managed build utilities.

diff --git a/Makefile.am b/Makefile.am
index c896216..4ec1502 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -122,11 +122,13 @@ endif
 
 ## x86 model identification
 if X86
+if HAVE_MLIB
 bin_PROGRAMS           += x86-model
 x86_model_SOURCES       = x86-model.c
 x86_model_LDADD                 = $(mLib_LIBS)
 dist_man_MANS          += x86-model.1
 endif
+endif
 
 ###--------------------------------------------------------------------------
 ### Tools in scripts.

diff --git a/Makefile.in b/Makefile.in
index 67121e5..f3b19a3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -89,8 +89,8 @@ sbin_PROGRAMS =
 @HAVE_CATACOMB_TRUE@am__append_6 = gorp.1
 @HAVE_LIBCDB_TRUE@am__append_7 = cdb-probe cdb-check-domain
 @HAVE_LIBCDB_TRUE@am__append_8 = cdb-probe.1 cdb-check-domain.1
-@X86_TRUE@am__append_9 = x86-model
-@X86_TRUE@am__append_10 = x86-model.1
+@HAVE_MLIB_TRUE@@X86_TRUE@am__append_9 = x86-model
+@HAVE_MLIB_TRUE@@X86_TRUE@am__append_10 = x86-model.1
 @HAVE_BASH_TRUE@am__append_11 = inplace
 @HAVE_BASH_TRUE@am__append_12 = inplace
 @HAVE_BASH_TRUE@am__append_13 = inplace.in
@@ -133,7 +133,7 @@ CONFIG_CLEAN_VPATH_FILES =
 @HAVE_CATACOMB_TRUE@am__EXEEXT_3 = gorp$(EXEEXT)
 @HAVE_LIBCDB_TRUE@am__EXEEXT_4 = cdb-probe$(EXEEXT) \
 @HAVE_LIBCDB_TRUE@     cdb-check-domain$(EXEEXT)
-@X86_TRUE@am__EXEEXT_5 = x86-model$(EXEEXT)
+@HAVE_MLIB_TRUE@@X86_TRUE@am__EXEEXT_5 = x86-model$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" \
        "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
        "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(sbindir)" \
@@ -191,9 +191,10 @@ am__stamp_SOURCES_DIST = stamp.c
 stamp_OBJECTS = $(am_stamp_OBJECTS)
 @HAVE_MLIB_TRUE@stamp_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am__x86_model_SOURCES_DIST = x86-model.c
-@X86_TRUE@am_x86_model_OBJECTS = x86-model.$(OBJEXT)
+@HAVE_MLIB_TRUE@@X86_TRUE@am_x86_model_OBJECTS = x86-model.$(OBJEXT)
 x86_model_OBJECTS = $(am_x86_model_OBJECTS)
-@X86_TRUE@x86_model_DEPENDENCIES = $(am__DEPENDENCIES_1)
+@HAVE_MLIB_TRUE@@X86_TRUE@x86_model_DEPENDENCIES =  \
+@HAVE_MLIB_TRUE@@X86_TRUE@     $(am__DEPENDENCIES_1)
 am_xtitle_OBJECTS = xtitle.$(OBJEXT)
 xtitle_OBJECTS = $(am_xtitle_OBJECTS)
 xtitle_LDADD = $(LDADD)
@@ -441,8 +442,8 @@ xtitle_SOURCES = xtitle.c
 @HAVE_LIBCDB_TRUE@cdb_probe_LDADD = -lcdb
 @HAVE_LIBCDB_TRUE@cdb_check_domain_SOURCES = cdb-check-domain.c
 @HAVE_LIBCDB_TRUE@cdb_check_domain_LDADD = -lcdb
-@X86_TRUE@x86_model_SOURCES = x86-model.c
-@X86_TRUE@x86_model_LDADD = $(mLib_LIBS)
+@HAVE_MLIB_TRUE@@X86_TRUE@x86_model_SOURCES = x86-model.c
+@HAVE_MLIB_TRUE@@X86_TRUE@x86_model_LDADD = $(mLib_LIBS)
 
 ###--------------------------------------------------------------------------
 ### Tools in scripts.

diff --git a/configure b/configure
index eb3021b..ce70dde 100755 (executable)
--- 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 distorted-utils 1.4.1.
+# Generated by GNU Autoconf 2.69 for distorted-utils 1.4.1.1.
 #
 # Report bugs to <mdw@distorted.org.uk>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='distorted-utils'
 PACKAGE_TARNAME='distorted-utils'
-PACKAGE_VERSION='1.4.1'
-PACKAGE_STRING='distorted-utils 1.4.1'
+PACKAGE_VERSION='1.4.1.1'
+PACKAGE_STRING='distorted-utils 1.4.1.1'
 PACKAGE_BUGREPORT='mdw@distorted.org.uk'
 PACKAGE_URL=''
 
@@ -1292,7 +1292,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 distorted-utils 1.4.1 to adapt to many kinds of systems.
+\`configure' configures distorted-utils 1.4.1.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1362,7 +1362,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of distorted-utils 1.4.1:";;
+     short | recursive ) echo "Configuration of distorted-utils 1.4.1.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1471,7 +1471,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-distorted-utils configure 1.4.1
+distorted-utils configure 1.4.1.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1639,7 +1639,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by distorted-utils $as_me 1.4.1, which was
+It was created by distorted-utils $as_me 1.4.1.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2455,7 +2455,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='distorted-utils'
- VERSION='1.4.1'
+ VERSION='1.4.1.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5377,7 +5377,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 distorted-utils $as_me 1.4.1, which was
+This file was extended by distorted-utils $as_me 1.4.1.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5434,7 +5434,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="\\
-distorted-utils config.status 1.4.1
+distorted-utils config.status 1.4.1.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/debian/changelog b/debian/changelog
index 8deb730..92c369d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+distorted-utils (1.4.1.1) experimental; urgency=low
+
+  * Build system fix: don't build `x86-model' if mLib isn't available.
+    (Doesn't affect Debian package.)
+
+ -- Mark Wooding <mdw@distorted.org.uk>  Fri, 29 Jan 2016 10:50:58 +0000
+
 distorted-utils (1.4.1) experimental; urgency=low
 
   * mtimeout: Clarify exit status semantics in the manual page.