Ongoing compile changes

Makefile.in

@@ -13,7 +13,8 @@ DISTRO_VER = $(word 2,$(subst -, ,$(DISTRO)))
 DISTRO_ARCH = $(word 3,$(subst -, ,$(DISTRO)))
 DISTRO_RESULTS_DIR = $(strip \
         $(subst fedora,Fedora, \
-        $(subst centos,CentOS,$(DISTRO_OS)))_$(DISTRO_VER))
+        $(subst centos,CentOS, \
+        $(subst rocky,Rocky,$(DISTRO_OS))))_$(DISTRO_VER))
 
 # utility
 empty :=

config/ax_boost_base.m4

@@ -152,7 +152,6 @@ if test "x$want_boost" = "xyes"; then
     AC_LANG_POP([C++])
 
 
-
     dnl if we found no boost with system layout we search for boost libraries
     dnl built and installed without the --layout=system option or for a staged(not installed) version
     if test "x$succeeded" != "xyes"; then

config/general.m4

@@ -121,110 +121,35 @@ AC_DEFUN([CHECK_OPENFIRE],
 ])
 
 # ============= C P P U N I T ==================
+dnl Removed cppunit-config:
 dnl
 dnl AM_PATH_CPPUNIT(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
 dnl
 AC_DEFUN([AM_PATH_CPPUNIT],
 [
+  AC_MSG_CHECKING([for CppUnit >= $1 using pkg-config])
+
+  PKG_CHECK_MODULES([CPPUNIT], [cppunit >= $1], [
+    AC_MSG_RESULT([found])
+    CPPUNIT_CFLAGS=$CPPUNIT_CFLAGS
+    CPPUNIT_LIBS=$CPPUNIT_LIBS
+    ifelse([$2], , :, [$2])
+  ], [
+    AC_MSG_RESULT([not found])
+    CPPUNIT_CFLAGS=""
+    CPPUNIT_LIBS=""
+    ifelse([$3], , :, [$3])
+  ])
 
-AC_ARG_WITH(cppunit-prefix,[  --with-cppunit-prefix=PFX   Prefix where CppUnit is installed (optional)],
-            cppunit_config_prefix="$withval", cppunit_config_prefix="")
-AC_ARG_WITH(cppunit-exec-prefix,[  --with-cppunit-exec-prefix=PFX  Exec prefix where CppUnit is installed (optional)],
-            cppunit_config_exec_prefix="$withval", cppunit_config_exec_prefix="")
-
-  dnl Assemble the arguments to be passed to cppunit-config in cppunit_config_args.
-  dnl Construct the cppunit-config executable name in CPPUNIT_CONFIG.
-  cppunit_config_args=
-  if test x$cppunit_config_exec_prefix != x ; then
-     cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
-     if test x${CPPUNIT_CONFIG+set} != xset ; then
-        CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config
-     fi
-  fi
-  if test x$cppunit_config_prefix != x ; then
-     cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix"
-     if test x${CPPUNIT_CONFIG+set} != xset ; then
-        CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config
-     fi
-  fi
-
-  dnl Find cppunit-config, put path in CPPUNIT_CONFIG, but if CPPUNIT_CONFIG
-  dnl already has a value containing '/', use that value.
-  AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no)
-  cppunit_version_min=$1
-
-  AC_MSG_CHECKING(for Cppunit - version >= $cppunit_version_min)
-  no_cppunit=""
-  if test "$CPPUNIT_CONFIG" = "no" ; then
-    AC_MSG_RESULT(no)
-    no_cppunit=yes
-  else
-    dnl Get cppunit's recommendations for cflags and libraries.
-    CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG $cppunit_config_args --cflags`
-    CPPUNIT_LIBS=`$CPPUNIT_CONFIG $cppunit_config_args --libs`
-    dnl Query cppunit to determine its version.
-    cppunit_version=`$CPPUNIT_CONFIG $cppunit_config_args --version`
-
-    cppunit_major_version=`echo $cppunit_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    cppunit_minor_version=`echo $cppunit_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    cppunit_micro_version=`echo $cppunit_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-    cppunit_major_min=`echo $cppunit_version_min | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    if test "x${cppunit_major_min}" = "x" ; then
-       cppunit_major_min=0
-    fi
-
-    cppunit_minor_min=`echo $cppunit_version_min | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    if test "x${cppunit_minor_min}" = "x" ; then
-       cppunit_minor_min=0
-    fi
-
-    cppunit_micro_min=`echo $cppunit_version_min | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x${cppunit_micro_min}" = "x" ; then
-       cppunit_micro_min=0
-    fi
-
-    cppunit_version_proper=`expr \
-        $cppunit_major_version \> $cppunit_major_min \| \
-        $cppunit_major_version \= $cppunit_major_min \& \
-        $cppunit_minor_version \> $cppunit_minor_min \| \
-        $cppunit_major_version \= $cppunit_major_min \& \
-        $cppunit_minor_version \= $cppunit_minor_min \& \
-        $cppunit_micro_version \>= $cppunit_micro_min `
-
-    if test "$cppunit_version_proper" = "1" ; then
-      AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version])
-    else
-      AC_MSG_RESULT(no)
-      no_cppunit=yes
-    fi
-  fi
-
-  if test "x$no_cppunit" = x ; then
-     ifelse([$2], , :, [$2])
-  else
-     CPPUNIT_CFLAGS=""
-     CPPUNIT_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-
-  AC_SUBST(CPPUNIT_CFLAGS)
-  AC_SUBST(CPPUNIT_LIBS)
+  AC_SUBST([CPPUNIT_CFLAGS])
+  AC_SUBST([CPPUNIT_LIBS])
 ])
 
-
 AC_DEFUN([CHECK_CPPUNIT],
 [
     AM_PATH_CPPUNIT(1.9,
       [],
-      [SF_MISSING_DEP("cppunit headers not found")]
-    )
+      [SF_MISSING_DEP("CppUnit headers not found")])
 ])
 
 m4_include([config/check_jdk.m4])
@@ -335,6 +260,8 @@ AC_DEFUN([CHECK_SSL],
     AC_SUBST(SSL_CXXFLAGS,"$SSL_CFLAGS")
 ])
 
+
+
 # ============ P O C O  =========================
 AC_DEFUN([CHECK_POCO],
 [

config/revision-gen

@@ -24,6 +24,9 @@ if test -d ../.git; then
 fi
 
 VERSION=$1
+if [ $VERSION == "25.01" ]; then
+    VERSION="4.6.0"
+fi
 if [ $VERSION == "24.01" ]; then
     VERSION="4.6.0"
 fi

config/test-driver

@@ -1,9 +1,9 @@
 #! /bin/sh
 # test-driver - basic testsuite driver script.
 
-scriptversion=2012-06-27.10; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2020 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@ scriptversion=2012-06-27.10; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -44,13 +44,12 @@ print_usage ()
 Usage:
   test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
               [--expect-failure={yes|no}] [--color-tests={yes|no}]
-              [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
+              [--enable-hard-errors={yes|no}] [--]
+              TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
 The '--test-name', '--log-file' and '--trs-file' options are mandatory.
 END
 }
 
-# TODO: better error handling in option parsing (in particular, ensure
-# TODO: $log_file, $trs_file and $test_name are defined).
 test_name= # Used for reporting.
 log_file=  # Where to save the output of the test script.
 trs_file=  # Where to save the metadata of the test run.
@@ -69,10 +68,23 @@ while test $# -gt 0; do
   --enable-hard-errors) enable_hard_errors=$2; shift;;
   --) shift; break;;
   -*) usage_error "invalid option: '$1'";;
+   *) break;;
   esac
   shift
 done
 
+missing_opts=
+test x"$test_name" = x && missing_opts="$missing_opts --test-name"
+test x"$log_file"  = x && missing_opts="$missing_opts --log-file"
+test x"$trs_file"  = x && missing_opts="$missing_opts --trs-file"
+if test x"$missing_opts" != x; then
+  usage_error "the following mandatory options are missing:$missing_opts"
+fi
+
+if test $# -eq 0; then
+  usage_error "missing argument"
+fi
+
 if test $color_tests = yes; then
   # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
   red='' # Red.
@@ -94,11 +106,14 @@ trap "st=143; $do_exit" 15
 # Test script is run here.
 "$@" >$log_file 2>&1
 estatus=$?
+
 if test $enable_hard_errors = no && test $estatus -eq 99; then
-  estatus=1
+  tweaked_estatus=1
+else
+  tweaked_estatus=$estatus
 fi
 
-case $estatus:$expect_failure in
+case $tweaked_estatus:$expect_failure in
   0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
   0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
   77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
@@ -107,6 +122,12 @@ case $estatus:$expect_failure in
   *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
 esac
 
+# Report the test outcome and exit status in the logs, so that one can
+# know whether the test passed or failed simply by looking at the '.log'
+# file, without the need of also peaking into the corresponding '.trs'
+# file (automake bug#11814).
+echo "$res $test_name (exit status: $estatus)" >>$log_file
+
 # Report outcome to console.
 echo "${col}${res}${std}: $test_name"
 
@@ -119,9 +140,9 @@ echo ":copy-in-global-log: $gcopy" >> $trs_file
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

configure.ac

@@ -4,7 +4,7 @@
 # 
 AC_PREREQ(2.57)
 
-AC_INIT(sipX, 24.01, sipxcom-dev@googlegroups.com)
+AC_INIT(sipX, 25.01, sipxcom-dev@googlegroups.com)
 
 # Pass standard and sipxecs common params to ./configure switches on all sub-projects.
 # Doesn't have to handle ./configure vars like SIPX_PBXUSER because those

doc/configure.ac

@@ -8,7 +8,7 @@ m4_include([config/sipXlib.m4])
 
 SFAC_SIPX_INSTALL_PREFIX
 
-AM_INIT_AUTOMAKE(foreign)
+AM_INIT_AUTOMAKE(foreign subdir-objects)
 SFAC_AUTOMAKE_VERSION([1.6])
 CHECK_AUTOCONF
 

mak/build.mk.in

@@ -4,7 +4,9 @@
 OPTIONS = @OPTIONS@
 DOWNLOAD_LIB_CACHE = @DOWNLOAD_LIB_CACHE@
 
-git_submodules = $(shell sed -e '/^\[submodule/! d' -e 's/^\[submodule "\(.*\)"]$$/\1/g' $(wildcard $(SRC)/.gitmodules))
+git_submodules = $(shell if [ -f $(SRC)/.gitmodules ]; then \
+    sed -e '/^\[submodule/! d' -e 's/^\[submodule "\(.*\)"]$$/\1/g' $(SRC)/.gitmodules; \
+    fi)
 custommodules =
 git_custommodules_file = $(wildcard $(SRC)/custom/.gitmodules)
 ifneq ($(git_custommodules_file),)

mak/list-dependencies.mk.in

@@ -47,7 +47,7 @@ REWRITE_DEPS_suse = \
 	-e '/vixiecron/d'
 
 CURRENT_DISTRO := $(shell rpm --eval \
-	'%{?fedora:Fedora}%{!?fedora:%{?suse_version:Suse}%{!?suse_version:CentOS}}')
+	'%{?fedora:Fedora}%{!?fedora:%{?suse_version:Suse}%{!?suse_version:%{?centos:CentOS}%{!?centos:Rocky}}}')
 
 ifeq ($(CURRENT_DISTRO),CentOS)
 RPMSPEC := $(SRC)/mak/rpmspec-rh6-x86_64