diff --git a/ChangeLog b/ChangeLog
index c91249bf0..4b10a98dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-28  Pavel Roskin  <proski@gnu.org>
+
+	* acconfig.h: Remove some useless entries. Eliminate OLD_TOOLS
+	and SLANG_H_INSIDE_SLANG_DIR. Move some	descriptions ...
+	* configure.in: ... here.
+
 2001-05-27  Pavel Roskin  <proski@gnu.org>
 
 	* configure.in: Remove unused HAVE_PORTABLE_TOKEN_PASTING.
diff --git a/acconfig.h b/acconfig.h
index 086ef24de..1575dd618 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -23,12 +23,8 @@
 
 @TOP@
 
-#undef PACKAGE
-#undef VERSION
-
 /* Always defined */
 #undef D_INO_IN_DIRENT
-#undef IS_AIX
 #undef MOUNTED_FREAD
 #undef MOUNTED_FREAD_FSTYP
 #undef MOUNTED_GETFSSTAT
@@ -51,15 +47,6 @@
 /* Define nlink_t if your system does not provide it */
 #undef nlink_t
 
-/* Does the file command accepts the -L option */
-#undef FILE_L
-
-/* Does the file command work well with - option for stdin? */
-#undef FILE_STDIN
-
-/* Does the grep command work well with - option for stdin? */
-#undef GREP_STDIN
-
 /* Is the program using the GPM library? */
 #undef HAVE_LIBGPM
 
@@ -72,17 +59,9 @@
 /* Is the program using a system-installed slang library? */
 #undef HAVE_SYSTEM_SLANG
 
-/* Define if the slang.h header file is inside a directory slang
-** in the standard directories
-*/
-#undef SLANG_H_INSIDE_SLANG_DIR
-
 /* Does the program have subshell support? */
 #undef HAVE_SUBSHELL_SUPPORT
 
-/* If you don't have gcc, define this */
-#undef OLD_TOOLS 
-
 /* Found some version of curses that we're going to use */
 #undef HAS_CURSES
 
@@ -122,9 +101,6 @@
 /* If you have socket and the rest of the net functions use this */
 #undef USE_NETCODE
 
-/* If defined, use .netrc for FTP connections */
-#undef USE_NETRC 
-
 /* If your operating system does not have enough space for a file name
  * in a struct dirent, then define this
  */
@@ -157,18 +133,12 @@
 /* Define if you have isascii */
 #undef HAVE_ISASCII
 
-/* Define if you want to use the HSC firewall */
-#undef HSC_PROXY
-
 /* Define if your system uses PAM for auth stuff */
 #undef HAVE_PAM
 
 /* Define if you have the pmap_getmaps function */
 #undef HAVE_PMAP_GETMAPS
 
-/* Define if you have the <sys/select.h> header file.  */
-#undef HAVE_SYS_SELECT_H
-
 /* Define if you have the get_process_stats function and have to use that instead of gettimeofday  */
 #undef HAVE_GET_PROCESS_STATS
 
diff --git a/configure.in b/configure.in
index 767b5a990..de66a3a96 100644
--- a/configure.in
+++ b/configure.in
@@ -163,7 +163,7 @@ AC_EGREP_CPP(yes,
 yes
 #endif
 ], [
-AC_DEFINE(IS_AIX)
+AC_DEFINE(IS_AIX, 1, [Define if compiling for AIX])
 AC_MSG_RESULT(yes)
 ], [AC_MSG_RESULT(no)])
 
@@ -380,7 +380,8 @@ AC_ARG_WITH(ncurses,
 AC_ARG_WITH(hsc,
         [--with-hsc               Compile with support for the HSC firewall],
         [if test x$withval = xyes; then
-                AC_DEFINE(HSC_PROXY)
+                AC_DEFINE(HSC_PROXY, 1,
+			  [Define if you want to use the HSC firewall])
         fi
 ])
 
@@ -499,7 +500,8 @@ EOF
     ]])
 
     if test x$ac_cv_filestdin = xyes; then
-	AC_DEFINE(FILE_STDIN)
+	AC_DEFINE(FILE_STDIN, 1,
+		  [Define if the file command accepts - for stdin])
     fi
     filestdin=$ac_cv_filestdin
     AC_MSG_RESULT([$filestdin])
@@ -519,7 +521,7 @@ else
 fi
 ])
 if test x$ac_cv_filel = xyes; then
-    AC_DEFINE(FILE_L)
+    AC_DEFINE(FILE_L, 1, [Define if the file command accepts the -L option])
 fi
 filel=$ac_cv_filel
 AC_MSG_RESULT([$filel])
@@ -538,7 +540,7 @@ AC_CACHE_VAL(ac_cv_grep_stdin, [
     fi
 ])
 if test x$ac_cv_grep_stdin = xyes; then
-    AC_DEFINE(GREP_STDIN)
+    AC_DEFINE(GREP_STDIN, 1, [Define if the grep command accepts - for stdin])
 fi
 AC_MSG_RESULT([$ac_cv_grep_stdin])
 
@@ -575,14 +577,6 @@ AC_ARG_WITH(subshell,
 AC_MSG_RESULT([$result])
 subshell="$result"
 
-dnl
-dnl Check for GCC
-dnl
-if test x$GCC = x
-then
-	AC_DEFINE(OLD_TOOLS)
-fi
-
 dnl
 dnl Memory Allocation Debugger
 dnl
@@ -645,7 +639,6 @@ AC_CHECK_LIB(slang,SLang_init_tty,
 	     then
 		 slang_use_system_installed_lib=true
 		 slang_check_lib=false
-	         AC_DEFINE(SLANG_H_INSIDE_SLANG_DIR)
 	     fi
 	fi
 ])
@@ -710,7 +703,8 @@ AC_SUBST(LEDIT)
 AC_ARG_WITH(netrc,
 	[--with-netrc               Compile with ftp .netrc support],[
 	if test x$withval = xyes; then
-		AC_DEFINE(USE_NETRC)
+		AC_DEFINE(USE_NETRC, 1,
+			  [Define to use .netrc for FTP connections])
 		AC_MSG_RESULT([ftpfs will have .netrc parsing code])
 	fi
 ])