X-Git-Url: http://git.draconx.ca/gitweb/dxcommon.git/blobdiff_plain/b3a380d027135bff7d13a08557bd7db294d18f08..b045c0c5e35a1558e6b77d99e0ed8ab86d6dc550:/m4/flex.m4

diff --git a/m4/flex.m4 b/m4/flex.m4
index 4e9b56f..bc99985 100644
--- a/m4/flex.m4
+++ b/m4/flex.m4
@@ -1,4 +1,5 @@
-dnl Copyright © 2020 Nick Bowler
+dnl Copyright © 2020-2021, 2024 Nick Bowler
+dnl
 dnl License WTFPL2: Do What the Fuck You Want To Public License, version 2.
 dnl This is free software: you are free to do what the fuck you want to.
 dnl There is NO WARRANTY, to the extent permitted by law.
@@ -20,8 +21,8 @@ AC_CACHE_CHECK([for flex], [ac_cv_path_FLEX],
 [dx_cv_flex_found=:
 AC_PATH_PROGS_FEATURE_CHECK([FLEX], [flex lex],
 [_DX_FLEX_DO_TEST([$ac_path_FLEX],
-[flex_relcmd=${ac_path_FLEX##*/}
-flex_bypath=`command -v "$flex_relcmd"` #''
+[DX_BASENAME([flex_relcmd], ["$ac_path_FLEX"])
+flex_bypath=`{ command -v "$flex_relcmd"; } 2>/dev/null` #''
 ac_cv_path_FLEX=$ac_path_FLEX
 test x"$flex_bypath" = x"$ac_path_FLEX" && ac_cv_path_FLEX=$flex_relcmd
 ac_path_FLEX_found=:
@@ -71,6 +72,6 @@ int main(void)
 }])
 
 AC_DEFUN([_DX_FLEX_DO_TEST], [rm -f conftest.c
-AS_IF([$1 -o conftest.inc conftest.l 2>&AS_MESSAGE_LOG_FD],
+AS_IF([$1 -o conftest.inc conftest.l >&AS_MESSAGE_LOG_FD 2>&1],
 [AC_LINK_IFELSE([AC_LANG_SOURCE([[#include "conftest.inc"]])], [$2], [$3])],
 [$3])])