diff --git a/configure b/configure
index d7e40286..2e02fc67 100755
--- a/configure
+++ b/configure
@@ -5194,7 +5194,7 @@ fi
 
 
 case $host_os in #(
-  mingw*|cygwin*|msys|eabi) :
+  mingw*|cygwin*|msys|eabi*) :
     enable_pie="no" ;; #(
   *) :
      ;;
@@ -7008,7 +7008,7 @@ fi
 
 
 case $host_os in #(
-  cygwin*|mingw*|msys|pw32*|cegcc*|eabi) :
+  cygwin*|mingw*|msys|pw32*|cegcc*|eabi*) :
       ;; #(
   *) :
 
@@ -7439,7 +7439,7 @@ fi
 esac
 
 case $host_os in #(
-  cygwin*|mingw*|msys|pw32*|cegcc*|eabi) :
+  cygwin*|mingw*|msys|pw32*|cegcc*|eabi*) :
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-asynchronous-unwind-tables" >&5
 $as_echo_n "checking whether C compiler accepts -fno-asynchronous-unwind-tables... " >&6; }
@@ -7559,7 +7559,7 @@ if test "x$enable_ssp" != "xno"; then :
 
 
 case $host_os in #(
-  cygwin*|mingw*|msys|pw32*|cegcc*|haiku|none|eabi) :
+  cygwin*|mingw*|msys|pw32*|cegcc*|haiku|none|eabi*) :
       ;; #(
   *) :
 
diff --git a/configure.ac b/configure.ac
index ff30a298..f280c414 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,7 +91,7 @@ AC_ARG_ENABLE(pie,
 [AS_HELP_STRING(--disable-pie,Do not produce position independent executables)],
  enable_pie=$enableval, enable_pie="maybe")
 
-AS_CASE([$host_os], [mingw*|cygwin*|msys|eabi], [enable_pie="no"])
+AS_CASE([$host_os], [mingw*|cygwin*|msys|eabi*], [enable_pie="no"])
 
 AC_ARG_ENABLE(blocking-random,
 [AS_HELP_STRING(--enable-blocking-random,Enable this switch only if /dev/urandom is totally broken on the target platform)],
@@ -223,7 +223,7 @@ AS_CASE([$host_os], [linux-gnu], [AX_ADD_FORTIFY_SOURCE], [ ])
 AX_CHECK_COMPILE_FLAG([-fvisibility=hidden],
   [CFLAGS="$CFLAGS -fvisibility=hidden"])
 
-AS_CASE([$host_os], [cygwin*|mingw*|msys|pw32*|cegcc*|eabi], [ ], [
+AS_CASE([$host_os], [cygwin*|mingw*|msys|pw32*|cegcc*|eabi*], [ ], [
   AX_CHECK_COMPILE_FLAG([-fPIC], [CFLAGS="$CFLAGS -fPIC"])
 ])
 
@@ -276,7 +276,7 @@ AS_CASE([$host_os],
   ])
 
 AS_CASE([$host_os],
-  [cygwin*|mingw*|msys|pw32*|cegcc*|eabi], [
+  [cygwin*|mingw*|msys|pw32*|cegcc*|eabi*], [
     AX_CHECK_COMPILE_FLAG([-fno-asynchronous-unwind-tables], [
       [CFLAGS="$CFLAGS -fno-asynchronous-unwind-tables"]
     ])
@@ -302,7 +302,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
 AS_IF([test "x$enable_ssp" != "xno"],[
 
 AS_CASE([$host_os],
-  [cygwin*|mingw*|msys|pw32*|cegcc*|haiku|none|eabi], [ ],
+  [cygwin*|mingw*|msys|pw32*|cegcc*|haiku|none|eabi*], [ ],
   [*], [
     AX_CHECK_COMPILE_FLAG([-fstack-protector], [
       AX_CHECK_LINK_FLAG([-fstack-protector],