From 8e653a8e6f91cfe172057ba489b32b5d123857b3 Mon Sep 17 00:00:00 2001
From: jez <>
Date: Thu, 19 Jul 2007 17:05:18 +0000
Subject: [PATCH] merged with mangle-dev branch

---
 Makefile.am                | 12 +++++++---
 arabica.pc.in              |  5 ++--
 bin/poem.xml               |  4 +++-
 configure.ac               | 48 ++++++++++++++++++++------------------
 sax.dox => doc/arabica.dox |  0
 5 files changed, 40 insertions(+), 29 deletions(-)
 rename sax.dox => doc/arabica.dox (100%)

diff --git a/Makefile.am b/Makefile.am
index e2cbe31d..b006369e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS= src tests examples
+SUBDIRS= src test examples
 
 install-data-local:
 	@echo "------------------------------------------------------------"
@@ -22,7 +22,7 @@ uninstall-local:
 	  do rm -rf "$(includedir)/$$dir"; \
 	done 
 
-DIST_SUBDIRS= src tests examples 
+DIST_SUBDIRS= src test examples 
 EXTRA_DIST=vs7 \
            include \
            src/SAX/wrappers/saxexpat.cpp \
@@ -37,6 +37,12 @@ pkgconfigdir = src/pkgconfig
 pkgconfig_DATA = arabica.pc
 
 test:
-	@cd tests && make test;
+	@cd test && make test;
 	@cd ..
 
+docs:
+	doxygen doc/arabica.dox
+	@echo "------------------------------------------------------------"
+	@echo "Generated documents to ./doc/html"
+	@echo "------------------------------------------------------------"
+
diff --git a/arabica.pc.in b/arabica.pc.in
index 762ea35c..49ac5566 100644
--- a/arabica.pc.in
+++ b/arabica.pc.in
@@ -4,6 +4,7 @@ libdir=@libdir@
 includedir=@includedir@
 
 Name: Arabica
-Description: XML Parser Toolkit for C++
+Version: @VERSION@
+Description: Arabica XML Parser Toolkit for C++
 Libs: -L${libdir} -larabica
-Cflags:
+Cflags: -I${includedir}
diff --git a/bin/poem.xml b/bin/poem.xml
index 1e44e0f4..9c0df9fb 100644
--- a/bin/poem.xml
+++ b/bin/poem.xml
@@ -3,11 +3,13 @@
   <!ENTITY entity "poop">
 ]>
 
+<!-- here go -->
 <pm:poem xmlns:pm="urn:example">
   <pm:line>Roses are red,</pm:line> 
   <pm:line>Violets are blue.</pm:line> 
   <pm:line>Sugar is sweet,</pm:line> 
   <pm:line>and I love you with a pm:line much longer than 15 characters long.</pm:line>
-  <pm:line>I am a line with an undefined :w entity.</pm:line>
+  <pm:line>I am a line with an undefined :w entity and an &lt;.</pm:line>
   <pm:line><![CDATA[ And I am CDATA ]]></pm:line>
 </pm:poem>
+<?all done?>
diff --git a/configure.ac b/configure.ac
index 43a2bdf2..5a8cdfbc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,17 +1,12 @@
-AC_INIT(src/arabica.cpp)
-AC_CANONICAL_SYSTEM
-AC_CONFIG_HEADERS(include/SAX/ArabicaConfig.h)
-
-AM_INIT_AUTOMAKE(arabica, Jan2007)
+AC_INIT([Arabica], [Jan07], [jez@jezuk.co.uk])
 
+AM_INIT_AUTOMAKE
+ 
 AC_PROG_CXX
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 
-AC_LANG_CPLUSPLUS
+AC_LANG([C++])
 
-
-ARABICA_HAS_BOOST([1.32])
-ARABICA_WANT_DOM
 ARABICA_SELECT_XML_PARSER
 ARABICA_HAS_EXPAT
 ARABICA_HAS_LIBXML2
@@ -21,18 +16,25 @@ ARABICA_HAS_XML_PARSER
 ARABICA_HAS_STD_WSTRING
 ARABICA_CHECK_CODECVT_SPECIALISATIONS
 ARABICA_CHECK_SOCKETS
+ARABICA_HAS_BOOST([1.33])
+ARABICA_WANT_DOM
 
-AC_OUTPUT(Makefile \
-          arabica.pc \
-          src/Makefile \
-          tests/Makefile \
-          tests/DOM/Makefile \
-          tests/SAX2DOM/Makefile \
-          tests/XPath/Makefile \
-          examples/Makefile \
-          examples/SAX/Makefile \
-          examples/DOM/Makefile \
-          examples/Utils/Makefile \
-          examples/XPath/Makefile 
-)
+AC_CONFIG_HEADERS([include/SAX/ArabicaConfig.h])
+AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([arabica.pc])
+AC_CONFIG_FILES([src/Makefile])
+AC_CONFIG_FILES([tests/Makefile])
+AC_CONFIG_FILES([tests/Utils/Makefile])
+AC_CONFIG_FILES([tests/SAX/Makefile])
+AC_CONFIG_FILES([tests/DOM/Makefile])
+AC_CONFIG_FILES([tests/XPath/Makefile])
+AC_CONFIG_FILES([tests/XSLT/Makefile])
+AC_CONFIG_FILES([examples/Makefile])
+AC_CONFIG_FILES([examples/Utils/Makefile])
+AC_CONFIG_FILES([examples/SAX/Makefile])
+AC_CONFIG_FILES([examples/DOM/Makefile])
+AC_CONFIG_FILES([examples/XPath/Makefile])
+AC_CONFIG_FILES([examples/XSLT/Makefile])
+
+AC_OUTPUT
 
diff --git a/sax.dox b/doc/arabica.dox
similarity index 100%
rename from sax.dox
rename to doc/arabica.dox