minor modifications

92478f9e · legoc · 741a983f · 92478f9e · 92478f9e · 92478f9e
Commit 92478f9e authored Jul 12, 2016 by legoc
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

CHANGELOG CHANGELOG +4 -0

configure.ac configure.ac +2 -1

m4/cameo.m4 m4/cameo.m4 +2 -2

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
+Version 1.0.3, ?
+-------------------------
+- 
+
 Version 1.0.2, 2016-07-11
 -------------------------
 - Corrected boost dependencies.

--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,8 @@ ROOT_CFLAGS=`root-config --cflags`
 AC_SUBST(ROOT_CFLAGS)

 AX_BOOST_BASE([1.41],, [AC_MSG_ERROR([Boost 1.41 required])])
-AC_CAMEO
+
+AM_COND_IF([CAMEO], [AC_CAMEO])

 LST_CXXFLAGS="$BOOST_CPPFLAGS \
 	$ZMQ_CFLAGS \

--- a/m4/cameo.m4
+++ b/m4/cameo.m4
@@ -11,9 +11,9 @@ AC_DEFUN([AC_CAMEO],

    AC_LIBZMQ
    AC_LIBPROTOBUF_LITE
+    AX_BOOST_SYSTEM
    AX_BOOST_DATE_TIME
-	AX_BOOST_THREAD
-	AX_BOOST_SYSTEM
+    AX_BOOST_THREAD
    
    CAMEO_CFLAGS=
    CAMEO_LIBS=