diff options
Diffstat (limited to 'm4/slibtool.m4')
| -rw-r--r-- | m4/slibtool.m4 | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/m4/slibtool.m4 b/m4/slibtool.m4 index e2e6ad5..b0219ea 100644 --- a/m4/slibtool.m4 +++ b/m4/slibtool.m4 @@ -2,7 +2,7 @@ # # # slibtool.m4: native slibtool integration for autoconf-based projects # # # -# Copyright (C) 2016--2024 SysDeer Technologies, LLC # +# Copyright (C) 2016--2025 SysDeer Technologies, LLC # # # # Permission is hereby granted, free of charge, to any person obtaining # # a copy of this software and associated documentation files (the # @@ -242,7 +242,7 @@ slibtool_set_flavor() _/*) SLIBTOOL_SYSROOT="--sysroot=${slibtool_sysroot}" - SLIBTOOL="${SLIBTOOL} \$(SLIBTOOL_SYSROOT)" + SLIBTOOL="${SLIBTOOL} ${SLIBTOOL_SYSROOT}" ;; *) @@ -253,6 +253,12 @@ slibtool_set_flavor() ;; esac + case "_${slibtool_prefer_sltdl:-}" in + '_yes') + SLIBTOOL="${SLIBTOOL} --prefer-sltdl" + ;; + esac + # drop-in replacement enable_shared=${slibtool_enable_shared} enable_static=${slibtool_enable_static} @@ -448,6 +454,7 @@ AC_DEFUN([SLIBTOOL_INIT],[ AC_BEFORE([SLIBTOOL_LANG]) AC_REQUIRE([SLIBTOOL_PREREQ]) AC_REQUIRE([_SLIBTOOL_DEFAULTS]) +AC_REQUIRE([_SLIBTOOL_SLTDL_OPTION]) AC_REQUIRE([_SLIBTOOL_SET_FLAVOR]) AC_REQUIRE([_SLIBTOOL_ARGUMENT_HANDLING]) @@ -536,7 +543,7 @@ _SLIBTOOL_ARG_WITH([sysroot],[absolute path to the target's sysroot],[slibtool_s # -------------------- slibtool_set_flavor LIBTOOL='$(SLIBTOOL)' -SLIBTOOL="${SLIBTOOL} \$(SLIBTOOL_FLAGS)" +SLIBTOOL="${SLIBTOOL} ${SLIBTOOL_FLAGS}" AC_SUBST([LIBTOOL]) AC_SUBST([SLIBTOOL]) |