X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=configure.ac;h=6d073c6cd5fc41098a7428bde472506820bacac3;hb=931b2b0f50e4446a705d2238274914f78b681b6d;hp=6155bde924b0c0fa4de13feddfcd4feaebe7b62d;hpb=8324d029ce006509ddbc605446d05987c17e0368;p=ric-plt%2Fsdl.git

diff --git a/configure.ac b/configure.ac
index 6155bde..6d073c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@
 # Change the numbers just before release.
 
 m4_define([SDL_MAJOR], [1])
-m4_define([SDL_MINOR], [0])
+m4_define([SDL_MINOR], [1])
 m4_define([SDL_MICRO], [0])
 
 # SDL ABI version with libtool
@@ -21,19 +21,23 @@ m4_define([SDL_MICRO], [0])
 # 3. Increase the age value only if the changes made to the ABI are backward
 #    compatible.
 #
+# Never zero or decrease any of the ABI version number values.
+#
 # See https://autotools.io/libtool/version.html
 #
 # Change the numbers just before release.
 
-m4_define([SDL_CURRENT], [1])
-m4_define([SDL_REVISION], [0])
-m4_define([SDL_AGE], [0])
+m4_define([SDL_CURRENT], [2])
+m4_define([SDL_REVISION], [5])
+m4_define([SDL_AGE], [1])
 
 AC_INIT([shareddatalayer], [SDL_MAJOR.SDL_MINOR.SDL_MICRO], [], [], [https://gerrit.o-ran-sc.org/r/admin/repos/ric-plt/sdl])
 AC_CONFIG_HEADERS([include/config.h])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([Doxyfile])
+AC_CONFIG_FILES([rpm/sdl.spec])
+AC_CONFIG_FILES([debian/changelog])
 AC_CONFIG_FILES([run-tests.sh], [chmod +x run-tests.sh])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([subdir-objects foreign 1.13 tar-pax -Wall -Werror])
@@ -46,15 +50,14 @@ AC_PROG_MKDIR_P
 AM_PROG_LIBTOOL
 AC_CONFIG_MACRO_DIR([m4])
 AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
-AX_PTHREAD
 AX_BOOST_BASE([1.53], [], [AC_MSG_ERROR(Unable to detect suitable boost library)])
 AX_BOOST_PROGRAM_OPTIONS
 AX_BOOST_SYSTEM
 AX_BOOST_FILESYSTEM
 PKG_PROG_PKG_CONFIG
 
-AC_DEFINE([HAVE_SYSTEMLOGGER], [1], [Have systemlogger])
-AM_CONDITIONAL([SYSTEMLOGGER], [test xtrue])
+AC_DEFINE([HAVE_SYSTEMLOGGER], [0], [Have systemlogger])
+AM_CONDITIONAL([SYSTEMLOGGER], [test "xyes" = "xno"])
 
 SDL_CONF_DIR=$sysconfdir/$PACKAGE_NAME.d
 AC_SUBST(SDL_CONF_DIR)
@@ -62,10 +65,6 @@ AC_SUBST(SDL_CONF_DIR)
 AC_DEFINE(HAVE_REDIS, [1], [Have redis])
 AM_CONDITIONAL([REDIS], [test xtrue])
 
-# @TODO Change to true when Redis HA support is activated.
-AC_DEFINE(HAVE_SENTINEL, [0], [Have sentinel])
-AM_CONDITIONAL([SENTINEL], [test "xyes" = "xno"])
-
 PKG_CHECK_MODULES([HIREDIS], [hiredis])
 AC_DEFINE(HAVE_HIREDIS, [1], [Have hiredis])
 AM_CONDITIONAL([HIREDIS], [test xtrue])
@@ -73,6 +72,23 @@ AM_CONDITIONAL([HIREDIS], [test xtrue])
 AC_DEFINE(HAVE_HIREDIS_VIP, [0], [Have hiredis-vip])
 AM_CONDITIONAL([HIREDIS_VIP], [test "xyes" = "xno"])
 
+AC_ARG_WITH([gcov-report-dir],
+    AS_HELP_STRING([--with-gcov-report-dir=DIR],
+        [Directory for GCOV report files]),
+    [],
+    [with_gcov_report_dir=no])
+AC_MSG_CHECKING([gcov])
+if test "x$with_gcov_report_dir" = "xno"; then
+    AC_MSG_RESULT([no])
+    GCOV_REPORT_DIR="gcov_report"
+else
+    AC_MSG_RESULT([yes])
+    AC_MSG_NOTICE([gcov report directory: $with_gcov_report_dir])
+    GCOV_REPORT_DIR="$with_gcov_report_dir"
+fi
+AC_SUBST(GCOV_REPORT_DIR)
+AM_CONDITIONAL([ENABLE_GCOV],[test "x$with_gcov_report_dir" != "xno"])
+
 DX_DOT_FEATURE(ON)
 DX_INIT_DOXYGEN([shareddatalayer], [Doxyfile], [doxygen-doc])
 SDL_LT_VERSION=m4_format("%d:%d:%d", SDL_CURRENT, SDL_REVISION, SDL_AGE)