diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2016-12-07 20:51:02 +0100 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2016-12-07 20:51:02 +0100 |
| commit | 3ba947226cde3027e5a6aa03611228203ad85140 (patch) | |
| tree | 33e3d698b17ad16bf9460d5f315ef2e97b194b4c | |
| parent | ae96a85ea4c302eae9cbea9ce7154039507ab030 (diff) | |
Revert 8a92e11fe808e92fc923f5334aff1639f77aa6f8 'Add support for eXpat alternative; bsdxml.' - According to the docs it is supposed to work with regular eXpat on FreeBSD as well.
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/saxparser.h | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 9124295..8f2c71a 100644 --- a/configure.ac +++ b/configure.ac @@ -517,8 +517,8 @@ CPPFLAGS="" CFLAGS="$EXPAT_CFLAGS" LDFLAGS="$EXPAT_LDFLAGS" LIBS="" -AC_CHECK_HEADER(expat.h,, AC_CHECK_HEADER(bsdxml.h, , AC_MSG_ERROR([*** eXpat header file not found!]))) -AC_CHECK_LIB(expat, XML_ParserCreate,, AC_CHECK_LIB(bsdxml, XML_ParserCreate, , AC_MSG_ERROR([*** eXpat library not found!]))) +AC_CHECK_HEADER(expat.h, , AC_MSG_ERROR([*** eXpat header file not found!])) +AC_CHECK_LIB(expat, XML_ParserCreate, , AC_MSG_ERROR([*** eXpat library not found!])) EXPAT_CFLAGS="$CXXFLAGS $CPPFLAGS $CFLAGS" EXPAT_LIBS="$LDFLAGS $LIBS" CXXFLAGS="$tmp_CXXFLAGS" diff --git a/src/saxparser.h b/src/saxparser.h index 85906f9..4b1a273 100644 --- a/src/saxparser.h +++ b/src/saxparser.h @@ -26,15 +26,9 @@ */ #pragma once -#include <config.h> - #include <string> #include <unordered_map> -#ifdef HAVE_LIBEXPAT #include <expat.h> -#elif HAVE_LIBBSDXML -#include <bsdxml.h> -#endif #include <fstream> class SAXParser |