From: mdw <mdw>
Date: Tue, 15 Aug 2000 21:39:13 +0000 (+0000)
Subject: New library configuration stuff from `common'.
X-Git-Tag: 2.0.4~151
X-Git-Url: https://git.distorted.org.uk/~mdw/mLib/commitdiff_plain/37e8702c05f44f2f7b19af99b4b2e38408c3e397

New library configuration stuff from `common'.
---

diff --git a/.links b/.links
index 90b6916..18faec4 100644
--- a/.links
+++ b/.links
@@ -4,3 +4,4 @@ mdwopt.c
 mdwopt.h
 missing
 mkinstalldirs
+lib-config.in
diff --git a/configure.in b/configure.in
index 85ff688..c41e59b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl -*-fundamental-*-
 dnl
-dnl $Id: configure.in,v 1.26 2000/07/29 22:08:04 mdw Exp $
+dnl $Id: configure.in,v 1.27 2000/08/15 21:39:13 mdw Exp $
 dnl
 dnl Configuration script for mLib
 dnl
@@ -29,8 +29,8 @@ dnl MA 02111-1307, USA.
 dnl ----- Revision history --------------------------------------------------
 dnl
 dnl $Log: configure.in,v $
-dnl Revision 1.26  2000/07/29 22:08:04  mdw
-dnl Version bump.
+dnl Revision 1.27  2000/08/15 21:39:13  mdw
+dnl New library configuration stuff from `common'.
 dnl
 dnl Revision 1.25  2000/07/16 18:57:42  mdw
 dnl Version bump.  Change compiler flags.
@@ -72,7 +72,7 @@ dnl Initial version of mLib
 dnl
 
 AC_INIT(exc.c)
-AM_INIT_AUTOMAKE(mLib, 2.0.0pre4)
+mdw_INIT_LIB(mLib, mLib, 2.0.0pre4)
 
 AC_PROG_CC
 AM_PROG_LIBTOOL
@@ -83,4 +83,4 @@ mdw_CHECK_MANYLIBS(gethostbyname, nsl resolv)
 
 mdw_OPT_mLib_DEBUG(mLib)
 
-AC_OUTPUT(Makefile mLib-config man/Makefile)
+AC_OUTPUT(Makefile man/Makefile mLib-config:lib-config.in)
diff --git a/mLib-config.in b/mLib-config.in
deleted file mode 100755
index 5ed3f51..0000000
--- a/mLib-config.in
+++ /dev/null
@@ -1,105 +0,0 @@
-#! /bin/sh
-#
-# $Id: mLib-config.in,v 1.1 1999/11/11 17:48:28 mdw Exp $
-#
-# Provide configuration information for mLib clients
-#
-# (c) 1999 Straylight/Edgeware
-#
-
-#----- Licensing notice -----------------------------------------------------
-#
-# This file is part of mLib.
-#
-# mLib 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.
-# 
-# mLib 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 mLib; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA.
-
-#----- Revision history -----------------------------------------------------
-#
-# $Log: mLib-config.in,v $
-# Revision 1.1  1999/11/11 17:48:28  mdw
-# New configuration system for library clients.
-#
-
-#----- Configuration --------------------------------------------------------
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-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
-mLib, version $VERSION
-
-Usage: $ego OPTION
-
-Provides configuration parameters for mLib client programs.  Options
-are:
-
---help		Display this help text.
---version	Display mLib 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}"
-    ;;
-  --libs)
-    echo "-L${libdir} -lmLib"
-    ;;
-  *)
-    echo >&2 "$ego: unrecognized option \`$1'"
-    exit 1
-esac
-
-#----- That's all, folks ----------------------------------------------------