prune configure script

configure.ac

@@ -4,7 +4,7 @@ dnl Switch to a C++ compiler, and check if it works.
 AC_LANG(C++)
 AC_LANG(C++)
 AX_CXX_COMPILE_STDCXX_17([noext])
 AX_CXX_COMPILE_STDCXX_17([noext])
 
 
-AX_CHECK_COMPILE_FLAG([-fstandalone-debug], , , [-Werror])
+AX_CHECK_COMPILE_FLAG([-fstandalone-debug], [ CXXFLAGS="$CXXFLAGS -fstandalone-debug" ], , [-Werror])
 
 
 AC_CONFIG_SRCDIR([src/Cif++.cpp])
 AC_CONFIG_SRCDIR([src/Cif++.cpp])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_AUX_DIR(config)
@@ -33,15 +33,6 @@ AC_CHECK_HEADER_STDBOOL
 AC_CHECK_TYPES([ptrdiff_t])
 AC_CHECK_TYPES([ptrdiff_t])
 AC_PROG_MAKE_SET
 AC_PROG_MAKE_SET
 
 
-# AC_ARG_VAR([CCP4], [The location where CCP4 is installed])
-
-# AS_IF([test x"$CCP4" != x""],
-# 	  [
-# 		CPPFLAGS="$CPPFLAGS -I ${CCP4}/include"
-# 		CXXFLAGS="$CXXFLAGS -I ${CCP4}/include"
-# 		LDFLAGS="$LDFLAGS -L${CCP4}/lib"
-# 	  ])
-
 AC_ARG_VAR([USE_RSRC], [Use resources to store internal data, requires mrc])
 AC_ARG_VAR([USE_RSRC], [Use resources to store internal data, requires mrc])
 AC_ARG_VAR([MRC], [Specify a location for the mrc executable])
 AC_ARG_VAR([MRC], [Specify a location for the mrc executable])
 
 
@@ -58,47 +49,9 @@ fi
 AX_BOOST_BASE([1.71])
 AX_BOOST_BASE([1.71])
 AX_BOOST_REGEX
 AX_BOOST_REGEX
 
 
-dnl The ccp4 distribution comes bundled with boost libraries that are
-dnl most likely out of date. Since they also include .so files, this will
-dnl break your software.
-
-OLD_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS $BOOST_CPPFLAGS"
-OLD_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-OLD_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-OLD_LIBS="$LIBS"
-LIBS="-lboost_regex"
-
-AC_MSG_CHECKING([boost regex library version])
-AC_LINK_IFELSE(
-	[read_test(boost-regex-test.cpp)],
-	[AC_MSG_RESULT([yes])],
-	[AC_MSG_ERROR([You most likely have a conflict between the version
-of the boost header files and the boost libraries located in ccp4.
-This can be solved by deleting the libboost_*.so files in your CCP4
-library directory.
-Note: only the files with names ending in .so should be deleted.
-])])
-
-CXXFLAGS="$OLD_CXXFLAGS"
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
-
-AX_BOOST_IOSTREAMS
-
 AX_CHECK_LIBRARY([LIBZ], [zlib.h], [z], [],
 AX_CHECK_LIBRARY([LIBZ], [zlib.h], [z], [],
                  [AC_MSG_ERROR([libz not found - compressed files not supported])])
                  [AC_MSG_ERROR([libz not found - compressed files not supported])])
 AX_CHECK_LIBRARY([LIBBZ2], [bzlib.h], [bz2], [],
 AX_CHECK_LIBRARY([LIBBZ2], [bzlib.h], [bz2], [],
                  [AC_MSG_ERROR([libbz2 not found - compressed files not supported])])
                  [AC_MSG_ERROR([libbz2 not found - compressed files not supported])])
 
 
-# AC_ARG_ENABLE(
-# 	debug,
-# 	[AS_HELP_STRING([--enable-debug], [Generate a debug version of the library])],
-# 	[],
-# 	[enable_debug=auto])
-
-dnl Process files
 AC_OUTPUT([GNUmakefile])
 AC_OUTPUT([GNUmakefile])

include/cif++/Config.hpp

@@ -44,13 +44,13 @@
 #define HAVE_BOOST /**/
 #define HAVE_BOOST /**/
 
 
 /* define if the Boost::IOStreams library is available */
 /* define if the Boost::IOStreams library is available */
-#define HAVE_BOOST_IOSTREAMS /**/
+/* #undef HAVE_BOOST_IOSTREAMS */
 
 
 /* define if the Boost::Regex library is available */
 /* define if the Boost::Regex library is available */
 #define HAVE_BOOST_REGEX /**/
 #define HAVE_BOOST_REGEX /**/
 
 
 /* define if the Boost::Thread library is available */
 /* define if the Boost::Thread library is available */
-#define HAVE_BOOST_THREAD /**/
+/* #undef HAVE_BOOST_THREAD */
 
 
 /* define if the compiler supports basic C++17 syntax */
 /* define if the compiler supports basic C++17 syntax */
 #define HAVE_CXX17 1
 #define HAVE_CXX17 1