From: Ileana Dumitrescu <ileanadumitrescu95@gmail.com>
Date: Mon, 30 Dec 2024 15:55:30 +0000 (+0200)
Subject: libtoolize.at: Update checks based on linker used
X-Git-Tag: v2.6.0~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57e1dc94d3dfdde3cf83698e4b2b86deac88aa89;p=thirdparty%2Flibtool.git

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.
---

diff --git a/tests/libtoolize.at b/tests/libtoolize.at
index 43f7e72d0..4e9d42819 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