libraries/mrw-cxx
1
0
Fork 0
Code Issues Releases Activity

better naming for major minor and least (one is a keyword)

Browse Source 
PEDANTIC is now a AM variable
This commit is contained in:
Marc Wäckerlin
2004-10-07 07:02:30 +00:00
parent 34a6a5eae7
commit 1f11af2269
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
configure.in
View File

@@ -9,6 +9,10 @@
## @license LGPL, see file <a href="license.html">COPYING</a> ## @license LGPL, see file <a href="license.html">COPYING</a>
## ##
## $Log$ ## $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 ## Revision 1.9 2004/09/09 20:09:06 marc
## library versioning now works how i want it ## library versioning now works how i want it
## ##
@@ -35,26 +39,25 @@
# init # init
AC_INIT([mrw/mrw.hpp.in]) AC_INIT([mrw/mrw.hpp.in])
PACKAGENAME=mrw-c++ PACKAGENAME=mrw-c++
m4_define(major, 1) m4_define(x_major, 1)
m4_define(minor, 94) m4_define(x_minor, 0)
m4_define(least, 0) m4_define(x_least, 0)
AM_INIT_AUTOMAKE(@PACKAGENAME@, @MAJOR@.@MINOR@.@LEAST@, [marc@waeckerlin.org]) AM_INIT_AUTOMAKE(@PACKAGENAME@, @MAJOR@.@MINOR@.@LEAST@, [marc@waeckerlin.org])
# copy M4 to shell # copy M4 to shell
MAJOR=major MAJOR=x_major
MINOR=minor MINOR=x_minor
LEAST=least LEAST=x_least
AC_SUBST(MAJOR) AC_SUBST(MAJOR)
AC_SUBST(MINOR) AC_SUBST(MINOR)
AC_SUBST(LEAST) AC_SUBST(LEAST)
# libtool versioning # libtool versioning
LIB_MAJOR=m4_eval(major+minor) LIB_MAJOR=m4_eval(x_major+x_minor)
AC_SUBST(LIB_MAJOR) LIB_MINOR=x_least
LIB_MINOR=least LIB_LEAST=x_minor
AC_SUBST(LIB_MINOR) LIB_VERSION="${LIB_MAJOR}:${LIB_MINOR}:${LIB_LEAST}"
LIB_LEAST=minor AC_SUBST(LIB_VERSION)
AC_SUBST(LIB_LEAST)
# macros # macros
README=README 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"]) 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 problem in libs: -Wshadow -Wcast-qual
dnl auto.hpp: -Wno-ctor-dtor-privacy (removed) dnl auto.hpp: -Wno-ctor-dtor-privacy (removed)
AM_CONDITIONAL(PEDANTIC, test "$enableval" = "yes")
AC_ARG_ENABLE(dot, AC_ARG_ENABLE(dot,
[ --disable-dot disable dot graphic tools for documentation], [ --disable-dot disable dot graphic tools for documentation],
[have_dot="$enableval"]) [have_dot="$enableval"])