diff --git a/ChangeLog b/ChangeLog
index e58b8da25..3e8feac47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2002-09-29  Pavel Roskin  <proski@gnu.org>
 
+	* configure.in: Remove the argument from --with-gpm-mouse.  The
+	directories for include files and libraries can be specified
+	using LDFLAGS and CPPFLAGS, as documented in the output of
+	"configure --help".
+
 	* configure.in: Complete rewrite of the screen library support.
 	Add new option --with-screen instead on --with-slang,
 	--with-included-slang and --with-ncurses.  Only allow
diff --git a/configure.in b/configure.in
index 75367b97e..99072a05d 100644
--- a/configure.in
+++ b/configure.in
@@ -258,31 +258,25 @@ if test x$use_vfs = xyes; then
 	vfs_type="Midnight Commander Virtual File System"
 fi
 
+dnl
+dnl Check for gpm mouse support (Linux only)
+dnl
 mouse_lib="xterm only"
+AC_ARG_WITH(gpm-mouse, 
+	[  --with-gpm-mouse         Compile with gpm mouse support (Linux only)
+                           [[yes if found]]])
+
 case $host_os in
 linux*)
-    AC_ARG_WITH(gpm-mouse, 
-	[  --with-gpm-mouse[[=base-dir]]  Compile with gpm mouse support (Linux only)
-                               [[yes if found]]],
-	[if test x$withval != xno
-	then
-		if test x$withval != xyes
-		then
-			LDFLAGS="$LDFLAGS -L$withval/lib"
-			CPPFLAGS="$CPPFLAGS -I$withval/include"
-		fi
-		AC_DEFINE(HAVE_LIBGPM, 1,
-			  [Define to enable gpm mouse support on Linux])
-		mouse_lib="GPM and xterm"
-		MCLIBS="-lgpm $MCLIBS"
-	fi],
-	[AC_CHECK_LIB(gpm, Gpm_Repeat,
-		[AC_DEFINE(HAVE_LIBGPM)
-		mouse_lib="GPM and xterm"
-		MCLIBS="-lgpm $MCLIBS"],
-		[AC_MSG_WARN([libgpm is missing or older than 0.18])],
-		[$LIBS])
+    if test x$with_gpm_mouse != xno; then
+	AC_CHECK_LIB(gpm, Gpm_Repeat,
+	    [AC_DEFINE(HAVE_LIBGPM, 1,
+		       [Define to enable gpm mouse support on Linux])
+	    mouse_lib="gpm and xterm"
+	    MCLIBS="$MCLIBS -lgpm"],
+	    [AC_MSG_WARN([libgpm is missing or older than 0.18])
 	])
+    fi
     ;;
 esac