From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Mon, 14 Dec 2009 11:50:47 +0000 (-0500)
Subject: Don't check whether bsdxml is available or not.
X-Git-Tag: v2.8.0~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa5b327f74a8d3f840ca03fe1e46e558360e6651;p=thirdparty%2Flibarchive.git

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 26fe2117a..059df17df 100644
--- 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 e695911df..b91cd7e68 100644
--- 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