diff --git a/build-aux/config.libpath b/build-aux/config.libpath
index c073caa..6c1a61a 100755
--- a/build-aux/config.libpath
+++ b/build-aux/config.libpath
@@ -101,7 +101,7 @@ case $host_os in
     ;;
   linux*oldld* | linux*aout* | linux*coff*)
     ;;
-  linux* | k*bsd*-gnu)
+  linux* | *-gnu)
     shlibpath_var=LD_LIBRARY_PATH
     ;;
   netbsd*)
diff --git a/build-aux/config.rpath b/build-aux/config.rpath
index 85c2f20..90ccf00 100755
--- a/build-aux/config.rpath
+++ b/build-aux/config.rpath
@@ -74,7 +74,7 @@ else
       ;;
     newsos6)
       ;;
-    linux* | k*bsd*-gnu)
+    linux* | *-gnu)
       case $cc_basename in
         ecc*)
           wl='-Wl,'
@@ -202,7 +202,7 @@ if test "$with_gnu_ld" = yes; then
       hardcode_direct=no
       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
       ;;
-    gnu* | linux* | k*bsd*-gnu)
+    gnu* | linux* | *-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
         :
       else
@@ -582,10 +582,7 @@ case "$host_os" in
     ;;
   linux*oldld* | linux*aout* | linux*coff*)
     ;;
-  linux* | k*bsd*-gnu)
-    library_names_spec='$libname$shrext'
-    ;;
-  knetbsd*-gnu)
+  linux* | *-gnu)
     library_names_spec='$libname$shrext'
     ;;
   netbsd*)
diff --git a/m4/ldd.m4 b/m4/ldd.m4
index 56d9066..50f1bec 100644
--- a/m4/ldd.m4
+++ b/m4/ldd.m4
@@ -165,7 +165,7 @@ changequote(,)dnl
           dnl
           LDDPOSTPROC="2>/dev/null | sed -n -e 's,^[[][0-9]*[]].*	0x[^	]*	[^	][^	]*	\\([^	][^	]*\\).*\$,\\1,p' | sed -e 's,^.*/,,'"
           ;;
-        linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu) # glibc-based systems
+        linux* | gnu* | *-gnu) # glibc-based systems
           LDDPROG="ldd"
           dnl The output of "ldd program" looks like this:
           dnl         libc.so.6 => /lib/libc.so.6 (0x4002d000)
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
index 7e07a42..a5e8712 100644
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -468,7 +468,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
                 if test "X$additional_includedir" = "X/usr/local/include"; then
                   if test -n "$GCC"; then
                     case $host_os in
-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                      linux* | gnu* | *-gnu) haveit=yes;;
                     esac
                   fi
                 fi
@@ -519,7 +519,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
                          || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
                         if test -n "$GCC"; then
                           case $host_os in
-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                            linux* | gnu* | *-gnu) haveit=yes;;
                           esac
                         fi
                       fi
diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
index 3bdc0fc..80ba72a 100644
--- a/m4/lib-prefix.m4
+++ b/m4/lib-prefix.m4
@@ -70,7 +70,7 @@ AC_DEFUN([AC_LIB_PREFIX],
         if test "X$additional_includedir" = "X/usr/local/include"; then
           if test -n "$GCC"; then
             case $host_os in
-              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+              linux* | gnu* | *-gnu) haveit=yes;;
             esac
           fi
         fi