branch: development
commit 021a79ba3ecbb53f9dba93901f134cdc672c5a0b
Author: Ileana Dumitrescu <ileanadumitresc...@gmail.com>
AuthorDate: Mon Dec 30 17:55:30 2024 +0200
libtoolize.at: Update checks based on linker used
If mklink is used for symlinking files, the expout will not match, so
stdout is used instead.
* tests/libtoolize.at: Use stdout for checks instead of expout on MSVC.
---
tests/libtoolize.at | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/tests/libtoolize.at b/tests/libtoolize.at
index 43f7e72d..4e9d4281 100644
--- a/tests/libtoolize.at
+++ b/tests/libtoolize.at
@@ -521,7 +521,12 @@ AT_SETUP([copy ltdl.m4 with shared macro directory])
_LT_AT_LTDL_SETUP
-LT_AT_CHECK_LIBTOOLIZE([--ltdl], 0, expout)
+case $LN_S in
+*mklink*)
+ LT_AT_CHECK_LIBTOOLIZE([--ltdl], 0, stdout) ;;
+*)
+ LT_AT_CHECK_LIBTOOLIZE([--ltdl], 0, expout) ;;
+esac
AT_CLEANUP
@@ -533,7 +538,12 @@ AT_SETUP([correctly parse LTDL_INIT from configure.ac])
_LT_AT_LTDL_SETUP
-LT_AT_CHECK_LIBTOOLIZE([], 0, expout)
+case $LN_S in
+*mklink*)
+ LT_AT_CHECK_LIBTOOLIZE([], 0, stdout) ;;
+*)
+ LT_AT_CHECK_LIBTOOLIZE([], 0, expout) ;;
+esac
AT_CLEANUP
@@ -1082,7 +1092,12 @@ exit 1
]])
chmod a+x ./no-m4
-AT_CHECK([PATH=`pwd`:$PATH M4=`pwd`/no-m4 $LIBTOOLIZE --ltdl=ltdl], 0, expout)
+case $LN_S in
+*mklink*)
+ AT_CHECK([PATH=`pwd`:$PATH M4=`pwd`/no-m4 $LIBTOOLIZE --ltdl=ltdl], 0,
stdout) ;;
+*)
+ AT_CHECK([PATH=`pwd`:$PATH M4=`pwd`/no-m4 $LIBTOOLIZE --ltdl=ltdl], 0,
expout) ;;
+esac
AT_CLEANUP
