wide string targets now conditionally compiled

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)
 ])

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

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
 

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)
 

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