Fix build error with c++0x and disable boost by default

BUG=None
TEST=Manual

Review URL: http://codereview.appspot.com/5376056

3 files changed, 54 insertions, 3 deletions

diff --git a/configure.ac b/configure.ac
index 6b1f813..199ce8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,10 +136,10 @@ AC_SUBST(ENV)
 
 # --disble-boost
 AC_ARG_ENABLE(boost,
-    AC_HELP_STRING([--disable-boost],
+    AC_HELP_STRING([--enable-boost],
         [Do not use boost and use stdc++0x to replace boost.]),
         [enable_boost=$enableval],
-        [enable_boost=yes]
+        [enable_boost=no]
 )
 if test x"$enable_boost" = x"yes"; then
     # check boost
diff --git a/data/db/Makefile.am b/data/db/Makefile.am
new file mode 100644
index 0000000..eb1ef61
--- /dev/null
+++ b/data/db/Makefile.am
@@ -0,0 +1,51 @@
+# vim:set noet ts=4:
+#
+# libpyzy - The Chinese PinYin and Bopomofo conversion library.
+#
+# Copyright (c) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
+#
+# This library is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+main_db_DATA = \
+	create_index.sql \
+	$(NULL)
+main_dbdir = $(pkgdatadir)/db
+
+EXTRA_DIST = \
+	create_index.sql \
+	$(NULL)
+
+SUBDIRS = \
+	android \
+	open-phrase \
+	$(NULL)
+
+
+install-data-hook:
+	@( \
+if test "$(NO_INDEX)" = ""; then \
+  cd $(DESTDIR)$(main_dbdir); \
+  if test -f android.db; then \
+    echo "Creating index for android.db"; \
+    sqlite3 android.db ".read create_index.sql"; \
+  fi; \
+  if test -f open-phrase.db; then \
+    echo "Creating index for open-phrase.db"; \
+    sqlite3 open-phrase.db ".read create_index.sql"; \
+  fi; \
+fi)
+
+
diff --git a/src/PyZyUtil.h b/src/PyZyUtil.h
index 5995e52..292fd85 100644
--- a/src/PyZyUtil.h
+++ b/src/PyZyUtil.h
@@ -37,7 +37,7 @@
 #include <string>
 #include <glib/gtypes.h>
 
-#ifdef __GXX_EXPERIMENTAL_CXX0X__PYZY_
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
 #  include <memory>
 #else
 #  include <boost/shared_ptr.hpp>