* configure.ac: Add arguments to AC_DEFINE calls.

	* acconfig.h: Remove file.
	* acinclude.m4 (AC_GNU_SOURCE): Remove definition.
	* configure: Regenerate.
	* config.in: Regenerate.

6 files changed, 190 insertions, 346 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d4390ac0720..39f39e247e8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-03  Steve Ellcey  <sje@cup.hp.com>
+
+	* configure.ac: Add arguments to AC_DEFINE calls.
+	* acconfig.h: Remove file.
+	* acinclude.m4 (AC_GNU_SOURCE): Remove definition.
+	* configure: Regenerate.
+	* config.in: Regenerate.
+
 2005-07-01  Mark Kettenis  <kettenis@gnu.org>
 
 	* mips-tdep.c (mips_insn16_frame_prev_register)
diff --git a/gdb/acconfig.h b/gdb/acconfig.h
deleted file mode 100644
index e625697e1c1..00000000000
--- a/gdb/acconfig.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-
-/* Define if pstatus_t type is available */
-#undef HAVE_PSTATUS_T
-
-/* Define if prrun_t type is available */
-#undef HAVE_PRRUN_T
-
-/* Define if fpregset_t type is available. */
-#undef HAVE_FPREGSET_T
-
-/* Define if gregset_t type is available. */
-#undef HAVE_GREGSET_T
-
-/* Define if <sys/procfs.h> has prgregset_t. */
-#undef HAVE_PRGREGSET_T
-
-/* Define if <sys/procfs.h> has prfpregset_t. */
-#undef HAVE_PRFPREGSET_T
-
-/* Define if <sys/procfs.h> has lwpid_t. */
-#undef HAVE_LWPID_T
-
-/* Define if <sys/procfs.h> has psaddr_t. */
-#undef HAVE_PSADDR_T
-
-/* Define if <sys/procfs.h> has prgregset32_t. */
-#undef HAVE_PRGREGSET32_T
-
-/* Define if <sys/procfs.h> has prfpregset32_t. */
-#undef HAVE_PRFPREGSET32_T
-
-/* Define if <sys/procfs.h> has prsysent_t */
-#undef HAVE_PRSYSENT_T
-
-/* Define if <sys/procfs.h> has pr_sigset_t */
-#undef HAVE_PR_SIGSET_T
-
-/* Define if <sys/procfs.h> has pr_sigaction64_t */
-#undef HAVE_PR_SIGACTION64_T
-
-/* Define if <sys/procfs.h> has pr_siginfo64_t */
-#undef HAVE_PR_SIGINFO64_T
-
-/* Define if <link.h> exists and defines struct link_map which has
-   members with an ``l_'' prefix.  (For Solaris, SVR4, and
-   SVR4-like systems.) */
-#undef HAVE_STRUCT_LINK_MAP_WITH_L_MEMBERS
-
-/* Define if <link.h> exists and defines struct link_map which has
-  members with an ``lm_'' prefix.  (For SunOS.)  */
-#undef HAVE_STRUCT_LINK_MAP_WITH_LM_MEMBERS
-
-/* Define if <link.h> exists and defines a struct so_map which has
-  members with an ``som_'' prefix.  (Found on older *BSD systems.)  */
-#undef HAVE_STRUCT_SO_MAP_WITH_SOM_MEMBERS
-
-/* Define if <sys/link.h> has struct link_map32 */
-#undef HAVE_STRUCT_LINK_MAP32
-
-/* Define if <sys/link.h> has link_map32 (solaris sparc-64 target) */
-#undef _SYSCALL32
-
-/* Define if the prfpregset_t type is broken. */
-#undef PRFPREGSET_T_BROKEN
-
-/* Define if you want to use new multi-fd /proc interface
-   (replaces HAVE_MULTIPLE_PROC_FDS as well as other macros). */
-#undef NEW_PROC_API
-
-/* Define if ioctl argument PIOCSET is available. */
-#undef HAVE_PROCFS_PIOCSET
-
-/* Define if using Solaris thread debugging.  */
-#undef HAVE_THREAD_DB_LIB
-
-/* Define if you support the tkill syscall.  */
-#undef HAVE_TKILL_SYSCALL
-
-/* Define on a GNU/Linux system to work around problems in sys/procfs.h.  */
-#undef START_INFERIOR_TRAPS_EXPECTED
-#undef sys_quotactl
-
-/* Define if you have HPUX threads */
-#undef HAVE_HPUX_THREAD_SUPPORT
-
-/* Define to 1 if NLS is requested.  */
-#undef ENABLE_NLS
-
-/* Define as 1 if you have catgets and don't want to use GNU gettext.  */
-#undef HAVE_CATGETS
-
-/* Define as 1 if you have gettext and don't want to use GNU gettext.  */
-#undef HAVE_GETTEXT
-
-/* Define as 1 if you have the stpcpy function.  */
-#undef HAVE_STPCPY
-
-/* Define if your locale.h file contains LC_MESSAGES.  */
-#undef HAVE_LC_MESSAGES
-
-/* Define if you want to use the full-screen terminal user interface.  */
-#undef TUI
-
-/* Define if <proc_service.h> on solaris uses int instead of
-   size_t, and assorted other type changes. */
-#undef PROC_SERVICE_IS_OLD
-
-/* Define if the simulator is being linked in.  */
-#undef WITH_SIM
-
-/* Define if <sys/ptrace.h> defines the PTRACE_GETREGS request.  */
-#undef HAVE_PTRACE_GETREGS
-
-/* Define if <sys/ptrace.h> defines the PTRACE_GETFPXREGS request.  */
-#undef HAVE_PTRACE_GETFPXREGS
-
-/* Define if <sys/ptrace.h> defines the PT_GETDBREGS request.  */
-#undef HAVE_PT_GETDBREGS
-
-/* Define if <sys/ptrace.h> defines the PT_GETXMMREGS request.  */
-#undef HAVE_PT_GETXMMREGS
-
-/* Define if libunwind library is being used.  */
-#undef HAVE_LIBUNWIND
-
-/* hostfile */
-#undef GDB_XM_FILE
-
-/* targetfile */
-#undef GDB_TM_FILE
-
-/* nativefile */
-#undef GDB_NM_FILE
-
-/* Define to 1 so <sys/proc.h> gets a definition of anon_hdl.  Works
-   around a <sys/proc.h> problem on IRIX 5.  */
-#ifndef _KMEMUSER
-#undef _KMEMUSER
-#endif
diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4
index bb7fbaf6204..bf8e4c8cdfd 100644
--- a/gdb/acinclude.m4
+++ b/gdb/acinclude.m4
@@ -920,15 +920,6 @@ size_t iconv();
   AC_SUBST(LIBICONV)
 ])
 
-# AC_GNU_SOURCE
-# -------------
-# FIXME: Remove thise once we start using Autoconf 2.5x (x>=4).
-AC_DEFUN([AC_GNU_SOURCE],
-[AC_BEFORE([$0], [AC_TRY_COMPILE])dnl
-AC_BEFORE([$0], [AC_TRY_RUN])dnl
-AC_DEFINE([_GNU_SOURCE])
-])
-
 dnl written by Guido Draheim <guidod@gmx.de>, original by Alexandre Oliva 
 dnl Version 1.3 (2001/03/02)
 dnl source http://www.gnu.org/software/ac-archive/Miscellaneous/ac_define_dir.html
diff --git a/gdb/config.in b/gdb/config.in
index eb48a1a4f09..12001e9c06d 100644
--- a/gdb/config.in
+++ b/gdb/config.in
@@ -1,147 +1,4 @@
 /* config.in.  Generated from configure.ac by autoheader.  */
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-
-/* Define if pstatus_t type is available */
-#undef HAVE_PSTATUS_T
-
-/* Define if prrun_t type is available */
-#undef HAVE_PRRUN_T
-
-/* Define if fpregset_t type is available. */
-#undef HAVE_FPREGSET_T
-
-/* Define if gregset_t type is available. */
-#undef HAVE_GREGSET_T
-
-/* Define if <sys/procfs.h> has prgregset_t. */
-#undef HAVE_PRGREGSET_T
-
-/* Define if <sys/procfs.h> has prfpregset_t. */
-#undef HAVE_PRFPREGSET_T
-
-/* Define if <sys/procfs.h> has lwpid_t. */
-#undef HAVE_LWPID_T
-
-/* Define if <sys/procfs.h> has psaddr_t. */
-#undef HAVE_PSADDR_T
-
-/* Define if <sys/procfs.h> has prgregset32_t. */
-#undef HAVE_PRGREGSET32_T
-
-/* Define if <sys/procfs.h> has prfpregset32_t. */
-#undef HAVE_PRFPREGSET32_T
-
-/* Define if <sys/procfs.h> has prsysent_t */
-#undef HAVE_PRSYSENT_T
-
-/* Define if <sys/procfs.h> has pr_sigset_t */
-#undef HAVE_PR_SIGSET_T
-
-/* Define if <sys/procfs.h> has pr_sigaction64_t */
-#undef HAVE_PR_SIGACTION64_T
-
-/* Define if <sys/procfs.h> has pr_siginfo64_t */
-#undef HAVE_PR_SIGINFO64_T
-
-/* Define if <link.h> exists and defines struct link_map which has
-   members with an ``l_'' prefix.  (For Solaris, SVR4, and
-   SVR4-like systems.) */
-#undef HAVE_STRUCT_LINK_MAP_WITH_L_MEMBERS
-
-/* Define if <link.h> exists and defines struct link_map which has
-  members with an ``lm_'' prefix.  (For SunOS.)  */
-#undef HAVE_STRUCT_LINK_MAP_WITH_LM_MEMBERS
-
-/* Define if <link.h> exists and defines a struct so_map which has
-  members with an ``som_'' prefix.  (Found on older *BSD systems.)  */
-#undef HAVE_STRUCT_SO_MAP_WITH_SOM_MEMBERS
-
-/* Define if <sys/link.h> has struct link_map32 */
-#undef HAVE_STRUCT_LINK_MAP32
-
-/* Define if <sys/link.h> has link_map32 (solaris sparc-64 target) */
-#undef _SYSCALL32
-
-/* Define if the prfpregset_t type is broken. */
-#undef PRFPREGSET_T_BROKEN
-
-/* Define if you want to use new multi-fd /proc interface
-   (replaces HAVE_MULTIPLE_PROC_FDS as well as other macros). */
-#undef NEW_PROC_API
-
-/* Define if ioctl argument PIOCSET is available. */
-#undef HAVE_PROCFS_PIOCSET
-
-/* Define if using Solaris thread debugging.  */
-#undef HAVE_THREAD_DB_LIB
-
-/* Define if you support the tkill syscall.  */
-#undef HAVE_TKILL_SYSCALL
-
-/* Define on a GNU/Linux system to work around problems in sys/procfs.h.  */
-#undef START_INFERIOR_TRAPS_EXPECTED
-#undef sys_quotactl
-
-/* Define if you have HPUX threads */
-#undef HAVE_HPUX_THREAD_SUPPORT
-
-/* Define to 1 if NLS is requested.  */
-#undef ENABLE_NLS
-
-/* Define as 1 if you have catgets and don't want to use GNU gettext.  */
-#undef HAVE_CATGETS
-
-/* Define as 1 if you have gettext and don't want to use GNU gettext.  */
-#undef HAVE_GETTEXT
-
-/* Define as 1 if you have the stpcpy function.  */
-#undef HAVE_STPCPY
-
-/* Define if your locale.h file contains LC_MESSAGES.  */
-#undef HAVE_LC_MESSAGES
-
-/* Define if you want to use the full-screen terminal user interface.  */
-#undef TUI
-
-/* Define if <proc_service.h> on solaris uses int instead of
-   size_t, and assorted other type changes. */
-#undef PROC_SERVICE_IS_OLD
-
-/* Define if the simulator is being linked in.  */
-#undef WITH_SIM
-
-/* Define if <sys/ptrace.h> defines the PTRACE_GETREGS request.  */
-#undef HAVE_PTRACE_GETREGS
-
-/* Define if <sys/ptrace.h> defines the PTRACE_GETFPXREGS request.  */
-#undef HAVE_PTRACE_GETFPXREGS
-
-/* Define if <sys/ptrace.h> defines the PT_GETDBREGS request.  */
-#undef HAVE_PT_GETDBREGS
-
-/* Define if <sys/ptrace.h> defines the PT_GETXMMREGS request.  */
-#undef HAVE_PT_GETXMMREGS
-
-/* Define if libunwind library is being used.  */
-#undef HAVE_LIBUNWIND
-
-/* hostfile */
-#undef GDB_XM_FILE
-
-/* targetfile */
-#undef GDB_TM_FILE
-
-/* nativefile */
-#undef GDB_NM_FILE
-
-/* Define to 1 so <sys/proc.h> gets a definition of anon_hdl.  Works
-   around a <sys/proc.h> problem on IRIX 5.  */
-#ifndef _KMEMUSER
-#undef _KMEMUSER
-#endif
 
 /* Define to 1 if the compiler supports long long. */
 #undef CC_HAS_LONG_LONG
@@ -178,9 +35,18 @@
 /* Host long double floatformat */
 #undef GDB_HOST_LONG_DOUBLE_FORMAT
 
+/* nativefile */
+#undef GDB_NM_FILE
+
 /* Define to the default OS ABI for this configuration. */
 #undef GDB_OSABI_DEFAULT
 
+/* targetfile */
+#undef GDB_TM_FILE
+
+/* hostfile */
+#undef GDB_XM_FILE
+
 /* Define to 1 if you have `alloca', as a function or macro. */
 #undef HAVE_ALLOCA
 
@@ -273,6 +139,9 @@
 /* Define if <sys/procfs.h> has gregset_t. */
 #undef HAVE_GREGSET_T
 
+/* Define if you have HPUX threads */
+#undef HAVE_HPUX_THREAD_SUPPORT
+
 /* Define if you have the iconv() function. */
 #undef HAVE_ICONV
 
@@ -288,6 +157,9 @@
 /* Define to 1 if you have the `m' library (-lm). */
 #undef HAVE_LIBM
 
+/* Define if libunwind library is being used. */
+#undef HAVE_LIBUNWIND
+
 /* Define to 1 if you have the <libunwind.h> header file. */
 #undef HAVE_LIBUNWIND_H
 
@@ -369,6 +241,9 @@
 /* Define if <sys/procfs.h> has prgregset_t. */
 #undef HAVE_PRGREGSET_T
 
+/* Define if ioctl argument PIOCSET is available. */
+#undef HAVE_PROCFS_PIOCSET
+
 /* Define to 1 if you have the <proc_service.h> header file. */
 #undef HAVE_PROC_SERVICE_H
 
@@ -393,9 +268,21 @@
 /* Define if <sys/procfs.h> has pstatus_t. */
 #undef HAVE_PSTATUS_T
 
+/* Define if sys/ptrace.h defines the PTRACE_GETFPXREGS request. */
+#undef HAVE_PTRACE_GETFPXREGS
+
+/* Define if sys/ptrace.h defines the PTRACE_GETREGS request. */
+#undef HAVE_PTRACE_GETREGS
+
 /* Define to 1 if you have the <ptrace.h> header file. */
 #undef HAVE_PTRACE_H
 
+/* Define if sys/ptrace.h defines the PT_GETDBREGS request. */
+#undef HAVE_PT_GETDBREGS
+
+/* Define if sys/ptrace.h defines the PT_GETXMMREGS request. */
+#undef HAVE_PT_GETXMMREGS
+
 /* Define to 1 if you have the `putenv' function. */
 #undef HAVE_PUTENV
 
@@ -462,6 +349,17 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
+/* Define if <sys/link.h> has struct link_map32 */
+#undef HAVE_STRUCT_LINK_MAP32
+
+/* Define if <link.h> exists and defines struct link_map which has members
+   with an ``lm_'' prefix. (For SunOS.) */
+#undef HAVE_STRUCT_LINK_MAP_WITH_LM_MEMBERS
+
+/* Define if <link.h> exists and defines struct link_map which has members
+   with an ``l_'' prefix. (For Solaris, SVR4, and SVR4-like systems.) */
+#undef HAVE_STRUCT_LINK_MAP_WITH_L_MEMBERS
+
 /* Define to 1 if your system has struct lwp. */
 #undef HAVE_STRUCT_LWP
 
@@ -474,6 +372,10 @@
 /* Define to 1 if `r_gs' is member of `struct reg'. */
 #undef HAVE_STRUCT_REG_R_GS
 
+/* Define if <link.h> exists and defines a struct so_map which has members
+   with an ``som_'' prefix. (Found on older *BSD systems.) */
+#undef HAVE_STRUCT_SO_MAP_WITH_SOM_MEMBERS
+
 /* Define to 1 if `st_blksize' is member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 
@@ -557,10 +459,13 @@
 /* Define to 1 if you have the <thread_db.h> header file. */
 #undef HAVE_THREAD_DB_H
 
+/* Define if using Solaris thread debugging. */
+#undef HAVE_THREAD_DB_LIB
+
 /* Define to 1 if you have the <time.h> header file. */
 #undef HAVE_TIME_H
 
-/* Define if we can use the tkill syscall. */
+/* Define if you support the tkill syscall. */
 #undef HAVE_TKILL_SYSCALL
 
 /* Define to 1 if you have the `ttrace' function. */
@@ -611,6 +516,10 @@
 /* Define as const if the declaration of iconv() needs const. */
 #undef ICONV_CONST
 
+/* Define if you want to use new multi-fd /proc interface (replaces
+   HAVE_MULTIPLE_PROC_FDS as well as other macros). */
+#undef NEW_PROC_API
+
 /* Name of this package. */
 #undef PACKAGE
 
@@ -629,12 +538,19 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* Define if the prfpregset_t type is broken. */
+#undef PRFPREGSET_T_BROKEN
+
 /* Define to 1 if the "%Lg" format works to print long doubles. */
 #undef PRINTF_HAS_LONG_DOUBLE
 
 /* Define to 1 if the "%ll" format works to print long longs. */
 #undef PRINTF_HAS_LONG_LONG
 
+/* Define if <proc_service.h> on solaris uses int instead of size_t, and
+   assorted other type changes. */
+#undef PROC_SERVICE_IS_OLD
+
 /* Define to the type of arg 3 for ptrace. */
 #undef PTRACE_TYPE_ARG3
 
@@ -661,6 +577,9 @@
 	STACK_DIRECTION = 0 => direction of growth unknown */
 #undef STACK_DIRECTION
 
+/* Define on a GNU/Linux system to work around problems in sys/procfs.h. */
+#undef START_INFERIOR_TRAPS_EXPECTED
+
 /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
 #undef STAT_MACROS_BROKEN
 
@@ -678,6 +597,9 @@
    when building for Cygwin. */
 #undef USE_WIN32API
 
+/* Define if the simulator is being linked in. */
+#undef WITH_SIM
+
 /* Define to 1 if on AIX 3.
    System headers sometimes define this.
    We just want to avoid a redefinition error message.  */
@@ -685,10 +607,22 @@
 # undef _ALL_SOURCE
 #endif
 
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+
+/* Define to 1 so <sys/proc.h> gets a definition of anon_hdl. Works around a
+   <sys/proc.h> problem on IRIX 5. */
+#undef _KMEMUSER
+
 /* Define to 1 to avoid a clash between <widec.h> and <wchar.h> on Solaris
    2.[789] when using GCC. */
 #undef _MSE_INT_H
 
+/* Define if <sys/link.h> has link_map32 (solaris sparc-64 target) */
+#undef _SYSCALL32
+
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
@@ -707,5 +641,8 @@
 /* Define to `unsigned' if <sys/types.h> does not define. */
 #undef size_t
 
+/* Define on a GNU/Linux system to work around problems in sys/procfs.h. */
+#undef sys_quotactl
+
 /* Define as `fork' if `vfork' does not work. */
 #undef vfork
diff --git a/gdb/configure b/gdb/configure
index f3b2da0a35f..29e156ff65a 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -2296,6 +2296,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+
 cat >>confdefs.h <<\_ACEOF
 #define _GNU_SOURCE 1
 _ACEOF
@@ -6700,7 +6701,8 @@ fi
 
 done
 
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_LIBUNWIND 1
 _ACEOF
 
@@ -17676,7 +17678,8 @@ fi
 echo "$as_me:$LINENO: result: $gdb_cv_have_ptrace_getregs" >&5
 echo "${ECHO_T}$gdb_cv_have_ptrace_getregs" >&6
 if test $gdb_cv_have_ptrace_getregs = yes; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_PTRACE_GETREGS 1
 _ACEOF
 
@@ -17738,7 +17741,8 @@ fi
 echo "$as_me:$LINENO: result: $gdb_cv_have_ptrace_getfpxregs" >&5
 echo "${ECHO_T}$gdb_cv_have_ptrace_getfpxregs" >&6
 if test $gdb_cv_have_ptrace_getfpxregs = yes; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_PTRACE_GETFPXREGS 1
 _ACEOF
 
@@ -17801,7 +17805,8 @@ fi
 echo "$as_me:$LINENO: result: $gdb_cv_have_pt_getdbregs" >&5
 echo "${ECHO_T}$gdb_cv_have_pt_getdbregs" >&6
 if test $gdb_cv_have_pt_getdbregs = yes; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_PT_GETDBREGS 1
 _ACEOF
 
@@ -17864,7 +17869,8 @@ fi
 echo "$as_me:$LINENO: result: $gdb_cv_have_pt_getxmmregs" >&5
 echo "${ECHO_T}$gdb_cv_have_pt_getxmmregs" >&6
 if test $gdb_cv_have_pt_getxmmregs = yes; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_PT_GETXMMREGS 1
 _ACEOF
 
@@ -17877,30 +17883,35 @@ fi
 if test "${target}" = "${host}"; then
   case "${host}" in
   i[3456]86-*-linux*)
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define START_INFERIOR_TRAPS_EXPECTED 2
 _ACEOF
 
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define sys_quotactl 1
 _ACEOF
 
 	;;
   *-*-unixware* | *-*-sysv4.2* | *-*-sysv5* | *-*-interix* )
-      cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define NEW_PROC_API 1
 _ACEOF
 
       ;;
   *-*-solaris2.[6789] | *-*-solaris2.1[0-9])
-      cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define NEW_PROC_API 1
 _ACEOF
 
       ;;
   mips-sgi-irix5*)
       # Work around <sys/proc.h> needing _KMEMUSER problem on IRIX 5.
-      cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define _KMEMUSER 1
 _ACEOF
 
@@ -18873,7 +18884,8 @@ fi
     echo "$as_me:$LINENO: result: $gdb_cv_prfpregset_t_broken" >&5
 echo "${ECHO_T}$gdb_cv_prfpregset_t_broken" >&6
     if test $gdb_cv_prfpregset_t_broken = yes; then
-      cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define PRFPREGSET_T_BROKEN 1
 _ACEOF
 
@@ -18942,7 +18954,8 @@ fi
   echo "$as_me:$LINENO: result: $gdb_cv_have_procfs_piocset" >&5
 echo "${ECHO_T}$gdb_cv_have_procfs_piocset" >&6
   if test $gdb_cv_have_procfs_piocset = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_PROCFS_PIOCSET 1
 _ACEOF
 
@@ -19006,7 +19019,8 @@ fi
   echo "$as_me:$LINENO: result: $gdb_cv_have_struct_link_map_with_l_members" >&5
 echo "${ECHO_T}$gdb_cv_have_struct_link_map_with_l_members" >&6
   if test $gdb_cv_have_struct_link_map_with_l_members = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_STRUCT_LINK_MAP_WITH_L_MEMBERS 1
 _ACEOF
 
@@ -19069,7 +19083,8 @@ fi
   echo "$as_me:$LINENO: result: $gdb_cv_have_struct_link_map_with_lm_members" >&5
 echo "${ECHO_T}$gdb_cv_have_struct_link_map_with_lm_members" >&6
   if test $gdb_cv_have_struct_link_map_with_lm_members = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_STRUCT_LINK_MAP_WITH_LM_MEMBERS 1
 _ACEOF
 
@@ -19135,7 +19150,8 @@ fi
   echo "$as_me:$LINENO: result: $gdb_cv_have_struct_so_map_with_som_members" >&5
 echo "${ECHO_T}$gdb_cv_have_struct_so_map_with_som_members" >&6
   if test $gdb_cv_have_struct_so_map_with_som_members = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_STRUCT_SO_MAP_WITH_SOM_MEMBERS 1
 _ACEOF
 
@@ -19198,11 +19214,13 @@ fi
   echo "$as_me:$LINENO: result: $gdb_cv_have_struct_link_map32" >&5
 echo "${ECHO_T}$gdb_cv_have_struct_link_map32" >&6
   if test $gdb_cv_have_struct_link_map32 = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_STRUCT_LINK_MAP32 1
 _ACEOF
 
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define _SYSCALL32 1
 _ACEOF
 
@@ -19600,7 +19618,8 @@ echo $ECHO_N "checking for HPUX/OSF thread support... $ECHO_C" >&6
          if test "$GCC" = "yes" ; then
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-            cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_HPUX_THREAD_SUPPORT 1
 _ACEOF
 
@@ -19625,7 +19644,8 @@ echo $ECHO_N "checking for Solaris thread debugging library... $ECHO_C" >&6
       if test -f /usr/lib/libthread_db.so.1 ; then
          echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-         cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_THREAD_DB_LIB 1
 _ACEOF
 
@@ -19828,7 +19848,8 @@ fi
 	 echo "$as_me:$LINENO: result: $gdb_cv_proc_service_is_old" >&5
 echo "${ECHO_T}$gdb_cv_proc_service_is_old" >&6
 	 if test $gdb_cv_proc_service_is_old = yes; then
-	    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define PROC_SERVICE_IS_OLD 1
 _ACEOF
 
@@ -21615,7 +21636,8 @@ if test "${ignore_sim}" = "true"; then
 else
     IGNORE_SIM=""
     IGNORE_SIM_OBS=""
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define WITH_SIM 1
 _ACEOF
 
@@ -21778,7 +21800,8 @@ if test "${hostfile}" != ""; then
     esac
     files="${files} ${GDB_XM_FILE}"
     links="${links} xm.h"
-    cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<_ACEOF
 #define GDB_XM_FILE "${GDB_XM_FILE}"
 _ACEOF
 
@@ -21795,7 +21818,8 @@ if test "${targetfile}" != ""; then
     esac
     files="${files} ${GDB_TM_FILE}"
     links="${links} tm.h"
-    cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<_ACEOF
 #define GDB_TM_FILE "${GDB_TM_FILE}"
 _ACEOF
 
@@ -21812,7 +21836,8 @@ if test "${nativefile}" != ""; then
     esac
     files="${files} ${GDB_NM_FILE}"
     links="${links} nm.h"
-    cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<_ACEOF
 #define GDB_NM_FILE "${GDB_NM_FILE}"
 _ACEOF
 
diff --git a/gdb/configure.ac b/gdb/configure.ac
index e77fc9ec57d..2664b9ad0bb 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -224,7 +224,7 @@ esac],[
 if test x"$enable_libunwind" = xyes; then
   AC_CHECK_HEADERS(libunwind.h)
   AC_CHECK_HEADERS(libunwind-ia64.h)
-  AC_DEFINE(HAVE_LIBUNWIND, 1)
+  AC_DEFINE(HAVE_LIBUNWIND, 1, [Define if libunwind library is being used.])
   CONFIG_OBS="$CONFIG_OBS libunwind-frame.o"
   CONFIG_DEPS="$CONFIG_DEPS libunwind-frame.o"
   CONFIG_SRCS="$CONFIG_SRCS libunwind-frame.c"
@@ -628,7 +628,8 @@ AC_CACHE_VAL(gdb_cv_have_ptrace_getregs,
 		[gdb_cv_have_ptrace_getregs=no])])
 AC_MSG_RESULT($gdb_cv_have_ptrace_getregs)
 if test $gdb_cv_have_ptrace_getregs = yes; then
-  AC_DEFINE(HAVE_PTRACE_GETREGS)
+  AC_DEFINE(HAVE_PTRACE_GETREGS, 1, 
+  [Define if sys/ptrace.h defines the PTRACE_GETREGS request.])
 fi
 
 # See if <sys/ptrace.h> provides the PTRACE_GETFPXREGS request.
@@ -640,7 +641,8 @@ AC_CACHE_VAL(gdb_cv_have_ptrace_getfpxregs,
 		[gdb_cv_have_ptrace_getfpxregs=no])])
 AC_MSG_RESULT($gdb_cv_have_ptrace_getfpxregs)
 if test $gdb_cv_have_ptrace_getfpxregs = yes; then
-  AC_DEFINE(HAVE_PTRACE_GETFPXREGS)
+  AC_DEFINE(HAVE_PTRACE_GETFPXREGS, 1,
+  [Define if sys/ptrace.h defines the PTRACE_GETFPXREGS request.])
 fi
 
 # See if <sys/ptrace.h> provides the PT_GETDBREGS request.
@@ -653,7 +655,8 @@ AC_CACHE_VAL(gdb_cv_have_pt_getdbregs,
 		[gdb_cv_have_pt_getdbregs=no])])
 AC_MSG_RESULT($gdb_cv_have_pt_getdbregs)
 if test $gdb_cv_have_pt_getdbregs = yes; then
-  AC_DEFINE(HAVE_PT_GETDBREGS)
+  AC_DEFINE(HAVE_PT_GETDBREGS, 1,
+  [Define if sys/ptrace.h defines the PT_GETDBREGS request.])
 fi
 
 # See if <sys/ptrace.h> provides the PT_GETXMMREGS request.
@@ -666,7 +669,8 @@ AC_CACHE_VAL(gdb_cv_have_pt_getxmmregs,
 		[gdb_cv_have_pt_getxmmregs=no])])
 AC_MSG_RESULT($gdb_cv_have_pt_getxmmregs)
 if test $gdb_cv_have_pt_getxmmregs = yes; then
-  AC_DEFINE(HAVE_PT_GETXMMREGS)
+  AC_DEFINE(HAVE_PT_GETXMMREGS, 1,
+  [Define if sys/ptrace.h defines the PT_GETXMMREGS request.])
 fi
 
 # If we are configured native on GNU/Linux, work around problems with
@@ -676,18 +680,26 @@ fi
 if test "${target}" = "${host}"; then
   case "${host}" in
   i[[3456]]86-*-linux*)
-	AC_DEFINE(START_INFERIOR_TRAPS_EXPECTED,2)
-	AC_DEFINE(sys_quotactl)
+	AC_DEFINE(START_INFERIOR_TRAPS_EXPECTED, 2,
+        [Define on a GNU/Linux system to work around problems in sys/procfs.h.])
+	AC_DEFINE(sys_quotactl, 1,
+        [Define on a GNU/Linux system to work around problems in sys/procfs.h.])
 	;;
   *-*-unixware* | *-*-sysv4.2* | *-*-sysv5* | *-*-interix* )
-      AC_DEFINE(NEW_PROC_API)
+      AC_DEFINE(NEW_PROC_API, 1,
+      [Define if you want to use new multi-fd /proc interface
+       (replaces HAVE_MULTIPLE_PROC_FDS as well as other macros).])
       ;;
   *-*-solaris2.[[6789]] | *-*-solaris2.1[[0-9]])
-      AC_DEFINE(NEW_PROC_API)
+      AC_DEFINE(NEW_PROC_API, 1,
+      [Define if you want to use new multi-fd /proc interface
+       (replaces HAVE_MULTIPLE_PROC_FDS as well as other macros).])
       ;;
   mips-sgi-irix5*)
       # Work around <sys/proc.h> needing _KMEMUSER problem on IRIX 5.
-      AC_DEFINE([_KMEMUSER], 1)
+      AC_DEFINE([_KMEMUSER], 1,
+      [Define to 1 so <sys/proc.h> gets a definition of anon_hdl.  Works
+       around a <sys/proc.h> problem on IRIX 5.])
       ;;
   esac
 fi
@@ -731,7 +743,8 @@ if test "$ac_cv_header_sys_procfs_h" = yes; then
        gdb_cv_prfpregset_t_broken=yes)])
     AC_MSG_RESULT($gdb_cv_prfpregset_t_broken)
     if test $gdb_cv_prfpregset_t_broken = yes; then
-      AC_DEFINE(PRFPREGSET_T_BROKEN)
+      AC_DEFINE(PRFPREGSET_T_BROKEN, 1,
+      [Define if the prfpregset_t type is broken.])
     fi
   fi
 
@@ -749,7 +762,8 @@ if test "$ac_cv_header_sys_procfs_h" = yes; then
   gdb_cv_have_procfs_piocset=yes, gdb_cv_have_procfs_piocset=no)])
   AC_MSG_RESULT($gdb_cv_have_procfs_piocset)
   if test $gdb_cv_have_procfs_piocset = yes; then
-    AC_DEFINE(HAVE_PROCFS_PIOCSET)
+    AC_DEFINE(HAVE_PROCFS_PIOCSET, 1,
+    [Define if ioctl argument PIOCSET is available.])
   fi
 fi
 
@@ -767,7 +781,10 @@ if test ${host} = ${target} ; then
                     gdb_cv_have_struct_link_map_with_l_members=no)])
   AC_MSG_RESULT($gdb_cv_have_struct_link_map_with_l_members)
   if test $gdb_cv_have_struct_link_map_with_l_members = yes; then
-    AC_DEFINE(HAVE_STRUCT_LINK_MAP_WITH_L_MEMBERS)
+    AC_DEFINE(HAVE_STRUCT_LINK_MAP_WITH_L_MEMBERS,1,
+    [Define if <link.h> exists and defines struct link_map which has
+     members with an ``l_'' prefix.  (For Solaris, SVR4, and
+     SVR4-like systems.)])
   fi
 
   dnl Check for struct link_map with lm_ members which are indicative
@@ -782,7 +799,9 @@ if test ${host} = ${target} ; then
                     gdb_cv_have_struct_link_map_with_lm_members=no)])
   AC_MSG_RESULT($gdb_cv_have_struct_link_map_with_lm_members)
   if test $gdb_cv_have_struct_link_map_with_lm_members = yes; then
-    AC_DEFINE(HAVE_STRUCT_LINK_MAP_WITH_LM_MEMBERS)
+    AC_DEFINE(HAVE_STRUCT_LINK_MAP_WITH_LM_MEMBERS, 1,
+    [Define if <link.h> exists and defines struct link_map which has
+     members with an ``lm_'' prefix.  (For SunOS.)])
   fi
 
   dnl Check for struct so_map with som_ members which are found on 
@@ -800,7 +819,9 @@ if test ${host} = ${target} ; then
                     gdb_cv_have_struct_so_map_with_som_members=no)])
   AC_MSG_RESULT($gdb_cv_have_struct_so_map_with_som_members)
   if test $gdb_cv_have_struct_so_map_with_som_members = yes; then
-    AC_DEFINE(HAVE_STRUCT_SO_MAP_WITH_SOM_MEMBERS)
+    AC_DEFINE(HAVE_STRUCT_SO_MAP_WITH_SOM_MEMBERS, 1,
+    [Define if <link.h> exists and defines a struct so_map which has
+     members with an ``som_'' prefix.  (Found on older *BSD systems.)])
   fi
 
   dnl Check for struct link_map32 type, which allows a 64-bit Solaris
@@ -814,8 +835,10 @@ if test ${host} = ${target} ; then
      gdb_cv_have_struct_link_map32=no)])
   AC_MSG_RESULT($gdb_cv_have_struct_link_map32)
   if test $gdb_cv_have_struct_link_map32 = yes; then
-    AC_DEFINE(HAVE_STRUCT_LINK_MAP32)
-    AC_DEFINE(_SYSCALL32)
+    AC_DEFINE(HAVE_STRUCT_LINK_MAP32, 1,
+    [Define if <sys/link.h> has struct link_map32])
+    AC_DEFINE(_SYSCALL32, 1,
+    [Define if <sys/link.h> has link_map32 (solaris sparc-64 target)])
   fi
 fi
 
@@ -934,7 +957,8 @@ if test ${build} = ${host} -a ${host} = ${target} ; then
       if test -f /usr/include/dce/cma_config.h ; then
          if test "$GCC" = "yes" ; then
             AC_MSG_RESULT(yes)
-            AC_DEFINE(HAVE_HPUX_THREAD_SUPPORT)
+            AC_DEFINE(HAVE_HPUX_THREAD_SUPPORT, 1,
+	    [Define if you have HPUX threads])
             CONFIG_OBS="${CONFIG_OBS} hpux-thread.o"
             CONFIG_SRCS="${CONFIG_SRCS} hpux-thread.c"
          else
@@ -952,7 +976,8 @@ if test ${build} = ${host} -a ${host} = ${target} ; then
       AC_MSG_CHECKING(for Solaris thread debugging library)
       if test -f /usr/lib/libthread_db.so.1 ; then
          AC_MSG_RESULT(yes)
-         AC_DEFINE(HAVE_THREAD_DB_LIB)
+         AC_DEFINE(HAVE_THREAD_DB_LIB, 1,
+         [Define if using Solaris thread debugging.])
          CONFIG_OBS="${CONFIG_OBS} sol-thread.o"
          CONFIG_SRCS="${CONFIG_SRCS} sol-thread.c"
          AC_CHECK_LIB(dl, dlopen)
@@ -982,7 +1007,9 @@ if test ${build} = ${host} -a ${host} = ${target} ; then
 	 ])
 	 AC_MSG_RESULT($gdb_cv_proc_service_is_old)
 	 if test $gdb_cv_proc_service_is_old = yes; then
-	    AC_DEFINE(PROC_SERVICE_IS_OLD)
+	    AC_DEFINE(PROC_SERVICE_IS_OLD, 1,
+            [Define if <proc_service.h> on solaris uses int instead of
+             size_t, and assorted other type changes.])
 	 fi
       else
          AC_MSG_RESULT(no)
@@ -1039,8 +1066,7 @@ if test "x$ac_cv_header_sys_syscall_h" = "xyes"; then
 fi
 dnl See if we can issue tkill syscall.
 if test "x$gdb_cv_sys_syscall_h_has_tkill" = "xyes" && test "x$ac_cv_func_syscall" = "xyes"; then
-  AC_DEFINE(HAVE_TKILL_SYSCALL, 1,
-            [Define if we can use the tkill syscall.])
+  AC_DEFINE(HAVE_TKILL_SYSCALL, 1, [Define if you support the tkill syscall.])
 fi
 
 dnl Handle optional features that can be enabled.
@@ -1362,7 +1388,7 @@ if test "${ignore_sim}" = "true"; then
 else
     IGNORE_SIM=""
     IGNORE_SIM_OBS=""
-    AC_DEFINE(WITH_SIM)
+    AC_DEFINE(WITH_SIM, 1, [Define if the simulator is being linked in.])
 fi
 AC_SUBST(IGNORE_SIM)
 AC_SUBST(IGNORE_SIM_OBS)
@@ -1485,7 +1511,7 @@ if test "${hostfile}" != ""; then
     esac
     files="${files} ${GDB_XM_FILE}"
     links="${links} xm.h"
-    AC_DEFINE_UNQUOTED(GDB_XM_FILE, "${GDB_XM_FILE}")
+    AC_DEFINE_UNQUOTED(GDB_XM_FILE, "${GDB_XM_FILE}", [hostfile])
 fi
 AC_SUBST(xm_h)
 
@@ -1499,7 +1525,7 @@ if test "${targetfile}" != ""; then
     esac
     files="${files} ${GDB_TM_FILE}"
     links="${links} tm.h"
-    AC_DEFINE_UNQUOTED(GDB_TM_FILE, "${GDB_TM_FILE}")
+    AC_DEFINE_UNQUOTED(GDB_TM_FILE, "${GDB_TM_FILE}", [targetfile])
 fi
 AC_SUBST(tm_h)
 
@@ -1513,7 +1539,7 @@ if test "${nativefile}" != ""; then
     esac
     files="${files} ${GDB_NM_FILE}"
     links="${links} nm.h"
-    AC_DEFINE_UNQUOTED(GDB_NM_FILE, "${GDB_NM_FILE}")
+    AC_DEFINE_UNQUOTED(GDB_NM_FILE, "${GDB_NM_FILE}", [nativefile])
 fi
 AC_SUBST(nm_h)