From 8ea51556740fa57708567f1b0b26247036298a13 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Sun, 22 Oct 2023 18:04:50 +0300
Subject: [PATCH] fixes to autotools find_lib usage for mac and windows
---
configure | 43 ++++++++++++++++++++++++++++++++++---------
configure.ac | 43 ++++++++++++++++++++++++++++++++++---------
2 files changed, 68 insertions(+), 18 deletions(-)
diff --git a/configure b/configure
index 3ed51f38..b22960bd 100755
--- a/configure
+++ b/configure
@@ -14503,10 +14503,16 @@ fi
case "$host" in
*-*-darwin*)
- avif_lib=`find_lib libavif.dylib`
+ avif_lib=`find_lib "libavif.[0-9]*.dylib"`
+ if test x$avif_lib = x; then
+ avif_lib=`find_lib "libavif*.dylib"`
+ fi
;;
*-*-cygwin* | *-*-mingw*)
- avif_lib=`find_lib "libavif*.dll"`
+ avif_lib=`find_lib "libavif-[0-9]*.dll"`
+ if test x$avif_lib = x; then
+ avif_lib=`find_lib "libavif*.dll"`
+ fi
;;
*)
avif_lib=`find_lib "libavif[0-9]*.so.*"`
@@ -14726,7 +14732,10 @@ fi
case "$host" in
*-*-darwin*)
- jpg_lib=`find_lib libjpeg.dylib`
+ jpg_lib=`find_lib "libjpeg.[0-9]*.dylib"`
+ if test x$jpg_lib = x; then
+ jpg_lib=`find_lib libjpeg.dylib`
+ fi
;;
*-*-cygwin* | *-*-mingw*)
jpg_lib=`find_lib "libjpeg*.dll"`
@@ -14938,10 +14947,16 @@ fi
case "$host" in
*-*-darwin*)
- jxl_lib=`find_lib libjxl.dylib`
+ jxl_lib=`find_lib "libjxl.[0-9]*.dylib"`
+ if test x$jxl_lib = x; then
+ jxl_lib=`find_lib libjxl.dylib`
+ fi
;;
*-*-cygwin* | *-*-mingw*)
- jxl_lib=`find_lib "libjxl.dll"`
+ jxl_lib=`find_lib "libjxl-[0-9]*.dll"`
+ if test x$jxl_lib = x; then
+ jxl_lib=`find_lib "libjxl.dll"`
+ fi
;;
*)
jxl_lib=`find_lib "libjxl[0-9]*.so.*"`
@@ -15158,7 +15173,10 @@ fi
case "$host" in
*-*-darwin*)
- png_lib=`find_lib libpng.dylib`
+ png_lib=`find_lib "libpng[0-9]*.dylib"`
+ if test x$png_lib = x; then
+ png_lib=`find_lib libpng.dylib`
+ fi
;;
*-*-cygwin* | *-*-mingw*)
png_lib=`find_lib "libpng*.dll"`
@@ -15368,7 +15386,10 @@ fi
case "$host" in
*-*-darwin*)
- tif_lib=`find_lib libtiff.dylib`
+ tif_lib=`find_lib "libtiff.[0-9]*.dylib"`
+ if test x$tif_lib = x; then
+ tif_lib=`find_lib libtiff.dylib`
+ fi
;;
*-*-cygwin* | *-*-mingw*)
tif_lib=`find_lib "libtiff-*.dll"`
@@ -15754,8 +15775,12 @@ fi
case "$host" in
*-*-darwin*)
- webpdemux_lib=`find_lib libwebpdemux.dylib`
- webp_lib=`find_lib libwebp.dylib`
+ webpdemux_lib=`find_lib "libwebpdemux.[0-9]*.dylib"`
+ webp_lib=`find_lib "libwebp.[0-9]*.dylib"`
+ if test x$webp_lib = x; then
+ webpdemux_lib=`find_lib libwebpdemux.dylib`
+ webp_lib=`find_lib libwebp.dylib`
+ fi
;;
*-*-cygwin* | *-*-mingw*)
webpdemux_lib=`find_lib "libwebpdemux-*.dll"`
diff --git a/configure.ac b/configure.ac
index 72b3eee2..d6c909a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -339,10 +339,16 @@ if test x$enable_avif = xyes; then
case "$host" in
*-*-darwin*)
- avif_lib=[`find_lib libavif.dylib`]
+ avif_lib=[`find_lib "libavif.[0-9]*.dylib"`]
+ if test x$avif_lib = x; then
+ avif_lib=[`find_lib "libavif*.dylib"`]
+ fi
;;
*-*-cygwin* | *-*-mingw*)
- avif_lib=[`find_lib "libavif*.dll"`]
+ avif_lib=[`find_lib "libavif-[0-9]*.dll"`]
+ if test x$avif_lib = x; then
+ avif_lib=[`find_lib "libavif*.dll"`]
+ fi
;;
*)
avif_lib=[`find_lib "libavif[0-9]*.so.*"`]
@@ -391,7 +397,10 @@ if test x$enable_jpg = xyes; then
case "$host" in
*-*-darwin*)
- jpg_lib=[`find_lib libjpeg.dylib`]
+ jpg_lib=[`find_lib "libjpeg.[0-9]*.dylib"`]
+ if test x$jpg_lib = x; then
+ jpg_lib=[`find_lib libjpeg.dylib`]
+ fi
;;
*-*-cygwin* | *-*-mingw*)
jpg_lib=[`find_lib "libjpeg*.dll"`]
@@ -435,10 +444,16 @@ if test x$enable_jxl = xyes; then
case "$host" in
*-*-darwin*)
- jxl_lib=[`find_lib libjxl.dylib`]
+ jxl_lib=[`find_lib "libjxl.[0-9]*.dylib"`]
+ if test x$jxl_lib = x; then
+ jxl_lib=[`find_lib libjxl.dylib`]
+ fi
;;
*-*-cygwin* | *-*-mingw*)
- jxl_lib=[`find_lib "libjxl.dll"`]
+ jxl_lib=[`find_lib "libjxl-[0-9]*.dll"`]
+ if test x$jxl_lib = x; then
+ jxl_lib=[`find_lib "libjxl.dll"`]
+ fi
;;
*)
jxl_lib=[`find_lib "libjxl[0-9]*.so.*"`]
@@ -484,7 +499,10 @@ if test x$enable_png = xyes; then
case "$host" in
*-*-darwin*)
- png_lib=[`find_lib libpng.dylib`]
+ png_lib=[`find_lib "libpng[0-9]*.dylib"`]
+ if test x$png_lib = x; then
+ png_lib=[`find_lib libpng.dylib`]
+ fi
;;
*-*-cygwin* | *-*-mingw*)
png_lib=[`find_lib "libpng*.dll"`]
@@ -526,7 +544,10 @@ if test x$enable_tif = xyes -a x$enable_imageio != xyes; then
case "$host" in
*-*-darwin*)
- tif_lib=[`find_lib libtiff.dylib`]
+ tif_lib=[`find_lib "libtiff.[0-9]*.dylib"`]
+ if test x$tif_lib = x; then
+ tif_lib=[`find_lib libtiff.dylib`]
+ fi
;;
*-*-cygwin* | *-*-mingw*)
tif_lib=[`find_lib "libtiff-*.dll"`]
@@ -580,8 +601,12 @@ if test x$enable_webp = xyes; then
case "$host" in
*-*-darwin*)
- webpdemux_lib=[`find_lib libwebpdemux.dylib`]
- webp_lib=[`find_lib libwebp.dylib`]
+ webpdemux_lib=[`find_lib "libwebpdemux.[0-9]*.dylib"`]
+ webp_lib=[`find_lib "libwebp.[0-9]*.dylib"`]
+ if test x$webp_lib = x; then
+ webpdemux_lib=[`find_lib libwebpdemux.dylib`]
+ webp_lib=[`find_lib libwebp.dylib`]
+ fi
;;
*-*-cygwin* | *-*-mingw*)
webpdemux_lib=[`find_lib "libwebpdemux-*.dll"`]