Skip to content

Commit

Permalink
Switch to "-latest" versions of runners (#836)
Browse files Browse the repository at this point in the history
  • Loading branch information
lsh123 authored Aug 7, 2024
1 parent 5e6f3ac commit f0f6088
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/make-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:

jobs:
check-ubuntu:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
make install
check-osx:
runs-on: macos-13
runs-on: macos-latest
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -136,7 +136,7 @@ jobs:
make install
check-mingw:
runs-on: windows-2022
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -199,7 +199,7 @@ jobs:
make install
check-msvc:
runs-on: windows-2022
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
Expand Down
27 changes: 24 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2356,7 +2356,7 @@ dnl check if we need dynamic loading support
dnl ==========================================================================
LIBLTDL_INCLUDE_MARKER="ltdl.h"
LIBLTDL_LIB_MARKER="libltdl$shrext"

LIBLTDL_MIN_VERSION=1.0.0
LIBLTDL_CFLAGS=""
LIBLTDL_LIBS=""
LIBLTDL_FOUND="no"
Expand Down Expand Up @@ -2387,7 +2387,28 @@ if test "z$LIBLTDL_FOUND" = "zno" -a "z$LIBLTDL_CFLAGS" != "z" -a "z$LIBLTDL_LI
LIBLTDL_FOUND="yes"
fi

dnl Priority 3: Just try to compile/link and hope for the best
dnl Priority 3: Guess with pkg_config
if test "z$LIBLTDL_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" ; then
PKG_CHECK_MODULES(LIBLTDL, libltdl >= $LIBLTDL_MIN_VERSION,
[LIBLTDL_FOUND=yes],
[LIBLTDL_FOUND=no])
fi

dnl Priority 4: on MacOSX libltdl is in the 'libtool' brew package
if test "z$LIBLTDL_FOUND" = "zno" -a "z$build_on_mac" = "zyes" ; then
AC_MSG_CHECKING(for libltdl library installation in 'brew')
LIBTOOL_PATH=`brew --prefix libtool`
if test -f "$LIBTOOL_PATH/include/$LIBLTDL_INCLUDE_MARKER" ; then
LIBLTDL_CFLAGS="-I$LIBTOOL_PATH/include"
LIBLTDL_LIBS="-L$LIBTOOL_PATH/lib -lltdl"
LIBLTDL_FOUND="yes"
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([not found: "$LIBTOOL_PATH/include/$LIBLTDL_INCLUDE_MARKER" file doesn't exist)])
fi
fi

dnl Priority 5: Just try to compile/link and hope for the best
if test "z$LIBLTDL_FOUND" = "zno" ; then
AC_CHECK_HEADER([ltdl.h], [
AC_CHECK_LIB(
Expand All @@ -2407,7 +2428,7 @@ if test "z$LIBLTDL_FOUND" = "zno" ; then
LIBLTDL_FOUND="yes"
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([not found])
AC_MSG_RESULT([not found])
fi
fi

Expand Down

0 comments on commit f0f6088

Please sign in to comment.