--- configure.in.orig	Sat Apr 27 16:51:53 2002
+++ configure.in	Sat Apr 27 17:37:43 2002
@@ -39,23 +39,27 @@
   AC_CHECK_LIB(ncurses, initscr, initscr=on, initscr=off)
   if test $initscr = on; then
     CURSLIB="ncurses"
-    LIBS="-l$CURSLIB $LIBS"
-    AC_DEFINE(HAVE_LIBNCURSES)
-    AC_DEFINE(HAVE_CURSES)
+    AC_DEFINE(HAVE_LIBNCURSES, 1,
+      [Define this if you have the ncurses library and want to use it.])
   else
     AC_CHECK_LIB(curses, initscr, initscr=on, initscr=off)
     if test $initscr = on; then
       CURSLIB="curses"
-      LIBS="-l$CURSLIB $LIBS"
-      AC_DEFINE(HAVE_LIBCURSES)
-      AC_DEFINE(HAVE_CURSES)
+      AC_DEFINE(HAVE_LIBCURSES, 1,
+        [Define this if you have the curses library and want to use it.]))
     fi
   fi
   if test x$CURSLIB != x; then
+    LIBS="-l$CURSLIB $LIBS"
+    AC_DEFINE(HAVE_CURSES, 1,
+      [Define this if you have (n)curses and want to use it.])
     AC_CHECK_LIB($CURSLIB, getmouse,
-      [AC_DEFINE(HAVE_GETMOUSE)])
+      [AC_DEFINE(HAVE_GETMOUSE, 1,
+	[Define this if your ncurses library has the getmouse routine.])])
     AC_CHECK_LIB($CURSLIB, use_default_colors,
-      [AC_DEFINE(HAVE_USEDEFAULT)])
+      [AC_DEFINE(HAVE_USEDEFAULT, 1,
+	[Define this if your ncurses library contains the use_default_colors
+	routine and your terminal can use transparent colors.])])
     AC_CACHE_CHECK([for private member _use_keypad in WINDOW],
       aumix_cv_struct_window_usekeypad,
       [AC_TRY_COMPILE([#ifdef HAVE_NCURSES_H
@@ -65,7 +69,9 @@
 #endif], [WINDOW w; w._use_keypad;],
       aumix_cv_struct_window_usekeypad=yes, aumix_cv_struct_window_usekeypad=no)])
     if test $aumix_cv_struct_window_usekeypad = yes; then
-      AC_DEFINE(HAVE_USEKEYPAD)
+      AC_DEFINE(HAVE_USEKEYPAD, 1,
+	[Define this if your ncurses library has the member _use_keypad
+	in structure WINDOW.])
     fi
   fi
   AC_ARG_WITH(gpm,
@@ -92,7 +98,9 @@
 A mouse is a mouse is a mouse
 #endif], aumix_cv_cons_mousectl=yes, aumix_cv_cons_mousectl=no)])
     if test $aumix_cv_cons_mousectl = yes; then
-      AC_DEFINE(HAVE_SYSMOUSE)
+      AC_DEFINE(HAVE_SYSMOUSE, 1,
+	[Define this if you have sysmouse console mouse support and
+	want to use it.])
     fi
   )
 ])
@@ -107,7 +115,8 @@
   own_labels=$enableval, own_labels=no)
 AC_MSG_RESULT($own_labels)
 if test $own_labels = yes; then
-  AC_DEFINE(USE_OWN_LABELS)
+  AC_DEFINE(USE_OWN_LABELS, 1,
+    [Define this to use built-in label text.])
 fi
 
 AC_ARG_WITH(alsa,
@@ -118,7 +127,8 @@
   AC_CHECK_HEADER(sys/asoundlib.h, alsa_head=on, alsa_head=off)
   AC_CHECK_LIB(asound, snd_mixer_open, alsa_lib=on, alsa_lib=off)
   if test $alsa_head = on && test $alsa_lib = on; then
-    AC_DEFINE(HAVE_ALSA_DISABLED)
+    AC_DEFINE(HAVE_ALSA_DISABLED, 1,
+      [ALSA-specific features are disabled for now.])
 dnl LIBS="$LIBS -lasound"
   fi
 else
@@ -135,7 +145,8 @@
     echo "gtk-config not found--compiling without GTK+." ; 
   else
     echo "gtk-config found--compiling with GTK+." ; 
-    AC_DEFINE(HAVE_GTK)
+    AC_DEFINE(HAVE_GTK, 1,
+      [Define this if you want to compile with GTK+ support.])
     dnl from GIMP 1.1.6
     dnl Check for GTK+
     AM_PATH_GTK(1.2.0,,AC_MSG_ERROR(Test for GTK failed. See the file 'INSTALL' for help.))
@@ -164,7 +175,8 @@
   dummy_mixer=$enableval, dummy_mixer=no)
 AC_MSG_RESULT($dummy_mixer)
 if test $dummy_mixer = yes; then
-  AC_DEFINE(DUMMY_MIXER)
+  AC_DEFINE(DUMMY_MIXER, 1,
+    [Define if you want built-in emulation of a sound driver, for debugging.])
 fi
 
 dnl internationalization macros
@@ -190,14 +202,11 @@
 dnl ud_GNU_GETTEXT
 AM_GNU_GETTEXT
 AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
-dnl AC_DEFINE_UNQUOTED(USE_INCLUDED_LIBINTL,no)
 
 USE_INCLUDED_LIBINTL=no
-AC_DEFINE(USE_INCLUDED_LIBINTL,no)
 AC_SUBST(USE_INCLUDED_LIBINTL)
 
 USE_NLS=yes
-AC_DEFINE(USE_NLS,yes)
 AC_SUBST(USE_NLS)
 
 dnl AC_OUTPUT(Makefile)
--- acconfig.h.orig	Sat Apr 27 13:43:41 2002
+++ acconfig.h	Sat Apr 27 17:41:01 2002
@@ -48,49 +48,4 @@
 /* Define if you can safely include both <sys/time.h> and <time.h>.  */
 #undef TIME_WITH_SYS_TIME
 
-/* Don't change these:  ALSA-specific features are disabled for now. */
-#undef HAVE_ALSA
-#define HAVE_ALSA_DISABLED
-
-/* Define if you want built-in emulation of a sound driver, for debugging. */
-#undef DUMMY_MIXER
-
-/* Define this if your ncurses library has the getmouse routine.  This is
-recommended. */ 
-#undef HAVE_GETMOUSE
-
-/* Define this if you have the ncurses library and want to use it. */
-#undef HAVE_LIBNCURSES
-
-/* Define this if you have the curses library and want to use it. */
-#undef HAVE_LIBCURSES
-
-/* Define this if you have (n)curses and want to use it. */
-#undef HAVE_CURSES
-
-#undef HAVE_SYSMOUSE
-
-/*
-Define this if your ncurses library contains the use_default_colors
-routine and your terminal can use transparent colors.  This is
-recommended.
-*/
-#undef HAVE_USEDEFAULT
-
-#undef HAVE_USEKEYPAD
-
 #undef HAVE_NLS
-#undef USE_INCLUDED_LIBINTL
-#undef USE_NLS
-
-/*
-Define this if you want to compile with GTK+ support.
-*/
-#undef HAVE_GTK
-
-/* 
-Define this to use built-in label text.  The built-in labels may
-not match up to the actual sound driver, so turning this off is
-the most conservative thing.
-*/
-#undef USE_OWN_LABELS