summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
Diffstat (limited to 'm4')
-rw-r--r--m4/ChangeLog9
-rw-r--r--m4/biarch.m44
-rw-r--r--m4/zip.m42
3 files changed, 12 insertions, 3 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 32832693..8729f58c 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,12 @@
+2022-03-20 Mark Wielaard <mark@klomp.org>
+
+ * biarch.m4: Don't check whether -m64 works for 32bit host.
+
+2022-03-14 Mark Wielaard <mark@klomp.org>
+
+ * biarch.m4: Use AS_HELP_STRING instead of AC_HELP_STRING.
+ * zip.m4: Likewise.
+
2020-12-15 Dmitry V. Levin <ldv@altlinux.org>
* .gitignore: New file.
diff --git a/m4/biarch.m4 b/m4/biarch.m4
index c238d8d1..c7baead7 100644
--- a/m4/biarch.m4
+++ b/m4/biarch.m4
@@ -28,13 +28,13 @@ biarch_CC="$biarch_CC $utrace_biarch"])])
AC_DEFUN([utrace_BIARCH], [AC_REQUIRE([utrace_HOST64])
utrace_biarch_forced=no
AC_ARG_WITH([biarch],
- AC_HELP_STRING([--with-biarch],
+ AS_HELP_STRING([--with-biarch],
[enable biarch tests despite build problems]),
[AS_IF([test "x$with_biarch" != xno], [utrace_biarch_forced=yes])])
AS_IF([test $utrace_biarch_forced = yes], [dnl
utrace_cv_cc_biarch=yes
AC_MSG_NOTICE([enabling biarch tests regardless using $biarch_CC])], [dnl
-AS_IF([test x$utrace_cv_CC_m32 != xnone], [dnl
+AS_IF([test x$utrace_cv_CC_m32 != xnone -a x$utrace_cv_host64 != xno], [dnl
AC_CACHE_CHECK([whether $biarch_CC makes executables we can run],
utrace_cv_cc_biarch, [dnl
save_CC="$CC"
diff --git a/m4/zip.m4 b/m4/zip.m4
index ab6fd57e..8affa3fa 100644
--- a/m4/zip.m4
+++ b/m4/zip.m4
@@ -4,7 +4,7 @@ dnl and sets AC_DEFINE(USE_$2) and LIBS.
AC_DEFUN([eu_ZIPLIB], [dnl
AC_ARG_WITH([[$1]],
-AC_HELP_STRING([--with-[$1]], [support [$1] compression in libdwfl]),,
+AS_HELP_STRING([--with-[$1]], [support [$1] compression in libdwfl]),,
[with_[$1]=default])
if test $with_[$1] != no; then
AC_SEARCH_LIBS([$4], [$3], [with_[$1]=yes],