summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2009-10-13 10:31:58 -0700
committerAlan Coopersmith <alan.coopersmith@sun.com>2009-10-13 10:33:31 -0700
commit906259ecc70dd4d0ef91f4582bd2a035d094831e (patch)
tree1e3336dee554827eacaed18ce37f4016c1ea0cfe
parentfc248fb44413d11fed288793d0d8c2af76aeeb40 (diff)
Set libtool version-number automatically from package version
Since we've forgotten to manually update in most libXft releases so far, might as well just automate it. Reported by: Paulo Ricardo Zanoni <pzanoni@mandriva.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-rw-r--r--configure.ac3
-rw-r--r--src/Makefile.am2
2 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 141fd25..feb0a76 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,9 @@ AC_DEFINE_UNQUOTED([XFT_REVISION],
[`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`],
[Micro revision of Xft])
+XFT_LT_VERSION=`echo $PACKAGE_VERSION | tr '.' ':'`
+AC_SUBST([XFT_LT_VERSION])
+
#
# Check for Xrender
#
diff --git a/src/Makefile.am b/src/Makefile.am
index 6417dbc..d9604a0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,7 @@ libXft_la_SOURCES = xftint.h \
libXft_la_LIBADD = @FONTCONFIG_LIBS@ @FREETYPE_LIBS@ @XRENDER_LIBS@
# -version-number requires libtool >= 1.5
-libXft_la_LDFLAGS = -version-number 2:1:13 -no-undefined
+libXft_la_LDFLAGS = -version-number $(XFT_LT_VERSION) -no-undefined
libXftincludedir = $(includedir)/X11/Xft
libXftinclude_HEADERS = \