Revert r32092 because it doesn't work on systems that DO have libbz2.

git-svn-id: https://svn.dealii.org/trunk@32093 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/bundled/CMakeLists.txt b/deal.II/bundled/CMakeLists.txt
index 70a1531d47618374ef629a05bb4c087ecea0d533..f2891f1d7101ad23fb13b65b6c0344a7d33c76bd 100644 (file)
--- a/deal.II/bundled/CMakeLists.txt
+++ b/deal.II/bundled/CMakeLists.txt
@@ -32,6 +32,7 @@ IF(FEATURE_BOOST_BUNDLED_CONFIGURED)
     "${BOOST_FOLDER}/include\n"
     )
 
+  ADD_SUBDIRECTORY(${BOOST_FOLDER}/libs/iostreams/src)
   ADD_SUBDIRECTORY(${BOOST_FOLDER}/libs/serialization/src)
 
   IF(DEAL_II_WITH_THREADS AND NOT DEAL_II_USE_CXX11)
@@ -44,15 +45,6 @@ IF(FEATURE_BOOST_BUNDLED_CONFIGURED)
     #
     ADD_SUBDIRECTORY(${BOOST_FOLDER}/libs/thread/src)
   ENDIF()
-
-  # BOOST.iostreams is useful, but it requires libbz2 and libz
-  # to be around. Don't do it if we can't find these two libs.
-  IF(DEAL_II_WITH_BZ2LIB AND DEAL_II_WITH_ZLIB)
-    MESSAGE(STATUS "Configuring BOOST Iostreams library")
-    ADD_SUBDIRECTORY(${BOOST_FOLDER}/libs/iostreams/src)
-  ELSE()
-    MESSAGE(STATUS "BOOST.iostream will not be available because libz or libbz2 were not found")
-  ENDIF()
 ENDIF()
 
 

diff --git a/deal.II/cmake/configure/configure_bz2lib.cmake b/deal.II/cmake/configure/configure_bz2lib.cmake
deleted file mode 100644 (file)
index 5036706..0000000
--- a/deal.II/cmake/configure/configure_bz2lib.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-## ---------------------------------------------------------------------
-## $Id$
-##
-## Copyright (C) 2013 by the deal.II authors
-##
-## This file is part of the deal.II library.
-##
-## The deal.II library is free software; you can use it, redistribute
-## it, and/or modify it under the terms of the GNU Lesser General
-## Public License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-## The full text of the license can be found in the file LICENSE at
-## the top level of the deal.II distribution.
-##
-## ---------------------------------------------------------------------
-
-#
-# Configuration for the bz2 library:
-#
-
-CONFIGURE_FEATURE(BZip2)