From 097fb6f2f97575ce17738b4afb3216e9492de2b4 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 9 Jan 2013 03:29:48 +0000
Subject: [PATCH] Cleanups.

  * Remove bogus old `catacomb-config.in' file from the pre-pkgconfig
    days.

  * Fix library version in Makefile.
---
 Makefile.m4        |  2 +-
 catacomb-config.in | 99 ------------------------------------------------------
 configure.in       |  1 +
 3 files changed, 2 insertions(+), 100 deletions(-)
 delete mode 100755 catacomb-config.in

diff --git a/Makefile.m4 b/Makefile.m4
index 982cece..c191886 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -162,7 +162,7 @@ BUILT_SOURCES = \
 lib_LTLIBRARIES = libcatacomb.la
 
 libcatacomb_la_LIBADD = $(CATACOMB_LIBS)
-libcatacomb_la_LDFLAGS = -version-info 3:1:1
+libcatacomb_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO)
 ## Middle number is the patchlevel.  Final number is the minor version.  The
 ## difference between the first and last numbers is major version.
 
diff --git a/catacomb-config.in b/catacomb-config.in
deleted file mode 100755
index 2b06152..0000000
--- a/catacomb-config.in
+++ /dev/null
@@ -1,99 +0,0 @@
-#! /bin/sh
-#
-# $Id: catacomb-config.in,v 1.2 2004/04/08 01:36:15 mdw Exp $
-#
-# Provide configuration information for Catacomb clients
-#
-# (c) 1999 Straylight/Edgeware
-#
-
-#----- Licensing notice -----------------------------------------------------
-#
-# This file is part of Catacomb.
-#
-# Catacomb is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Library General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# Catacomb is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with Catacomb; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA.
-
-#----- Configuration --------------------------------------------------------
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-archincludedir=${libdir}/catacomb/include
-
-VERSION=@VERSION@
-
-#----- Command-line parsing and output --------------------------------------
-
-ego=`echo "$0" | sed 's:.*/::'`
-
-if [ -z "${1+x}" ]; then
-  echo >&2 "Usage: $ego OPTION"
-  echo >&2 "Run \`$ego --help' for more information."
-  exit 1
-fi
-
-case "$1" in
-  --help)
-    cat <<EOF
-Catacomb, version $VERSION
-
-Usage: $ego OPTION
-
-Provides configuration parameters for Catacomb client programs.  Options
-are:
-
---help		Display this help text.
---version	Display Catacomb version number.
---check VERSION	Verifies that the given version number is supported.
---cflags	Display appropriate compiler flags.
---libs		Display appropriate linker flags and library names.
-EOF
-  ;;
-  --version)
-    echo $VERSION
-    ;;
-  --check)
-    version=${2-1.0.0pre0}
-    set `echo $VERSION | sed 's/[^0-9][^0-9]*/ /g'`
-    MAJOR=${1-1} MINOR=${2-0} PATCH=${3-0} PRE=$4
-    set `echo $version | sed 's/[^0-9][^0-9]*/ /g'`
-    major=${1-1} minor=${2-0} patch=${3-0} pre=$4
-    [ $major -gt $MAJOR ] && exit 1
-    [ $major -lt $MAJOR ] && exit 0
-    [ $minor -gt $MINOR ] && exit 1
-    [ $minor -lt $MINOR ] && exit 0
-    [ $patch -gt $PATCH ] && exit 1
-    [ $patch -lt $PATCH ] && exit 0
-    if [ "$PRE" ]; then
-      [ -z "$pre" ] && exit 1
-      [ $pre -gt $PRE ] && exit 1
-      [ $pre -lt $PRE ] && exit 0
-    fi
-    exit 0
-    ;;
-  --cflags)
-    echo "-I${includedir} -I${archincludedir}"
-    ;;
-  --libs)
-    echo "-L${libdir} -lcatacomb"
-    ;;
-  *)
-    echo >&2 "$ego: unrecognized option \`$1'"
-    exit 1
-esac
-
-#----- That's all, folks ----------------------------------------------------
diff --git a/configure.in b/configure.in
index 8e83caa..eecc3a8 100644
--- a/configure.in
+++ b/configure.in
@@ -40,6 +40,7 @@ dnl --- Make sure I can compile and build libraries ---
 AC_PROG_CC
 AM_PROG_LIBTOOL
 AX_CFLAGS_WARN_ALL
+mdw_LIBTOOL_VERSION_INFO
 
 AC_PROG_YACC
 
-- 
2.11.0