From 2096010ce0e689b1074bbb4158d1a79c887c8438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Thu, 10 Nov 2011 10:27:51 +0000 Subject: [PATCH] correct verion number; closes #5 --- configure.in | 14 ++++++++------ src/makefile.am | 1 + 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/configure.in b/configure.in index 5251327..3f08773 100644 --- a/configure.in +++ b/configure.in @@ -22,19 +22,21 @@ DOC_DIR=doc m4_define(x_packagename, libxml-cxx) m4_define(x_major, 1) -m4_define(x_minor, 0) +m4_define(x_minor, 1) PACKAGENAME=x_packagename MAJOR=x_major MINOR=x_minor BUILDDATE=$(date "+%d.%m.%Y/%H.%M") -LEAST="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout" -for path in . .. ../..; do - if svn info $path 2>&1 > /dev/null; then +if svn info . 2>&1 > /dev/null; then LEAST=$(LANG= svn info $path | sed -n 's/Revision: //p') break; - fi -done +else + LEAST=[$(pwd | sed -n 's,^.*/'${PACKAGENAME}'-'${MAJOR}'\.'${MINOR}'\.\([0-9]*\).*$,\1,p')] + if test -z "${LEAST}"; then + LEAST="ERROR CANNOT DETERMINE REVISION NUMBER from $(pwd)" + fi +fi AM_INIT_AUTOMAKE($PACKAGENAME, $MAJOR.$MINOR.$LEAST, [marc@waeckerlin.org]) diff --git a/src/makefile.am b/src/makefile.am index ad4ce0c..e739468 100644 --- a/src/makefile.am +++ b/src/makefile.am @@ -19,6 +19,7 @@ lib_LTLIBRARIES = libxml-cxx.la nobase_include_HEADERS = xml-cxx/xml.hxx xml-cxx/any.hxx libxml_cxx_la_SOURCES = xml.cxx version.cxx +libxml_cxx_la_LDFLAGS = -version-info ${LIB_VERSION} DISTCLEANFILES = $(pkgconfig_DATA) MAINTAINERCLEANFILES = makefile.in