From 1f11af226948831eeddc7892b2fc8785442bcdb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Thu, 7 Oct 2004 07:02:30 +0000
Subject: [PATCH] better naming for major minor and least (one is a keyword)
 PEDANTIC is now a AM variable

---
 configure.in | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/configure.in b/configure.in
index 28d1068..4435ec4 100644
--- a/configure.in
+++ b/configure.in
@@ -9,6 +9,10 @@
 ## @license LGPL, see file <a href="license.html">COPYING</a>
 ##
 ## $Log$
+## Revision 1.10  2004/10/07 07:02:30  marc
+## better naming for major minor and least (one is a keyword)
+## PEDANTIC is now a AM variable
+##
 ## Revision 1.9  2004/09/09 20:09:06  marc
 ## library versioning now works how i want it
 ##
@@ -35,26 +39,25 @@
 # init
 AC_INIT([mrw/mrw.hpp.in])
 PACKAGENAME=mrw-c++
-m4_define(major, 1)
-m4_define(minor, 94)
-m4_define(least, 0)
+m4_define(x_major, 1)
+m4_define(x_minor, 0)
+m4_define(x_least, 0)
 AM_INIT_AUTOMAKE(@PACKAGENAME@, @MAJOR@.@MINOR@.@LEAST@, [marc@waeckerlin.org])
 
 # copy M4 to shell
-MAJOR=major
-MINOR=minor
-LEAST=least
+MAJOR=x_major
+MINOR=x_minor
+LEAST=x_least
 AC_SUBST(MAJOR)
 AC_SUBST(MINOR)
 AC_SUBST(LEAST)
 
 # libtool versioning
-LIB_MAJOR=m4_eval(major+minor)
-AC_SUBST(LIB_MAJOR)
-LIB_MINOR=least
-AC_SUBST(LIB_MINOR)
-LIB_LEAST=minor
-AC_SUBST(LIB_LEAST)
+LIB_MAJOR=m4_eval(x_major+x_minor)
+LIB_MINOR=x_least
+LIB_LEAST=x_minor
+LIB_VERSION="${LIB_MAJOR}:${LIB_MINOR}:${LIB_LEAST}"
+AC_SUBST(LIB_VERSION)
 
 # macros
 README=README
@@ -89,6 +92,7 @@ AC_ARG_ENABLE(pedantic,
      AM_CXXFLAGS="${AM_CXXFLAGS:-} -pedantic-errors -Wall -W -Wfloat-equal -Wundef -Wendif-labels -Wpointer-arith -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Wmissing-format-attribute -Wno-multichar -Wpacked -Wredundant-decls -Werror -Wshadow -Wcast-qual -Wno-ctor-dtor-privacy"])
 dnl problem in libs: -Wshadow -Wcast-qual
 dnl auto.hpp: -Wno-ctor-dtor-privacy (removed)
+AM_CONDITIONAL(PEDANTIC, test "$enableval" = "yes")
 AC_ARG_ENABLE(dot,
   [  --disable-dot           disable dot graphic tools for documentation],
   [have_dot="$enableval"])