1 files changed, 83 insertions, 0 deletions

diff --git a/configure.ac b/configure.ac
index 48a5efb..c28141c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,2 +28,37 @@ AC_DEFINE_UNQUOTED([PACKAGE_SRC_VERSION],["$PACKAGE_SRC_VERSION"],[more or less
 
+tr1_mem_std="false"
+tr1_mem_boost="false"
+AC_CHECK_SHAREDPTR(std::tr1,tr1/memory,[ tr1_mem_std=true ])
+AC_CHECK_SHAREDPTR(boost,boost/shared_ptr.hpp,[ tr1_mem_boost=true ])
+tr1_mem=""
+AC_ARG_WITH([tr1-memory],
+ AC_HELP_STRING([--with-tr1-memory=<boost|std>],[select tr1/memory (shared_ptr<>) implementation to use]),
+ [ tr1_mem="$withval" ]
+)
+AC_MSG_CHECKING([for tr1/memory implementation to use])
+test -z "$tr1_mem" && $tr1_mem_std && tr1_mem=std
+test -z "$tr1_mem" && $tr1_mem_boost && tr1_mem=boost
+if test -z "$tr1_mem" ; then
+ AC_MSG_RESULT([none found])
+else
+ AC_MSG_RESULT([$tr1_mem])
+fi
+case "$tr1_mem" in
+ std)
+  $tr1_mem_std || AC_MSG_ERROR([std implementation requested, but not found])
+  OPKELE_TR1_MEM_NS=std::tr1
+  OPKELE_TR1_MEM_HEADER=tr1/memory
+  ;;
+ boost)
+  $tr1_mem_boost || AC_MSG_ERROR([boost implementation requested, but not found])
+  OPKELE_TR1_MEM_NS=boost
+  OPKELE_TR1_MEM_HEADER=boost/shared_ptr.hpp
+  ;;
+ *)
+  AC_MSG_ERROR([no shared_ptr<> implementation found])
+  ;;
+esac
+AC_SUBST([OPKELE_TR1_MEM_NS])
+AC_SUBST([OPKELE_TR1_MEM_HEADER])
+
 PKG_CHECK_MODULES([OPENSSL],[openssl],,[
@@ -68,2 +103,28 @@ LIBCURL_CHECK_CONFIG(,,,[
 
+AC_CHECK_HEADER([expat.h],[
+ AC_CHECK_LIB([expat],[XML_ParserCreate],[
+  EXPAT_LIBS=-lexpat
+  EXPAT_CFLAGS=
+  AC_SUBST([EXPAT_LIBS])
+  AC_SUBST([EXPAT_CFLAGS])
+ ],[
+  AC_MSG_ERROR([no required expat library. get one from http://expat.sourceforge.net/])
+ ])
+],[
+ AC_MSG_ERROR([no required expat library. get one from http://expat.sourceforge.net/])
+])
+
+AC_CHECK_HEADER([tidy.h],[
+ AC_CHECK_LIB([tidy],[tidyParseBuffer],[
+  TIDY_LIBS=-ltidy
+  TIDY_CFLAGS=
+  AC_SUBST([TIDY_LIBS])
+  AC_SUBST([TIDY_CFLAGS])
+ ],[
+  AC_MSG_ERROR([no required htmltidy library found. get one from http://tidy.sourceforge.net/])
+ ])
+],[
+ AC_MSG_ERROR([no required htmltidy library found. get one from http://tidy.sourceforge.net/])
+])
+
 if test -n "$PCRE_LIBS" -a -n "$PCRE_CFLAGS" ; then
@@ -119,2 +180,23 @@ fi
 
+ndebug=true
+AC_ARG_ENABLE([debug],
+ AC_HELP_STRING([--enable-debug],[enable debugging code]),
+ [ test "$enableval" = "no" || ndebug=false ]
+)
+if $ndebug ; then
+ CPPFLAGS_DEBUG="-DNDEBUG"
+else
+ CPPFLAGS_DEBUG=""
+fi
+AC_SUBST([CPPFLAGS_DEBUG])
+
+xri_proxy_url="http://beta.xri.net/"
+AC_MSG_CHECKING([for XRI resolver proxy])
+AC_ARG_ENABLE([xri-proxy],
+ AC_HELP_STRING([--with-xri-proxy=url],[set xri proxy for use when resolving xri identities, default is http://xr_proxy_url]),
+ [ xri_proxy_url="$withval" ]
+)
+AC_MSG_RESULT([$xri_proxy_url])
+AC_DEFINE_UNQUOTED([XRI_PROXY_URL],["$xri_proxy_url"],[XRI proxy resolver URL])
+
 AC_CONFIG_FILES([
@@ -124,2 +206,3 @@ AC_CONFIG_FILES([
  include/Makefile
+  include/opkele/tr1-mem.h
  lib/Makefile