compatibility with libstdc++ (LLVM) and BSD install

GNUmakefile.in

@@ -223,14 +223,17 @@ HEADERS = \
 install-lib: lib
 	install -d $(libdir)
 	$(LIBTOOL) --mode=install install $(LIB_TARGET) $(libdir)
+	install -d $(DATADIR)/dictionaries
 	for d in mmcif_ddl.dic  mmcif_pdbx.dic; do \
-		install -D -m644 rsrc/dictionaries/$$d $(DATADIR)/dictionaries/$$d; \
+		install -m644 rsrc/dictionaries/$$d $(DATADIR)/dictionaries/$$d; \
 	done
 
 .PHONY: install-dev
 install-dev:
-	for f in $(HEADERS); do install -D include/cif++/$$f $(includedir)/cif++/$$f; done
-	install -m 644 -D $(LIB_NAME).pc $(pkgconfigdir)/$(LIB_NAME).pc
+	install -d $(includedir)/cif++
+	for f in $(HEADERS); do install include/cif++/$$f $(includedir)/cif++/$$f; done
+	install -d $(pkgconfigdir)
+	install -m 644 $(LIB_NAME).pc $(pkgconfigdir)/$(LIB_NAME).pc
 
 .PHONY: install
 install: install-lib install-dev

include/cif++/Cif++.hpp

@@ -32,6 +32,7 @@
 
 #include <regex>
 #include <iostream>
+#include <sstream>
 #include <set>
 #include <list>
 

src/Cif++.cpp

@@ -630,7 +630,7 @@ RowComparator::RowComparator(Category* cat, KeyIter b, KeyIter e)
 		
 		using namespace std::placeholders;
 		
-		mComp.emplace_back(ix, bind(&ValidateType::compare, tv, _1, _2));
+		mComp.emplace_back(ix, std::bind(&ValidateType::compare, tv, _1, _2));
 	}
 }
 

src/PDB2Cif.cpp

@@ -29,6 +29,7 @@
 #include <map>
 #include <set>
 #include <system_error>
+#include <stack>
 
 #include <boost/date_time/gregorian/gregorian.hpp>
 #include <boost/algorithm/string.hpp>