tdom external expat patch

Index: Makefile.in
===================================================================
RCS file: /usr/local/pubcvs/tdom/configure.in,v
retrieving revision 1.23
diff -u -u -r1.23 configure.in
--- configure.in        26 Jul 2007 23:45:47 -0000      1.23
+++ configure.in        6 Aug 2007 13:05:24 -0000
@@ -72,6 +72,7 @@
 #--------------------------------------------------------------------

 TDOM_PATH_AOLSERVER
+TDOM_PATH_EXPAT

 #-----------------------------------------------------------------------
 # __CHANGE__
@@ -83,10 +84,7 @@
 # and PKG_TCL_SOURCES.
 #-----------------------------------------------------------------------

-TEA_ADD_SOURCES([expat/xmlrole.c     \
-                 expat/xmltok.c      \
-                 expat/xmlparse.c    \
-                 generic/xmlsimple.c \
+TEA_ADD_SOURCES([generic/xmlsimple.c \
                  generic/utf8conv.c  \
                  generic/dom.c       \
                  generic/domalloc.c  \
@@ -100,7 +98,7 @@
                  generic/tclexpat.c  \
                  generic/tdomStubInit.c])
 TEA_ADD_HEADERS([generic/tdom.h])
-TEA_ADD_INCLUDES([-I${srcdir}/generic -I${srcdir}/expat ${AOL_INCLUDES}])
+TEA_ADD_INCLUDES([-I${srcdir}/generic ${AOL_INCLUDES}])
 TEA_ADD_LIBS([${AOL_LIBS}])
 TEA_ADD_CFLAGS([])
 TEA_ADD_STUB_SOURCES([generic/tdomStubLib.c])
Index: tdom.m4
===================================================================
RCS file: /usr/local/pubcvs/tdom/tdom.m4,v
retrieving revision 1.8
diff -u -u -r1.8 tdom.m4
--- tdom.m4     4 Feb 2007 19:36:45 -0000       1.8
+++ tdom.m4     6 Aug 2007 13:05:24 -0000
@@ -215,6 +215,46 @@
     fi
 ])

+
+AC_DEFUN(TDOM_PATH_EXPAT, [
+    AC_MSG_CHECKING([for expat])
+    AC_ARG_WITH(expat,
+        AC_HELP_STRING([--with-expat],
+            [directory with expat installation]), , [with_expat=no])
+
+    AC_CACHE_VAL(ac_cv_c_expat,[
+    case $with_expat in
+       no) ;;
+       yes)
+           for f in /usr/local /usr; do
+               if test -f "$f/include/expat.h" ; then
+                   ac_cv_c_expat=`(cd $f; pwd)`
+                   break
+               fi
+           done
+           ;;
+       *)
+           if test -f "$with_expat/include/expat.h"; then
+               ac_cv_c_expat=`(cd $with_expat; pwd)`
+           else
+               AC_MSG_ERROR([${with_expat} directory doesn't contain expat.h])
+           fi
+    esac
+    ])
+    if test x"${ac_cv_c_expat}" = x ; then
+        AC_MSG_RESULT([using local copy])
+       TEA_ADD_SOURCES([expat/xmlrole.c     \
+                        expat/xmltok.c      \
+                        expat/xmlparse.c])
+       TEA_ADD_INCLUDES([-I${srcdir}/expat])
+    else
+        AC_MSG_RESULT([${ac_cv_c_expat}])
+       TEA_ADD_INCLUDES(${ac_cv_c_expat}/include)
+       TEA_ADD_LIBS([-lexpat])
+    fi
+])
+
+
 #------------------------------------------------------------------------
 # TDOM_PATH_CONFIG --
 #