diff options
| author | Peng Huang <shawn.p.huang@gmail.com> | 2010-09-27 14:09:07 +0800 |
|---|---|---|
| committer | Peng Huang <shawn.p.huang@gmail.com> | 2010-09-27 14:09:07 +0800 |
| commit | a0b31c7a250cfa7af1b52056a1d1ada81b22a455 (patch) | |
| tree | 8da3ce94a625c249e3e4b1ab81afcee7f4900236 /src/Makefile.am | |
| parent | 27c2f7ea0ef69094db2dfc009bb661276fc90227 (diff) | |
| download | ibus-libpinyin-a0b31c7a250cfa7af1b52056a1d1ada81b22a455.tar.gz ibus-libpinyin-a0b31c7a250cfa7af1b52056a1d1ada81b22a455.tar.xz ibus-libpinyin-a0b31c7a250cfa7af1b52056a1d1ada81b22a455.zip | |
Add option --disable-boost to support build without boost
When build without boost, ibus-pinyin will use smart pointer
from c++0x and use the signal templates embedded instead of
boost::signals2.
BUG=chromium-os:5055
TEST=manual
Review URL: http://codereview.appspot.com/2205044
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index c18aa07..b215c78 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -117,16 +117,27 @@ ibus_engine_pinyin_SOURCES = \ $(ibus_engine_pinyin_built_c_sources) \ $(ibus_engine_pinyin_built_h_sources) \ $(NULL) + + ibus_engine_pinyin_CXXFLAGS = \ @IBUS_CFLAGS@ \ @SQLITE_CFLAGS@ \ - @BOOST_CPPFLAGS@ \ @OPENCC_CFLAGS@ \ -DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\" \ -DPKGDATADIR=\"$(pkgdatadir)\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ $(NULL) +if HAVE_BOOST +ibus_engine_pinyin_CXXFLAGS += \ + @BOOST_CPPFLAGS@ \ + $(NULL) +else +ibus_engine_pinyin_CXXFLAGS += \ + -std=c++0x \ + $(NULL) +endif + ibus_engine_pinyin_LDADD = \ @IBUS_LIBS@ \ @SQLITE_LIBS@ \ @@ -154,17 +165,6 @@ if IBUS_BUILD_LUA_EXTENSION $(NULL) endif - -# if HAVE_BOOST_SIGNALS2 -# # do nothing -# else -# ibus_engine_pinyin_CXXFLAGS += $(LIBUUID_CFLAGS) -# ibus_engine_pinyin_LDADD += \ -# $(BOOST_SIGNALS_LDFLAGS) \ -# $(BOOST_SIGNALS_LIBS) \ -# $(NULL) -# endif - BUILT_SOURCES = \ $(ibus_engine_built_c_sources) \ $(ibus_engine_built_h_sources) \ |