switch to pkgconf for ci

vasi · Nov 22, 2024 · 5a42165 · 5a42165
1 parent 4289904
commit 5a42165
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,7 +32,7 @@ jobs:
       - name: apt dependencies
         run: > 
           sudo apt-get update &&
-          sudo apt-get install -y automake autoconf libtool pkg-config
+          sudo apt-get install -y automake autoconf libtool pkgconf
           zlib1g-dev liblzo2-dev liblzma-dev liblz4-dev libzstd-dev
           fio
         if: runner.os == 'Linux'
@@ -46,7 +46,9 @@ jobs:
         env:
           HOMEBREW_NO_AUTO_UPDATE: 1
         run: |
-          brew install autoconf automake libtool pkgconfig squashfs coreutils
+          brew update # Keep until https://github.com/Homebrew/homebrew-core/pull/194885 is available by default
+          brew remove pkgconfig
+          brew install autoconf automake libtool pkgconf squashfs coreutils
           brew install --cask macfuse
         if: runner.os == 'macOS'
       - name: configure

diff --git a/autogen.sh b/autogen.sh
@@ -17,9 +17,11 @@ if libtoolize --version > /dev/null 2>&1; then : ; else
   fi
 fi
 
-if pkg-config --version > /dev/null 2>&1; then : ; else
-  echo "Missing pkg-config"
-  exit 1
+if pkgconf --version > /dev/null 2>&1; then : ; else
+  if pkg-config --version > /dev/null 2>&1; then : ; else
+    echo "Missing pkg-config"
+    exit 1
+  fi
 fi
 
 exec autoreconf -i