From f86ebb2112ee59755cb9d41a6cccaf6a9f16c2d2 Mon Sep 17 00:00:00 2001
From: Ko van der Sloot <Ko.vanderSloot@ziggo.nl>
Date: Thu, 8 Aug 2024 16:34:15 +0200
Subject: [PATCH] update

---
 .github/workflows/unicode.yml |  3 +--
 m4/ac_osx_pkg.m4              | 18 +++++++++++++++---
 src/tst.sh                    |  7 ++-----
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/unicode.yml b/.github/workflows/unicode.yml
index 8e158fc..f129595 100644
--- a/.github/workflows/unicode.yml
+++ b/.github/workflows/unicode.yml
@@ -70,13 +70,12 @@ jobs:
         run: |
              if [ "$RUNNER_OS" == "Linux" ]; then
                 sudo apt-get install libicu-dev libxml2-dev libbz2-dev;
-                sudo apt-get install zlib1g-dev cppcheck
+                sudo apt-get install zlib1g-dev
              else
                 brew install libxml2
                 # brew reinstall icu4c
                 brew install bzip2
                 brew install zlib
-                brew install cppcheck
              fi
 
       - name: bootstrap
diff --git a/m4/ac_osx_pkg.m4 b/m4/ac_osx_pkg.m4
index 8561593..35cdcbe 100644
--- a/m4/ac_osx_pkg.m4
+++ b/m4/ac_osx_pkg.m4
@@ -1,7 +1,7 @@
 # osx_pkg.m4 - Macros to add OSX brew locations to pkg-config. -*- Autoconf -*-
-# serial 1
+# serial 2 (pkg-config-0.24)
 #
-# Copyright © 2018 Ko van der Sloot <K.vanderSloot@let.ru.nl>
+# Copyright © 2024 Ko van der Sloot <K.vanderSloot@let.ru.nl>
 #
 # 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
@@ -40,6 +40,13 @@ case ${host_os} in
         export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/$i/lib/pkgconfig"
       fi
     done
+    for i in `ls /opt/homewbrew/opt`
+    do
+      if test -d "/opt/homebrew/opt/$i/lib/pkgconfig"
+      then
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/opt/homebrew/opt/$i/lib/pkgconfig"
+      fi
+    done
     ;;
 esac
 ])
@@ -55,12 +62,17 @@ case ${host_os} in
  # linux is wellbehaved
     ;;
  darwin*)
- # darwin isn't
+ # darwin/mac0s isn't
     for i in $*
     do
       if test -d "/usr/local/opt/$i/lib/pkgconfig"
       then
         export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/$i/lib/pkgconfig"
+      else
+        if test -d "/opt/homebrew/opt//$i/lib/pkgconfig"
+        then
+          export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/opt/homebrew/opt/$i/lib/pkgconfig"
+        fi
       fi
     done
     ;;
diff --git a/src/tst.sh b/src/tst.sh
index f13bc06..48d4411 100755
--- a/src/tst.sh
+++ b/src/tst.sh
@@ -1,6 +1,3 @@
 #! /bin/sh
-status=0
-./main > tst.log 2>&1
-status=$(($status + $?))
-cat < afile
-exit $status
+./unicode > tst.log 2>&1
+cat < tst.log