Merge branch 'trunk' of github.com:PDB-REDO/libcifpp into trunk

GNUmakefile.in

@@ -28,9 +28,9 @@
 firstTarget: all
 firstTarget: all
 
 
 CXX					= @CXX@
 CXX					= @CXX@
-CXXFLAGS			= @CPPFLAGS@ @CXXFLAGS@ @BOOST_CPPFLAGS@
+CXXFLAGS			= @CPPFLAGS@ @CXXFLAGS@ @BOOST_CPPFLAGS@ @PTHREAD_CFLAGS@
 LDFLAGS				= @LDFLAGS@ @LIBS@ @BOOST_LDFLAGS@
 LDFLAGS				= @LDFLAGS@ @LIBS@ @BOOST_LDFLAGS@
-LIBS				= @LIBS@ \
+LIBS				= @LIBS@ @PTHREAD_LIBS@ \
 					  @BOOST_IOSTREAMS_LIB@ \
 					  @BOOST_IOSTREAMS_LIB@ \
 					  @BOOST_DATE_TIME_LIB@
 					  @BOOST_DATE_TIME_LIB@
 
 

configure.ac

@@ -13,6 +13,8 @@ AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR([config/m4])
 AC_CONFIG_MACRO_DIR([config/m4])
 AC_CONFIG_HEADERS([src/Config.hpp])
 AC_CONFIG_HEADERS([src/Config.hpp])
 
 
+AX_PTHREAD
+
 AC_PREFIX_DEFAULT(/usr/local)
 AC_PREFIX_DEFAULT(/usr/local)
 
 
 AC_CHECK_HEADER([filesystem], [], [AC_MSG_ERROR([The file <filesystem> is missing, perhaps you should install a more recent libstdc++ implementation.])])
 AC_CHECK_HEADER([filesystem], [], [AC_MSG_ERROR([The file <filesystem> is missing, perhaps you should install a more recent libstdc++ implementation.])])

src/Config.hpp.in

@@ -30,6 +30,12 @@
 /* Define to 1 if you have the `pow' function. */
 /* Define to 1 if you have the `pow' function. */
 #undef HAVE_POW
 #undef HAVE_POW
 
 
+/* Define if you have POSIX threads libraries and header files. */
+#undef HAVE_PTHREAD
+
+/* Have PTHREAD_PRIO_INHERIT. */
+#undef HAVE_PTHREAD_PRIO_INHERIT
+
 /* Define to 1 if the system has the type `ptrdiff_t'. */
 /* Define to 1 if the system has the type `ptrdiff_t'. */
 #undef HAVE_PTRDIFF_T
 #undef HAVE_PTRDIFF_T
 
 
@@ -96,5 +102,9 @@
 /* Define to the version of this package. */
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 #undef PACKAGE_VERSION
 
 
+/* Define to necessary symbol if this constant uses a non-standard name on
+   your system. */
+#undef PTHREAD_CREATE_JOINABLE
+
 /* Define to 1 if you have the ANSI C header files. */
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 #undef STDC_HEADERS