Don't check whether bsdxml is available or not.

The bsdxml is intended for use in FreeBSD base system.

SVN-Revision: 1737

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26fe2117a5bd9421519f4cd451255174ec649cd1..059df17dfff48545c9dbc7e3be70835972eca3de 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -335,25 +335,13 @@ ELSE(LIBXML2_FOUND)
   #
   # Find Expat
   #
-  IF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
-    #
-    # FreeBSD ported expat as bsdxml into their base system.
-    #
-    LA_CHECK_INCLUDE_FILE("bsdxml.h" HAVE_BSDXML_H)
-    FIND_LIBRARY(BSDXML_LIBRARY NAMES bsdxml libbsdxml)
-    IF(BSDXML_LIBRARY)
-      SET(HAVE_LIBBSDXML 1)
-      LIST(APPEND ADDITIONAL_LIBS ${BSDXML_LIBRARY})
-    ENDIF(BSDXML_LIBRARY)
-  ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
-    FIND_PACKAGE(EXPAT)
-    IF(EXPAT_FOUND)
-      INCLUDE_DIRECTORIES(${EXPAT_INCLUDE_DIR})
-      LIST(APPEND ADDITIONAL_LIBS ${EXPAT_LIBRARIES})
-      SET(HAVE_LIBEXPAT 1)
-      LA_CHECK_INCLUDE_FILE("expat.h" HAVE_EXPAT_H)
-    ENDIF(EXPAT_FOUND)
-  ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+  FIND_PACKAGE(EXPAT)
+  IF(EXPAT_FOUND)
+    INCLUDE_DIRECTORIES(${EXPAT_INCLUDE_DIR})
+    LIST(APPEND ADDITIONAL_LIBS ${EXPAT_LIBRARIES})
+    SET(HAVE_LIBEXPAT 1)
+    LA_CHECK_INCLUDE_FILE("expat.h" HAVE_EXPAT_H)
+  ENDIF(EXPAT_FOUND)
 ENDIF(LIBXML2_FOUND)
 
 #

diff --git a/configure.ac b/configure.ac
index e695911df12fa39c42edc249aa83369e76318d72..b91cd7e684daad2e3c09009dae2a364d9b0d1e6d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -252,17 +252,8 @@ if test "x$with_xml2" != "xno"; then
 fi
 if test "x$ac_cv_header_libxml_xmlreader_h" != "xyes"; then
   if test "x$with_expat" != "xno"; then
-    case $host in
-      # FreeBSD has ported expat as bsdxml
-      *freebsd* )
-      AC_CHECK_HEADERS([bsdxml.h])
-      AC_CHECK_LIB(bsdxml,XML_ParserCreate)
-      ;;
-      * )
-      AC_CHECK_HEADERS([expat.h])
-      AC_CHECK_LIB(expat,XML_ParserCreate)
-      ;;
-    esac
+    AC_CHECK_HEADERS([expat.h])
+    AC_CHECK_LIB(expat,XML_ParserCreate)
   fi
 fi