diff options
| author | Peng Wu <alexepico@gmail.com> | 2012-06-21 11:25:33 +0800 |
|---|---|---|
| committer | Peng Wu <alexepico@gmail.com> | 2012-06-21 11:30:23 +0800 |
| commit | 9aa87d6bdadf9492a3c09d49841e23052c043d16 (patch) | |
| tree | c99a934fe7ecdb16b12544fbeacfb0de24ab9930 | |
| parent | ec6e09e705e570236fbaf21b3acf9d30e6fa2381 (diff) | |
| download | libpinyin-9aa87d6bdadf9492a3c09d49841e23052c043d16.tar.gz libpinyin-9aa87d6bdadf9492a3c09d49841e23052c043d16.tar.xz libpinyin-9aa87d6bdadf9492a3c09d49841e23052c043d16.zip | |
update autoconf
| -rw-r--r-- | configure.ac | 20 | ||||
| -rw-r--r-- | libpinyin.pc.in | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/include/Makefile.am | 2 | ||||
| -rw-r--r-- | src/storage/Makefile.am | 2 |
5 files changed, 24 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 83168de..600068a 100644 --- a/configure.ac +++ b/configure.ac @@ -2,14 +2,30 @@ # Process this file with autoconf to produce a configure script. +m4_define([libpinyin_major_version], [0]) +m4_define([libpinyin_minor_version], [6]) +m4_define([libpinyin_micro_version], [91]) +m4_define([libpinyin_abi_current], [2]) +m4_define([libpinyin_abi_revision], [0]) + +m4_define([libpinyin_version], + [libpinyin_major_version.libpinyin_minor_version.libpinyin_micro_version]) +m4_define([libpinyin_binary_version], + [libpinyin_abi_current.libpinyin_abi_revision]) + AC_PREREQ(2.60) -AC_INIT(libpinyin, 0.6.91, alexepico@gmail.com) +AC_INIT([libpinyin], [libpinyin_version], [https://github.com/libpinyin/libpinyin/issues/new]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) # Define a string for binary compatibility -LIBPINYIN_BINARY_VERSION=0.3 +m4_define([lt_current], [libpinyin_abi_current]) +m4_define([lt_revision], [libpinyin_abi_revision]) +LT_VERSION_INFO="lt_current:lt_revision" +AC_SUBST(LT_VERSION_INFO) + +LIBPINYIN_BINARY_VERSION="libpinyin_binary_version" AC_SUBST(LIBPINYIN_BINARY_VERSION) # Checks for programs. diff --git a/libpinyin.pc.in b/libpinyin.pc.in index 3150a76..45c61c4 100644 --- a/libpinyin.pc.in +++ b/libpinyin.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ datadir=@datadir@ pkgdatadir=@datadir@/libpinyin -libpinyinincludedir=${includedir}/libpinyin-@LIBPINYIN_BINARY_VERSION@ +libpinyinincludedir=${includedir}/libpinyin-@VERSION@ libpinyin_binary_version=@LIBPINYIN_BINARY_VERSION@ Name: libpinyin diff --git a/src/Makefile.am b/src/Makefile.am index e6ec44a..5ac2c6f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,7 +32,7 @@ INCLUDES = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/lookup \ @GLIB2_CPPFLAGS@ -libpinyinincludedir = $(includedir)/libpinyin-@LIBPINYIN_BINARY_VERSION@ +libpinyinincludedir = $(includedir)/libpinyin-@VERSION@ libpinyininclude_HEADERS= pinyin.h @@ -47,7 +47,7 @@ libpinyin_la_SOURCES = pinyin.cpp libpinyin_la_LIBADD = storage/libstorage.la lookup/liblookup.la libpinyin_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libpinyin.ver \ - -version-info "0:3:0" + -version-info @LT_VERSION_INFO@ libpinyin_internal_la_SOURCES = pinyin_internal.cpp @@ -56,4 +56,4 @@ libpinyin_internal_la_LIBADD = storage/libstorage.la lookup/liblookup.la ## Note: ## As libpinyin internal interface will change, only provides static library -## to catch errors when compiling instead of running.
\ No newline at end of file +## to catch errors when compiling instead of running. diff --git a/src/include/Makefile.am b/src/include/Makefile.am index 5e543d9..a779d97 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -17,7 +17,7 @@ MAINTAINERCLEANFILES = Makefile.in -libpinyinincludedir = $(includedir)/libpinyin-@LIBPINYIN_BINARY_VERSION@ +libpinyinincludedir = $(includedir)/libpinyin-@VERSION@ libpinyininclude_HEADERS= novel_types.h diff --git a/src/storage/Makefile.am b/src/storage/Makefile.am index 3fc7910..0ad3bdf 100644 --- a/src/storage/Makefile.am +++ b/src/storage/Makefile.am @@ -19,7 +19,7 @@ INCLUDES = -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ @GLIB2_CPPFLAGS@ -libpinyinincludedir = $(includedir)/libpinyin-@LIBPINYIN_BINARY_VERSION@ +libpinyinincludedir = $(includedir)/libpinyin-@VERSION@ libpinyininclude_HEADERS= chewing_enum.h \ chewing_key.h \ |