diff --git a/Makefile.in b/Makefile.in
index 9def82b53..4ce362d34 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -34,7 +34,8 @@ static:
 configure: configure.in aclocal.m4
 	chmod 755 configure
 
-GNOME_M4_FILES = macros/gnome.m4 macros/gnome-vfs.m4 macros/gnome-undelfs.m4
+GNOME_M4_FILES = macros/gnome.m4 macros/gnome-vfs.m4 macros/gnome-undelfs.m4 \
+	macros/linger.m4
 aclocal.m4: mc-aclocal.m4 $(GNOME_M4_FILES) gettext.m4
 	cd $(srcdir); cat $(GNOME_M4_FILES) mc-aclocal.m4 gettext.m4 > aclocal.m4
 
diff --git a/autogen.sh b/autogen.sh
index c7914c221..f2cd96e2f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,7 +3,7 @@ test -z "$srcdir" && srcdir=.
 
 (
 cd $srcdir
-cat macros/gnome.m4 macros/gnome-vfs.m4 macros/gnome-undelfs.m4 mc-aclocal.m4 gettext.m4 > aclocal.m4
+cat macros/gnome.m4 macros/gnome-vfs.m4 macros/gnome-undelfs.m4 macros/linger.m4 mc-aclocal.m4 gettext.m4 > aclocal.m4
 autoheader
 autoconf
 )
diff --git a/mc-aclocal.m4 b/mc-aclocal.m4
index 2a4fdc78e..1ecd0ce4c 100644
--- a/mc-aclocal.m4
+++ b/mc-aclocal.m4
@@ -533,35 +533,6 @@ dnl
 dnl XView library checking end
 dnl
 
-dnl
-dnl Check for struct linger
-dnl
-AC_DEFUN(AC_STRUCT_LINGER, [
-av_struct_linger=no
-AC_MSG_CHECKING(struct linger is available)
-AC_TRY_RUN([
-#include <sys/types.h>
-#include <sys/socket.h>
-
-struct linger li;
-
-main ()
-{
-    li.l_onoff = 1;
-    li.l_linger = 120;
-    exit (0);
-}
-],[
-AC_DEFINE(HAVE_STRUCT_LINGER)
-av_struct_linger=yes
-],[
-av_struct_linger=no
-],[
-av_struct_linger=no
-])
-AC_MSG_RESULT($av_struct_linger)
-])
-
 dnl
 dnl Check for size of d_name dirent member
 dnl
diff --git a/src/ChangeLog b/src/ChangeLog
index 90a016df6..92888ecfd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jul 24 00:44:37 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* mc-local.m4 (AC_STRUCT_LINGER): Moved into macros/linger.m4.
+	* autogen.sh: Include linger.m4 in aclocal.m4.
+	* Makefile.in (GNOME_M4_FILES): Include linger.m4.
+
 Thu Jul 23 22:44:16 1998  Tom Tromey  <tromey@cygnus.com>
 
 	* Makefile.in (aclocal.m4): Depend on all source files.  Include