From d5b8cf72f47bda18403137fee7bd64cce30f5e4c Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 11 Jul 2022 15:54:15 -0700 Subject: [PATCH] Revert "autotools: relax soname pattern for dynamic loading" This reverts commit 85536328272d754277febd010e82d89b04e68b6d. An issue with choosing the shortest one, is that it will prefer development libraries: libfoo.so is shorter then libfoo.so.0.6. --- configure.ac | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 3f390ad66..0b2c7c722 100644 --- a/configure.ac +++ b/configure.ac @@ -64,11 +64,6 @@ AC_PROG_EGREP AC_PROG_INSTALL AC_PROG_MAKE_SET PKG_PROG_PKG_CONFIG -AC_PROG_AWK - -if test -z "$AWK"; then - AC_MSG_ERROR([*** Required awk tool not found!]) -fi dnl 64-bit file offsets if possible unless --disable-largefile is specified AC_SYS_LARGEFILE @@ -186,7 +181,7 @@ find_lib() host_lib_path="/usr/$base_libdir /usr/local/$base_libdir" fi for path in $env_lib_path $gcc_bin_path $gcc_lib_path $host_lib_path; do - lib=[`ls -- $path/$1 2>/dev/null | sed -e 's,.*/,,' | $AWK '{print length() " " $0;}' | sort -n -r | tail -1 | sed 's/^[0-9]\+ //'`] + lib=[`ls -- $path/$1 2>/dev/null | sed -e '/\.so\..*\./d' -e 's,.*/,,' | sort | tail -1`] if test x$lib != x; then echo $lib return