merged with devtools 1.0.1 upstream (git repo migration)

1 files changed, 6 insertions, 1 deletions

diff --git a/src/find-libdeps.in b/src/find-libdeps.in
index 5a11580..afdf0f5 100644
--- a/src/find-libdeps.in
+++ b/src/find-libdeps.in
@@ -2,7 +2,10 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-m4_include(lib/common.sh)
+_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
+# shellcheck source=src/lib/common.sh
+source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
+
 
 set -e
 
@@ -40,6 +43,7 @@ else
 	pushd "$WORKDIR" >/dev/null
 fi
 
+shopt -s extglob
 process_sofile() {
 	# extract the library name: libfoo.so
 	shopt -s extglob nullglob
@@ -56,6 +60,7 @@ process_sofile() {
 		soobjects+=("${soname}=${soversion}-${soarch}")
 	fi
 }
+shopt -u extglob
 
 case $script_mode in
 	deps) find_args=(-perm -u+x);;