Merge pull request #1 from s3rj1k/master

Add support for Debian 12.

config/ax_check_folders.m4

@@ -0,0 +1,22 @@
+# AX_CHECK_FOLDERS(PATH, ACTION-IF-FOUND, [ACTION-IF-NOT-FOUND])
+# -----------------------------------------------------------
+# First checks if the provided PATH exists and is a directory.
+# If so, then checks if at least one folder exists in the provided PATH.
+# Calls ACTION-IF-FOUND if found, ACTION-IF-NOT-FOUND otherwise.
+
+AC_DEFUN([AX_CHECK_FOLDERS], [
+  AC_MSG_CHECKING([if $1 is a valid directory])
+  if test -d "$1"; then
+    AC_MSG_RESULT([yes])
+    AC_MSG_CHECKING([for at least one folder in $1])
+    if (find "$1" -maxdepth 1 -mindepth 1 -type d | grep -q .); then
+      AC_MSG_RESULT([yes])
+      $2
+    else
+      AC_MSG_RESULT([no])
+      m4_ifval([$3], [$3], [])
+    fi
+  else
+    AC_MSG_RESULT([no])
+  fi
+])

configure.ac

@@ -27,11 +27,11 @@ CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
 LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
 
 m4_include(config/ax_compiler_vendor.m4)
-m4_include(config/ax_check_real_file.m4)
 m4_include(config/ax_fixed_point_machine.m4)
 m4_include(config/ax_misaligned_access_fails.m4)
 m4_include(config/ax_c99_features.m4)
 m4_include(config/ax_check_export_capability.m4)
+m4_include(config/ax_check_folders.m4)
 
 BROADVOICE_MAJOR_VERSION=0
 BROADVOICE_MINOR_VERSION=1
@@ -211,7 +211,7 @@ if test "${build}" = "${host}"
 then
     case "${host}" in
     x86_64-*)
-        AX_CHECK_REAL_FILE([${prefix}/lib64], libdir='$(exec_prefix)/lib64')
+        AX_CHECK_FOLDERS([${prefix}/lib64], libdir='$(exec_prefix)/lib64')
         ;;
     esac
 fi

debian/compat

@@ -1 +1 @@
-9
+10

debian/control

@@ -1,7 +1,7 @@
 Source: libbroadvoice
-Priority: extra
+Priority: optional
 Maintainer: FreeSWITCH Solutions <[email protected]>
-Build-Depends: debhelper (>= 9), dh-autoreconf, automake (>= 1.14), autoconf (>= 2.69)
+Build-Depends: debhelper (>= 10), dh-autoreconf, automake (>= 1.14), autoconf (>= 2.69)
 Standards-Version: 3.9.6
 Section: libs
 Homepage: https://www.broadcom.com/support/broadvoice/

debian/libbroadvoice-dev.lintian-overrides

@@ -1,2 +1,3 @@
 libbroadvoice-dev: new-package-should-close-itp-bug
 libbroadvoice-dev: helper-templates-in-copyright
+libbroadvoice-dev: pkg-config-unavailable-for-cross-compilation