Posted to tcl by kostix at Sat Apr 26 11:34:32 GMT 2008view raw

  1. Index: Makefile.in
  2. ===================================================================
  3. RCS file: /usr/local/pubcvs/tdom/configure.in,v
  4. retrieving revision 1.23
  5. diff -u -u -r1.23 configure.in
  6. --- configure.in 26 Jul 2007 23:45:47 -0000 1.23
  7. +++ configure.in 6 Aug 2007 13:05:24 -0000
  8. @@ -72,6 +72,7 @@
  9. #--------------------------------------------------------------------
  10.  
  11. TDOM_PATH_AOLSERVER
  12. +TDOM_PATH_EXPAT
  13.  
  14. #-----------------------------------------------------------------------
  15. # __CHANGE__
  16. @@ -83,10 +84,7 @@
  17. # and PKG_TCL_SOURCES.
  18. #-----------------------------------------------------------------------
  19.  
  20. -TEA_ADD_SOURCES([expat/xmlrole.c \
  21. - expat/xmltok.c \
  22. - expat/xmlparse.c \
  23. - generic/xmlsimple.c \
  24. +TEA_ADD_SOURCES([generic/xmlsimple.c \
  25. generic/utf8conv.c \
  26. generic/dom.c \
  27. generic/domalloc.c \
  28. @@ -100,7 +98,7 @@
  29. generic/tclexpat.c \
  30. generic/tdomStubInit.c])
  31. TEA_ADD_HEADERS([generic/tdom.h])
  32. -TEA_ADD_INCLUDES([-I${srcdir}/generic -I${srcdir}/expat ${AOL_INCLUDES}])
  33. +TEA_ADD_INCLUDES([-I${srcdir}/generic ${AOL_INCLUDES}])
  34. TEA_ADD_LIBS([${AOL_LIBS}])
  35. TEA_ADD_CFLAGS([])
  36. TEA_ADD_STUB_SOURCES([generic/tdomStubLib.c])
  37. Index: tdom.m4
  38. ===================================================================
  39. RCS file: /usr/local/pubcvs/tdom/tdom.m4,v
  40. retrieving revision 1.8
  41. diff -u -u -r1.8 tdom.m4
  42. --- tdom.m4 4 Feb 2007 19:36:45 -0000 1.8
  43. +++ tdom.m4 6 Aug 2007 13:05:24 -0000
  44. @@ -215,6 +215,46 @@
  45. fi
  46. ])
  47.  
  48. +
  49. +AC_DEFUN(TDOM_PATH_EXPAT, [
  50. + AC_MSG_CHECKING([for expat])
  51. + AC_ARG_WITH(expat,
  52. + AC_HELP_STRING([--with-expat],
  53. + [directory with expat installation]), , [with_expat=no])
  54. +
  55. + AC_CACHE_VAL(ac_cv_c_expat,[
  56. + case $with_expat in
  57. + no) ;;
  58. + yes)
  59. + for f in /usr/local /usr; do
  60. + if test -f "$f/include/expat.h" ; then
  61. + ac_cv_c_expat=`(cd $f; pwd)`
  62. + break
  63. + fi
  64. + done
  65. + ;;
  66. + *)
  67. + if test -f "$with_expat/include/expat.h"; then
  68. + ac_cv_c_expat=`(cd $with_expat; pwd)`
  69. + else
  70. + AC_MSG_ERROR([${with_expat} directory doesn't contain expat.h])
  71. + fi
  72. + esac
  73. + ])
  74. + if test x"${ac_cv_c_expat}" = x ; then
  75. + AC_MSG_RESULT([using local copy])
  76. + TEA_ADD_SOURCES([expat/xmlrole.c \
  77. + expat/xmltok.c \
  78. + expat/xmlparse.c])
  79. + TEA_ADD_INCLUDES([-I${srcdir}/expat])
  80. + else
  81. + AC_MSG_RESULT([${ac_cv_c_expat}])
  82. + TEA_ADD_INCLUDES(${ac_cv_c_expat}/include)
  83. + TEA_ADD_LIBS([-lexpat])
  84. + fi
  85. +])
  86. +
  87. +
  88. #------------------------------------------------------------------------
  89. # TDOM_PATH_CONFIG --
  90. #
  91.