[dasher] g/c --enable-chinese. Fixes #619279.

[Patrick Welche <pwelche src gnome org>]

commit 62146c5e1a4d50b2d4256bc685656e66bd74d269
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Fri May 21 17:24:19 2010 +0100

    g/c --enable-chinese. Fixes #619279.

 Src/DasherCore/Makefile.am |   10 +++++-----
 configure.ac               |   19 -------------------
 2 files changed, 5 insertions(+), 24 deletions(-)
---
diff --git a/Src/DasherCore/Makefile.am b/Src/DasherCore/Makefile.am
index e4c8f68..ae4b1b1 100644
--- a/Src/DasherCore/Makefile.am
+++ b/Src/DasherCore/Makefile.am
@@ -105,6 +105,8 @@ libdashercore_a_SOURCES = \
 		OneButtonFilter.h \
 		OneDimensionalFilter.cpp \
 		OneDimensionalFilter.h \
+		PinyinParser.cpp \
+		PinyinParser.h \
 		SCENode.cpp \
 		SCENode.h \
 		SimpleTimer.cpp \
@@ -142,14 +144,12 @@ libdashercore_a_SOURCES = \
 		XMLUtil.cpp \
 		XMLUtil.h
 
-libdashercore_a_LIBADD = @CHINESE_SOURCES@ @JAPANESE_SOURCES@
-libdashercore_a_DEPENDENCIES = @CHINESE_SOURCES@ @JAPANESE_SOURCES@
+libdashercore_a_LIBADD = @JAPANESE_SOURCES@
+libdashercore_a_DEPENDENCIES = @JAPANESE_SOURCES@
 
 EXTRA_libdashercore_a_SOURCES = \
 		CannaConversionHelper.cpp \
-		CannaConversionHelper.h \
-		PinyinParser.cpp \
-		PinyinParser.h
+		CannaConversionHelper.h
 
 AM_CXXFLAGS = -I$(srcdir)/../DasherCore -DPROGDATA=\"$(pkgdatadir)\" -I../../intl -I$(top_srcdir)/intl $(GTK2_CFLAGS) $(SETTINGS_CFLAGS) $(gnome_speech_CFLAGS) $(gnome_a11y_CFLAGS) $(gnome_CFLAGS)
 
diff --git a/configure.ac b/configure.ac
index 8ee70f9..b592424 100644
--- a/configure.ac
+++ b/configure.ac
@@ -133,15 +133,6 @@ AC_ARG_ENABLE([japanese],
          fi, 
 	 WITHJAPANESE=false)
 
-AC_ARG_ENABLE([chinese],
-	 AS_HELP_STRING([--enable-chinese],[build with support for Chinese PinYin entry (experimental -- default is NO)]),
-	 if test "x$enableval" = "xno"; then
-	   WITHCHINESE=false; 
-	 else
-	   WITHCHINESE=true;
-         fi, 
-	 WITHCHINESE=false)
-
 AC_ARG_ENABLE([joystick],
 	 AS_HELP_STRING([--enable-joystick],[Build with Linux joystick support (note that other UNIX based operating systems aren't supported here)]),
 	 if test "x$enableval" = "xno"; then
@@ -301,15 +292,6 @@ fi
 
 AC_SUBST(JAPANESE_SOURCES)
 
-if test x"$WITHCHINESE" = xtrue; then
-	AC_DEFINE([CHINESE], 1, [Chinese support enabled])
-	CHINESE_SOURCES='PinyinParser.$(OBJEXT)'
-else
-	CHINESE_SOURCES=
-fi
-
-AC_SUBST(CHINESE_SOURCES)
-
 if test x"$WITHJOYSTICK" = xtrue; then
 	AC_DEFINE([JOYSTICK], 1, [Linux joystick support enabled])
 fi
@@ -373,7 +355,6 @@ AM_CONDITIONAL(WITH_GPE, test x$WITHGPE = xtrue)
 AM_CONDITIONAL(WITH_MAEMO, test x$WITHMAEMO = xtrue)
 AM_CONDITIONAL(WITH_MAEMOFULLSCREEN, test x$WITHMAEMOFULLSCREEN = xtrue)
 AM_CONDITIONAL(JAPANESE, test x$WITHJAPANESE = xtrue)
-AM_CONDITIONAL(CHINESE, test x$WITHCHINESE = xtrue)
 AM_CONDITIONAL(JOYSTICK, test x$WITHJOYSTICK = xtrue)
 
 AC_SUBST(GTK2_CFLAGS)