refactored config file, avoid clashes in defines by autoconf

.gitignore

@@ -5,7 +5,7 @@ obj/
 .pc/
 .pc/
 autom4te.cache/
 autom4te.cache/
 GNUmakefile
 GNUmakefile
-include/cif++/Config.hpp
+include/src/Config.hpp
 tools/symop-map-generator
 tools/symop-map-generator
 test/unit-test
 test/unit-test
 libcifpp.pc
 libcifpp.pc

configure

@@ -1396,7 +1396,7 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-shared[=PKGS]  build shared libraries [default=yes]
+  --enable-shared[=PKGS]  build shared libraries [default=no]
   --enable-static[=PKGS]  build static libraries [default=yes]
   --enable-static[=PKGS]  build static libraries [default=yes]
   --enable-fast-install[=PKGS]
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
                           optimize for fast installation [default=yes]
@@ -3913,7 +3913,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
 
 
 
-ac_config_headers="$ac_config_headers include/cif++/Config.hpp"
+ac_config_headers="$ac_config_headers src/Config.hpp"
 
 
 
 
 
 
@@ -8432,16 +8432,7 @@ func_stripname_cnf ()
 
 
 
 
 # Set options
 # Set options
-
-
-
-        enable_dlopen=no
-
-
-  enable_win32_dll=no
-
-
-            # Check whether --enable-shared was given.
+# Check whether --enable-shared was given.
 if test "${enable_shared+set}" = set; then :
 if test "${enable_shared+set}" = set; then :
   enableval=$enable_shared; p=${PACKAGE-default}
   enableval=$enable_shared; p=${PACKAGE-default}
     case $enableval in
     case $enableval in
@@ -8461,7 +8452,7 @@ if test "${enable_shared+set}" = set; then :
       ;;
       ;;
     esac
     esac
 else
 else
-  enable_shared=yes
+  enable_shared=no
 fi
 fi
 
 
 
 
@@ -8472,6 +8463,14 @@ fi
 
 
 
 
 
 
+
+        enable_dlopen=no
+
+
+  enable_win32_dll=no
+
+
+
   # Check whether --enable-static was given.
   # Check whether --enable-static was given.
 if test "${enable_static+set}" = set; then :
 if test "${enable_static+set}" = set; then :
   enableval=$enable_static; p=${PACKAGE-default}
   enableval=$enable_static; p=${PACKAGE-default}
@@ -18321,7 +18320,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 for ac_config_target in $ac_config_targets
 for ac_config_target in $ac_config_targets
 do
 do
   case $ac_config_target in
   case $ac_config_target in
-    "include/cif++/Config.hpp") CONFIG_HEADERS="$CONFIG_HEADERS include/cif++/Config.hpp" ;;
+    "src/Config.hpp") CONFIG_HEADERS="$CONFIG_HEADERS src/Config.hpp" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "GNUmakefile") CONFIG_FILES="$CONFIG_FILES GNUmakefile" ;;
     "GNUmakefile") CONFIG_FILES="$CONFIG_FILES GNUmakefile" ;;
     "libcifpp.pc") CONFIG_FILES="$CONFIG_FILES libcifpp.pc" ;;
     "libcifpp.pc") CONFIG_FILES="$CONFIG_FILES libcifpp.pc" ;;

configure.ac

@@ -11,7 +11,7 @@ AX_CHECK_COMPILE_FLAG([-fstandalone-debug], [ CXXFLAGS="$CXXFLAGS -fstandalone-d
 AC_CONFIG_SRCDIR([src/Cif++.cpp])
 AC_CONFIG_SRCDIR([src/Cif++.cpp])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR([config/m4])
 AC_CONFIG_MACRO_DIR([config/m4])
-AC_CONFIG_HEADERS([include/cif++/Config.hpp])
+AC_CONFIG_HEADERS([src/Config.hpp])
 
 
 AC_PREFIX_DEFAULT(/usr/local)
 AC_PREFIX_DEFAULT(/usr/local)
 
 
@@ -52,9 +52,9 @@ dnl AC_MSG_RESULT(ok)
 
 
 AC_PROG_INSTALL
 AC_PROG_INSTALL
 
 
-dnl Shared libraries are not convenient
-dnl LT_INIT([disable-shared])
-LT_INIT
+dnl Shared libraries are not convenient, esp. on MacOS... sigh
+dnl LT_INIT
+LT_INIT([disable-shared])
 AC_SUBST(LIBTOOL_DEPS)
 AC_SUBST(LIBTOOL_DEPS)
 
 
 dnl versioning, first for libtool
 dnl versioning, first for libtool

include/cif++/AtomType.hpp

@@ -32,8 +32,6 @@
 #include <string>
 #include <string>
 #include <stdexcept>
 #include <stdexcept>
 
 
-#include "cif++/Config.hpp"
-
 namespace mmcif
 namespace mmcif
 {
 {
 
 

include/cif++/Cif++.hpp

@@ -26,8 +26,6 @@
 
 
 #pragma once
 #pragma once
 
 
-#include "cif++/Config.hpp"
-
 #include <string>
 #include <string>
 
 
 #include <regex>
 #include <regex>

include/cif++/CifUtils.hpp

@@ -26,8 +26,6 @@
 
 
 #pragma once
 #pragma once
 
 
-#include "cif++/Config.hpp"
-
 #include <vector>
 #include <vector>
 #include <set>
 #include <set>
 #include <cassert>
 #include <cassert>

include/cif++/Point.hpp

@@ -32,8 +32,6 @@
 #include <clipper/core/coords.h>
 #include <clipper/core/coords.h>
 #endif
 #endif
 
 
-#include "cif++/Config.hpp"
-
 #include <boost/math/quaternion.hpp>
 #include <boost/math/quaternion.hpp>
 
 
 namespace mmcif
 namespace mmcif

src/CifUtils.cpp

@@ -24,7 +24,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  */
 
 
-#include "cif++/Config.hpp"
+#include "Config.hpp"
 
 
 #include <tuple>
 #include <tuple>
 #include <iostream>
 #include <iostream>

src/Compound.cpp

@@ -24,7 +24,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  */
 
 
-#include "cif++/Config.hpp"
+#include "Config.hpp"
 
 
 #include <map>
 #include <map>
 #include <numeric>
 #include <numeric>

src/PDB2Cif.cpp

@@ -24,7 +24,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  */
 
 
-#include "cif++/Config.hpp"
+#include "Config.hpp"
 
 
 #include <map>
 #include <map>
 #include <set>
 #include <set>

src/PDB2CifRemark3.cpp

@@ -24,7 +24,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  */
 
 
-#include "cif++/Config.hpp"
+#include "Config.hpp"
 #include "cif++/Cif++.hpp"
 #include "cif++/Cif++.hpp"
 
 
 #include <map>
 #include <map>

src/Secondary.cpp

@@ -26,7 +26,7 @@
 
 
 // Calculate DSSP-like secondary structure information
 // Calculate DSSP-like secondary structure information
 
 
-#include "cif++/Config.hpp"
+#include "Config.hpp"
 
 
 #include <numeric>
 #include <numeric>
 #include <iomanip>
 #include <iomanip>

src/Structure.cpp

@@ -36,7 +36,8 @@
 #include <boost/iostreams/filter/gzip.hpp>
 #include <boost/iostreams/filter/gzip.hpp>
 #include <boost/format.hpp>
 #include <boost/format.hpp>
 
 
-#include "cif++/Config.hpp"
+#include "Config.hpp"
+
 #include "cif++/PDB2Cif.hpp"
 #include "cif++/PDB2Cif.hpp"
 #include "cif++/CifParser.hpp"
 #include "cif++/CifParser.hpp"
 #include "cif++/Cif2PDB.hpp"
 #include "cif++/Cif2PDB.hpp"

src/Symmetry.cpp

@@ -24,7 +24,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  */
 
 
-#include "cif++/Config.hpp"
+#include "Config.hpp"
 
 
 #include <atomic>
 #include <atomic>
 #include <mutex>
 #include <mutex>

src/TlsParser.cpp

@@ -24,7 +24,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  */
 
 
-#include "cif++/Config.hpp"
+#include "Config.hpp"
 
 
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string.hpp>