diff --git a/ChangeLog b/ChangeLog
index be2355455..3b5ca1050 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-25  Pavel Roskin  <proski@gnu.org>
+
+	* configure.in: Remove check for socketpair().  Add new option
+	--enable-background.
+	* extraconf.h: Don't define WITH_BACKGROUND.
+
 2003-10-14  Pavel Roskin  <proski@gnu.org>
 
 	* configure.in: Don't check for seekdir() and telldir().
diff --git a/configure.in b/configure.in
index f591b222a..d4f2f0d45 100644
--- a/configure.in
+++ b/configure.in
@@ -323,8 +323,6 @@ if test $have_gethostbyname = no; then
   done
 fi
 
-AC_CHECK_FUNCS(socketpair)
-
 dnl
 dnl Sequent wants getprocessstats
 dnl
@@ -580,6 +578,14 @@ linux*)
 esac
 
 
+dnl Support for background operations
+AC_ARG_ENABLE([background],
+	      [  --enable-background      Support for background file operations [[yes]]])
+if test "x$enable_background" != xno; then
+    AC_DEFINE(WITH_BACKGROUND, 1 [Define to enable background file operations])
+fi
+
+
 dnl
 dnl User visible support for charset conversion.
 dnl
diff --git a/extraconf.h b/extraconf.h
index 5ec9082d6..279b895b3 100644
--- a/extraconf.h
+++ b/extraconf.h
@@ -30,10 +30,6 @@ the need to embed this logic into configure.in.
 #    undef USE_EXT2FSLIB
 #endif
 
-#ifdef HAVE_SOCKETPAIR
-#    define WITH_BACKGROUND
-#endif
-
 #if defined (__QNX__) && !defined(__QNXNTO__) && !defined (HAVE_INFOMOUNT_LIST)
 #    define HAVE_INFOMOUNT_QNX
 #endif