summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--configure.ac5
-rw-r--r--include/opkele/tidy.h7
-rw-r--r--lib/discovery.cc3
3 files changed, 12 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 0aa1272..a66e53d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -149,7 +149,7 @@ AC_CHECK_HEADER([expat.h],[
AC_MSG_ERROR([no required expat library. get one from http://expat.sourceforge.net/])
])
-AC_CHECK_HEADER([tidy.h],[
+AC_CHECK_HEADERS([tidy.h tidy/tidy.h],[
AC_CHECK_LIB([tidy],[tidyParseBuffer],[
TIDY_LIBS=-ltidy
TIDY_CFLAGS=
@@ -159,7 +159,8 @@ AC_CHECK_HEADER([tidy.h],[
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/])
+ test "$ac_header" = "tidy/tidy.h" \
+ && 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
diff --git a/include/opkele/tidy.h b/include/opkele/tidy.h
index 888e7d4..059656d 100644
--- a/include/opkele/tidy.h
+++ b/include/opkele/tidy.h
@@ -2,8 +2,15 @@
#define __OPKELE_TIDY_H
#include <cassert>
+#ifdef HAVE_TIDY_H
#include <tidy.h>
#include <buffio.h>
+#elif HAVE_TIDY_TIDY_H
+# include <tidy/tidy.h>
+# include <tidy/buffio.h>
+#else
+# error "Don't know where to look for htmltidy headers"
+#endif
namespace opkele {
namespace util {
diff --git a/lib/discovery.cc b/lib/discovery.cc
index 3b90977..d1989ec 100644
--- a/lib/discovery.cc
+++ b/lib/discovery.cc
@@ -5,12 +5,13 @@
#include <opkele/discovery.h>
#include <opkele/exception.h>
#include <opkele/util.h>
-#include <opkele/tidy.h>
#include <opkele/data.h>
#include <opkele/debug.h>
#include "config.h"
+#include <opkele/tidy.h>
+
#define XRDS_HEADER "X-XRDS-Location"
#define CT_HEADER "Content-Type"