From 976955cff3e6bfe7b920ae882104058ced031c96 Mon Sep 17 00:00:00 2001
From: jez <>
Date: Tue, 19 Sep 2006 21:05:25 +0000
Subject: [PATCH] wide string targets now conditionally compiled

---
 m4/has_std_wstring.m4    | 1 +
 m4/want_dom.m4           | 2 +-
 test/DOM/Makefile.am     | 5 ++++-
 test/SAX2DOM/Makefile.am | 6 +++++-
 test/XPath/Makefile.am   | 5 ++++-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/m4/has_std_wstring.m4 b/m4/has_std_wstring.m4
index 36c39042..918e9c20 100644
--- a/m4/has_std_wstring.m4
+++ b/m4/has_std_wstring.m4
@@ -9,4 +9,5 @@ AC_DEFUN([ARABICA_HAS_STD_WSTRING],
   if test $wchar_t_available = no; then
     AC_DEFINE(ARABICA_NO_WCHAR_T, ,[disables wchar_t])
   fi
+  AM_CONDITIONAL(HAS_STD_WSTRING, test $wchar_t_available = yes)
 ])
diff --git a/m4/want_dom.m4 b/m4/want_dom.m4
index 1d583392..27f967c9 100755
--- a/m4/want_dom.m4
+++ b/m4/want_dom.m4
@@ -15,7 +15,7 @@ AC_DEFUN([ARABICA_WANT_DOM],
   AM_CONDITIONAL(WANT_DOM, test "$want_dom" = "yes")
   if test "$want_dom" = "yes"; then
     if test "$boost_is_available" = "yes"; then
-      want_xpath = "yes"
+      want_xpath="yes"
     fi
   fi
   if test "$want_xpath" != "yes"; then
diff --git a/test/DOM/Makefile.am b/test/DOM/Makefile.am
index 523715d8..a37b9018 100644
--- a/test/DOM/Makefile.am
+++ b/test/DOM/Makefile.am
@@ -1,5 +1,8 @@
 
-bin_PROGRAMS = dom_test dom_test_silly dom_test_wide
+bin_PROGRAMS = dom_test dom_test_silly 
+if HAS_STD_WSTRING
+  bin_PROGRAMS += dom_test_wide
+endif
 
 LIBARABICA =  $(top_builddir)/src/libarabica.la
 
diff --git a/test/SAX2DOM/Makefile.am b/test/SAX2DOM/Makefile.am
index d8254a87..0306793e 100755
--- a/test/SAX2DOM/Makefile.am
+++ b/test/SAX2DOM/Makefile.am
@@ -24,7 +24,11 @@ cppunit_sources = ../CppUnit/framework/CppUnitException.h \
 
 test_sources = test_SAX.h
 
-sax2dom_test_SOURCES = main.cpp $(cppunit_sources) $(test_sources) ../silly_string/silly_string.cpp ../silly_string/silly_string.hpp
+sax2dom_test_SOURCES = main.cpp \
+                       $(cppunit_sources) \
+                       $(test_sources) \
+                       ../silly_string/silly_string.cpp \
+                       ../silly_string/silly_string.hpp
 sax2dom_test_DEPENDENCES = $(LIBARABICA)
 sax2dom_test_LDADD =  $(LIBARABICA)
 
diff --git a/test/XPath/Makefile.am b/test/XPath/Makefile.am
index caedb0d6..2a471265 100755
--- a/test/XPath/Makefile.am
+++ b/test/XPath/Makefile.am
@@ -1,5 +1,8 @@
 
-bin_PROGRAMS = xpath_test xpath_test_silly xpath_test_wide
+bin_PROGRAMS = xpath_test xpath_test_silly 
+if HAS_STD_WSTRING
+  bin_PROGRAMS += xpath_test_wide
+endif
 
 LIBARABICA =  $(top_builddir)/src/libarabica.la