Changes in configure.ac [0174b62:004d5c]

File:

• configure.ac (modified) (7 diffs)

configure.ac

@@ -3 +3 @@
 
 AC_PREREQ(2.59)
-AC_INIT(MoleCuilder, 1.2.5, [heber@ins.uni-bonn.de], [molecuilder], [http://trac.ins.uni-bonn.de/projects/molecuilder/])
+AC_INIT(MoleCuilder, 1.2.4, [heber@ins.uni-bonn.de], [molecuilder], [http://trac.ins.uni-bonn.de/projects/molecuilder/])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([src/builder.cpp])
@@ -87 +87 @@
 # refer to the libtool manual, section "Updating library version information":
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-AC_SUBST([MOLECUILDER_SO_VERSION], [9:0:0])
-AC_SUBST([MOLECUILDER_API_VERSION], [1.2.5])
+AC_SUBST([MOLECUILDER_SO_VERSION], [8:0:1])
+AC_SUBST([MOLECUILDER_API_VERSION], [1.2.4])
 
 dnl this macro is used to get the arguments supplied
@@ -163 +163 @@
 # Boost headers with libraries
 BOOST_FILESYSTEM
+BOOST_IOSTREAMS
 BOOST_PROGRAM_OPTIONS
 AS_IF([test x"$enable_python" != x"no"], [BOOST_PYTHON])
@@ -169 +170 @@
 
 
-# CodePatterns library (needs Chronos clock time conversion bugfix) 
-AM_PATH_CODEPATTERNS([1.2.1], $have_debug,,[AC_MSG_ERROR([Missing CodePatterns library, please specify PKG_CONFIG_PATH or use --with-codepatterns...])])
+# CodePatterns library (needs boost/archive/iserializer.hpp before MemDebug.hpp)
+AM_PATH_CODEPATTERNS([1.2.2], $have_debug,,[AC_MSG_ERROR([Missing CodePatterns library, please specify PKG_CONFIG_PATH or use --with-codepatterns...])])
+
+# JobMarket library (needs boost/archive/iserializer.hpp before MemDebug.hpp)
+AC_ARG_ENABLE(
+  [jobmarket],
+  AS_HELP_STRING([--enable-jobmarket],[turn on JobMarket feature [default=yes]]),
+  enable_jobmarket=$enableval,
+  enable_jobmarket="yes")
+AC_MSG_RESULT($enable_jobmarket)
+AS_IF([test x"$enable_jobmarket" != x"no"],[
+  AM_PATH_JOBMARKET([1.0.0], $have_debug,[
+    # the following is only required if we have JobMarket
+    BOOST_ASIO
+    AC_DEFINE(HAVE_JOBMARKET,1, ["use JobMarket to calculate fragment jobs."])
+    ],[
+      enable_jobmarket="no"
+    ])
+]
+#[
+#  AC_DEFINE(HAVE_JOBMARKET,0, ["use JobMarket to calculate fragment jobs."])
+#]
+)
+AC_SUBST(HAVE_JOBMARKET)
+AM_CONDITIONAL([CONDJOBMARKET], [test x"$enable_jobmarket" = x"yes"])
 
 # Checks for header files.
@@ -271 +295 @@
 AC_CONFIG_FILES([tests/Fragmentations/molecuilder], [chmod +x tests/Fragmentations/molecuilder])
 
+AC_CONFIG_TESTDIR(tests/JobMarket)
+AC_CONFIG_FILES([
+  tests/JobMarket/atlocal 
+  tests/JobMarket/Makefile])
+AC_CONFIG_FILES([tests/JobMarket/molecuilder], [chmod +x tests/JobMarket/molecuilder])
+
 AC_CONFIG_TESTDIR(tests/regression)
 AC_CONFIG_FILES([
@@ -296 +326 @@
         src/unittests/Makefile
 ])
+
 # produce python scripts and tests only when python's present
 AM_COND_IF([CONDPYTHON],[
@@ -305 +336 @@
         AC_CONFIG_FILES([tests/Python/Makefile])
 ])
+
 AC_OUTPUT