diff options
| author | Peng Wu <alexepico@gmail.com> | 2016-12-05 14:25:31 +0800 |
|---|---|---|
| committer | Peng Wu <alexepico@gmail.com> | 2016-12-05 14:25:31 +0800 |
| commit | ffddbe0f37fe64f60b943fc7dd8c9500c2f95f80 (patch) | |
| tree | 2f08c1ccfbc0efd6466192023499a001bcea3ea7 | |
| parent | b739445a808b212c5eec8406265507850d0f9324 (diff) | |
| download | libpinyin-1.7.x.tar.gz libpinyin-1.7.x.tar.xz libpinyin-1.7.x.zip | |
clean up autoconf1.7.x
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 10 |
2 files changed, 4 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index c3e2f25..9603f2f 100644 --- a/configure.ac +++ b/configure.ac @@ -101,9 +101,9 @@ AM_CONDITIONAL([BERKELEYDB], [test x"$DBM" = x"BerkeleyDB"]) if test x"$DBM" = x"KyotoCabinet"; then # Check Kyoto Cabinet - PKG_CHECK_MODULES(KYOTOCABINET, [ - kyotocabinet - ], []) + PKG_CHECK_MODULES(KYOTOCABINET, [kyotocabinet], []) + + AC_SEARCH_LIBS([kcdbopen], [kyotocabinet], [], AC_MSG_ERROR([Cannot find Kyoto Cabinet library])) AC_DEFINE([HAVE_KYOTO_CABINET], [], [Have Kyoto Cabinet.]) fi diff --git a/src/Makefile.am b/src/Makefile.am index a0b4185..eee8381 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,7 +33,7 @@ INCLUDES = -I$(top_srcdir)/src \ libpinyinincludedir = $(includedir)/libpinyin-@VERSION@ -libpinyininclude_HEADERS= pinyin.h +libpinyininclude_HEADERS = pinyin.h noinst_HEADERS = pinyin_internal.h @@ -48,18 +48,10 @@ libpinyin_la_LIBADD = storage/libstorage.la lookup/liblookup.la @GLIB2_LIBS@ libpinyin_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libpinyin.ver \ -version-info @LT_VERSION_INFO@ -if KYOTOCABINET -libpinyin_la_LDFLAGS += @KYOTOCABINET_LIBS@ -endif - libpinyin_internal_la_SOURCES = pinyin_internal.cpp libpinyin_internal_la_LIBADD = storage/libstorage.la lookup/liblookup.la -if KYOTOCABINET -libpinyin_internal_la_LDFLAGS = @KYOTOCABINET_LIBS@ -endif - ## Note: ## As libpinyin internal interface will change, only provides static library ## to catch errors when compiling instead of running. |