All templates inlined into AC_DEFINE/AC_DEFINE_UNQUOTED.

Use of acconfig.h is deprecated in modern autotools (a cleaner patch).


BitKeeper/deleted/.del-acconfig.h~8d2e3113fc8056da:
  Delete: acconfig.h
acinclude.m4:
  All templates inlined into AC_DEFINE/AC_DEFINE_UNQUOTED.
  Use of acconfig.h is deprecated in modern autotools.
configure.in:
  All templates inlined into AC_DEFINE/AC_DEFINE_UNQUOTED.
  Use of acconfig.h is deprecated in modern autotools.

3 files changed, 204 insertions, 522 deletions

diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644
index f9cff3010ca..00000000000
--- a/acconfig.h
+++ /dev/null
@@ -1,372 +0,0 @@
-/* acconfig.h
-   This file is in the public domain.
-
-   Descriptive text for the C preprocessor macros that
-   the distributed Autoconf macros can define.
-   No software package will use all of them; autoheader copies the ones
-   your configure.in uses into your configuration header file templates.
-
-   The entries are in sort -df order: alphabetical, case insensitive,
-   ignoring punctuation (such as underscores).  Although this order
-   can split up related entries, it makes it easier to check whether
-   a given entry is in the file.
-
-   Leave the following blank line there!!  Autoheader needs it.  */
-
-
-#undef C_ALLOCA
-
-#undef CRAY_STACKSEG_END
-
-/* Define the default charset name */
-#undef MYSQL_DEFAULT_CHARSET_NAME
-
-/* Define the default charset name */
-#undef MYSQL_DEFAULT_COLLATION_NAME
-
-/* Version of .frm files */
-#undef DOT_FRM_VERSION
-
-/* If LOAD DATA LOCAL INFILE should be enabled by default */
-#undef ENABLED_LOCAL_INFILE
-
-/* READLINE: */
-#undef FIONREAD_IN_SYS_IOCTL
-
-/* READLINE: Define if your system defines TIOCGWINSZ in sys/ioctl.h.  */
-#undef GWINSZ_IN_SYS_IOCTL
-
-/* Handing of large files on Solaris 2.6 */
-#undef _FILE_OFFSET_BITS
-
-/* Do we have FIONREAD */
-#undef FIONREAD_IN_SYS_IOCTL
-
-/* Do we need to define _GNU_SOURCE */
-#undef _GNU_SOURCE
-
-/* atomic_add() from <asm/atomic.h> (Linux only) */
-#undef HAVE_ATOMIC_ADD
-
-/* atomic_sub() from <asm/atomic.h> (Linux only) */
-#undef HAVE_ATOMIC_SUB
-
-/* If we have a working alloca() implementation */
-#undef HAVE_ALLOCA
-
-/* bool is not defined by all C++ compilators */
-#undef HAVE_BOOL
-
-/* Have berkeley db installed */
-#undef HAVE_BERKELEY_DB
-
-/* DSB style signals ? */
-#undef HAVE_BSD_SIGNALS
-
-/* Can netinet be included */
-#undef HAVE_BROKEN_NETINET_INCLUDES
-
-/* READLINE: */
-#undef HAVE_BSD_SIGNALS
-
-/* Define charsets you want */
-#undef HAVE_CHARSET_armscii8
-#undef HAVE_CHARSET_ascii
-#undef HAVE_CHARSET_big5
-#undef HAVE_CHARSET_cp1250
-#undef HAVE_CHARSET_cp1251
-#undef HAVE_CHARSET_cp1256
-#undef HAVE_CHARSET_cp1257
-#undef HAVE_CHARSET_cp850
-#undef HAVE_CHARSET_cp852
-#undef HAVE_CHARSET_cp866
-#undef HAVE_CHARSET_dec8
-#undef HAVE_CHARSET_euckr
-#undef HAVE_CHARSET_gb2312
-#undef HAVE_CHARSET_gbk
-#undef HAVE_CHARSET_geostd8
-#undef HAVE_CHARSET_greek
-#undef HAVE_CHARSET_hebrew
-#undef HAVE_CHARSET_hp8
-#undef HAVE_CHARSET_keybcs2
-#undef HAVE_CHARSET_koi8r
-#undef HAVE_CHARSET_koi8u
-#undef HAVE_CHARSET_latin1
-#undef HAVE_CHARSET_latin2
-#undef HAVE_CHARSET_latin5
-#undef HAVE_CHARSET_latin7
-#undef HAVE_CHARSET_macce
-#undef HAVE_CHARSET_macroman
-#undef HAVE_CHARSET_sjis
-#undef HAVE_CHARSET_swe7
-#undef HAVE_CHARSET_tis620
-#undef HAVE_CHARSET_ucs2
-#undef HAVE_CHARSET_ujis
-#undef HAVE_CHARSET_utf8
-
-/* ZLIB and compress: */
-#undef HAVE_COMPRESS
-
-/* Define if we are using OSF1 DEC threads */
-#undef HAVE_DEC_THREADS
-
-/* Define if we are using OSF1 DEC threads on 3.2 */
-#undef HAVE_DEC_3_2_THREADS
-
-/* Builds Example DB */
-#undef HAVE_EXAMPLE_DB
-
-/* Builds Archive Storage Engine */
-#undef HAVE_ARCHIVE_DB
-
-/* fp_except from ieeefp.h */
-#undef HAVE_FP_EXCEPT
-
-/* READLINE: */
-#undef HAVE_GETPW_DECLS
-
-/* Solaris define gethostbyname_r with 5 arguments. glibc2 defines
-   this with 6 arguments */
-#undef HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE
-
-/* In OSF 4.0f the 3'd argument to gethostname_r is hostent_data * */
-#undef HAVE_GETHOSTBYNAME_R_RETURN_INT
-
-/* Define if int8, int16 and int32 types exist */
-#undef HAVE_INT_8_16_32
-
-/* Using Innobase DB */
-#undef HAVE_INNOBASE_DB
-
-/* Using old ISAM tables */
-#undef HAVE_ISAM
-
-/* Define if we have GNU readline */
-#undef HAVE_LIBREADLINE
-
-/* Define if have -lwrap */
-#undef HAVE_LIBWRAP
-
-/* Define if we are using Xavier Leroy's LinuxThreads */
-#undef HAVE_LINUXTHREADS
-
-/* Do we have lstat */
-#undef HAVE_LSTAT
-
-/* Do we use user level threads */
-#undef HAVE_mit_thread
-
-/* Using Ndb Cluster DB */
-#undef HAVE_NDBCLUSTER_DB
-
-/* Including Ndb Cluster DB shared memory transporter */
-#undef NDB_SHM_TRANSPORTER
-
-/* Including Ndb Cluster DB sci transporter */
-#undef NDB_SCI_TRANSPORTER
-
-/* For some non posix threads */
-#undef HAVE_NONPOSIX_PTHREAD_GETSPECIFIC
-
-/* For some non posix threads */
-#undef HAVE_NONPOSIX_PTHREAD_MUTEX_INIT
-
-/* READLINE: */
-#undef HAVE_POSIX_SIGNALS
-
-/* Well.. */
-#undef HAVE_POSIX_SIGSETJMP
-
-/* sigwait with one argument */
-#undef HAVE_NONPOSIX_SIGWAIT
-
-/* ORBIT */
-#undef HAVE_ORBIT
-
-/* pthread_attr_setscope */
-#undef HAVE_PTHREAD_ATTR_SETSCOPE
-
-/* pthread_yield that doesn't take any arguments */
-#undef HAVE_PTHREAD_YIELD_ZERO_ARG
-
-/* pthread_yield function with one argument */
-#undef HAVE_PTHREAD_YIELD_ONE_ARG
-
-/* POSIX readdir_r */
-#undef HAVE_READDIR_R
-
-/* Have Gemini db installed */
-#undef HAVE_GEMINI_DB
-
-/* POSIX sigwait */
-#undef HAVE_SIGWAIT
-
-/* crypt */
-#undef HAVE_CRYPT
-
-/* If we want to have query cache */
-#undef HAVE_QUERY_CACHE
-
-/* Spatial extentions */
-#undef HAVE_SPATIAL
-
-/* RTree keys */
-#undef HAVE_RTREE_KEYS
-
-/* Access checks in embedded library */
-#undef HAVE_EMBEDDED_PRIVILEGE_CONTROL
-
-/* Solaris define gethostbyaddr_r with 7 arguments. glibc2 defines
-   this with 8 arguments */
-#undef HAVE_SOLARIS_STYLE_GETHOST
-
-/* MIT pthreads does not support connecting with unix sockets */
-#undef HAVE_THREADS_WITHOUT_SOCKETS
-
-/* Timespec has a ts_sec instead of tv_sev  */
-#undef HAVE_TIMESPEC_TS_SEC
-
-/* Have the tzname variable */
-#undef HAVE_TZNAME
-
-/* Define if the system files define uchar */
-#undef HAVE_UCHAR
-
-/* Define if the system files define uint */
-#undef HAVE_UINT
-
-/* Define if the system files define ulong */
-#undef HAVE_ULONG
-
-/* Define if the system files define in_addr_t */
-#undef HAVE_IN_ADDR_T
-
-/* UNIXWARE7 threads are not posix */
-#undef HAVE_UNIXWARE7_THREADS
-
-/* new UNIXWARE7 threads that are not yet posix */
-#undef HAVE_UNIXWARE7_POSIX
-
-/* OpenSSL */
-#undef HAVE_OPENSSL
-
-/* READLINE: */
-#undef HAVE_USG_SIGHOLD
-
-/* Virtual IO */
-#undef HAVE_VIO
-
-/* Handling of large files on Solaris 2.6 */
-#undef _LARGEFILE_SOURCE
-
-/* Handling of large files on Solaris 2.6 */
-#undef _LARGEFILE64_SOURCE
-
-/* Define if want -lwrap */
-#undef LIBWRAP
-
-/* Define to machine type name eg sun10 */
-#undef MACHINE_TYPE
-
-#undef MUST_REINSTALL_SIGHANDLERS
-
-/* Defined to used character set */
-#undef MY_CHARSET_CURRENT
-
-/* READLINE: no sys file*/
-#undef NO_SYS_FILE
-
-/* Program name */
-#undef PACKAGE
-
-/* mysql client protocoll version */
-#undef PROTOCOL_VERSION
-
-/* ndb version */
-#undef NDB_VERSION_MAJOR
-#undef NDB_VERSION_MINOR
-#undef NDB_VERSION_BUILD
-#undef NDB_VERSION_STATUS
-
-/* Define if qsort returns void */
-#undef QSORT_TYPE_IS_VOID
-
-/* Define as the return type of qsort (int or void). */
-#undef RETQSORTTYPE
-
-/* Size of off_t */
-#undef SIZEOF_OFF_T
-
-/* Define as the base type of the last arg to accept */
-#undef SOCKET_SIZE_TYPE
-
-/* Last argument to get/setsockopt */
-#undef SOCKOPT_OPTLEN_TYPE
-
-#undef SPEED_T_IN_SYS_TYPES
-#undef SPRINTF_RETURNS_PTR
-#undef SPRINTF_RETURNS_INT
-#undef SPRINTF_RETURNS_GARBAGE
-
-/* Needed to get large file support on HPUX 10.20 */
-#undef __STDC_EXT__
-
-#undef STACK_DIRECTION
-
-#undef STRCOLL_BROKEN
-
-#undef STRUCT_DIRENT_HAS_D_FILENO
-#undef STRUCT_DIRENT_HAS_D_INO
-
-#undef STRUCT_WINSIZE_IN_SYS_IOCTL
-#undef STRUCT_WINSIZE_IN_TERMIOS
-
-/* Define to name of system eg solaris*/
-#undef SYSTEM_TYPE
-
-/* Define if you want to have threaded code. This may be undef on client code */
-#undef THREAD
-
-/* Should be client be thread safe */
-#undef THREAD_SAFE_CLIENT
-
-/* READLINE: */
-#undef TIOCSTAT_IN_SYS_IOCTL
-
-/* Use multi-byte character routines */
-#undef USE_MB
-#undef USE_MB_IDENT
-
-/* the pstack backtrace library */
-#undef USE_PSTACK
-
-/* Use MySQL RAID */
-#undef USE_RAID
-
-/* Program version */
-#undef VERSION
-
-/* READLINE: */
-#undef VOID_SIGHANDLER
-
-/* used libedit interface (can we dereference result of rl_completion_entry_function?) */
-#undef USE_LIBEDIT_INTERFACE
-
-/* used new readline interface (does rl_completion_func_t and rl_compentry_func_t defined?) */
-#undef USE_NEW_READLINE_INTERFACE
-
-/* macro for libedit */
-#undef HAVE_VIS_H
-#undef HAVE_FGETLN
-#undef HAVE_ISSETUGID
-#undef HAVE_STRLCPY
-#undef HAVE_GETLINE
-#undef HAVE_FLOCKFILE
-#undef HAVE_SYS_TYPES_H
-#undef HAVE_SYS_CDEFS_H
-
-
-/* Leave that blank line there!!  Autoheader needs it.
-   If you're adding to this file, keep in mind:
-   The entries are in sort -df order: alphabetical, case insensitive,
-   ignoring punctuation (such as underscores).  */
diff --git a/acinclude.m4 b/acinclude.m4
index 92a9d9e00b3..0e6dab052ab 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -13,7 +13,8 @@ AC_DEFUN(MYSQL_CHECK_LIBEDIT_INTERFACE,[
 	    ],
 	    [
 		mysql_cv_libedit_interface=yes
-		AC_DEFINE_UNQUOTED(USE_LIBEDIT_INTERFACE)
+                AC_DEFINE_UNQUOTED([USE_LIBEDIT_INTERFACE], [1],
+                                   [used libedit interface (can we dereference result of rl_completion_entry_function)])
 	    ],
 	    [mysql_cv_libedit_interface=no]
         )
@@ -33,7 +34,8 @@ AC_DEFUN(MYSQL_CHECK_NEW_RL_INTERFACE,[
 	    ],
 	    [
 		mysql_cv_new_rl_interface=yes
-		AC_DEFINE_UNQUOTED(USE_NEW_READLINE_INTERFACE)
+                AC_DEFINE_UNQUOTED([USE_NEW_READLINE_INTERFACE], [1],
+                                   [used new readline interface (are rl_completion_func_t and rl_compentry_func_t defined)])
 	    ],
 	    [mysql_cv_new_rl_interface=no]
         )
@@ -65,7 +67,7 @@ main()
   exit(0);
 }], AC_CV_NAME=`cat conftestval`, AC_CV_NAME=0, ifelse([$2], , , AC_CV_NAME=$2))])dnl
 AC_MSG_RESULT($AC_CV_NAME)
-AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME)
+AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [ ])
 undefine([AC_TYPE_NAME])dnl
 undefine([AC_CV_NAME])dnl
 ])
@@ -105,7 +107,8 @@ if test "$mysql_cv_btype_last_arg_accept" = "none"; then
 mysql_cv_btype_last_arg_accept=int
 fi)
 AC_LANG_RESTORE
-AC_DEFINE_UNQUOTED(SOCKET_SIZE_TYPE, $mysql_cv_btype_last_arg_accept)
+AC_DEFINE_UNQUOTED([SOCKET_SIZE_TYPE], [$mysql_cv_btype_last_arg_accept],
+                   [The base type of the last arg to accept])
 CXXFLAGS="$ac_save_CXXFLAGS"
 ])
 #---END:
@@ -121,10 +124,11 @@ void qsort(void *base, size_t nel, size_t width,
  int (*compar) (const void *, const void *));
 ],
 [int i;], mysql_cv_type_qsort=void, mysql_cv_type_qsort=int)])
-AC_DEFINE_UNQUOTED(RETQSORTTYPE, $mysql_cv_type_qsort)
+AC_DEFINE_UNQUOTED([RETQSORTTYPE], [$mysql_cv_type_qsort],
+                   [The return type of qsort (int or void).])
 if test "$mysql_cv_type_qsort" = "void"
 then
- AC_DEFINE_UNQUOTED(QSORT_TYPE_IS_VOID, 1)
+ AC_DEFINE_UNQUOTED([QSORT_TYPE_IS_VOID], [1], [qsort returns void])
 fi
 ])
 
@@ -142,7 +146,8 @@ abstime.ts_nsec = 0;
 ], mysql_cv_timespec_ts=yes, mysql_cv_timespec_ts=no)])
 if test "$mysql_cv_timespec_ts" = "yes"
 then
-  AC_DEFINE(HAVE_TIMESPEC_TS_SEC)
+  AC_DEFINE([HAVE_TIMESPEC_TS_SEC], [1],
+            [Timespec has a ts_sec instead of tv_sev])
 fi
 ])
 
@@ -158,7 +163,7 @@ extern "C"
 ], mysql_cv_tzname=yes, mysql_cv_tzname=no)])
 if test "$mysql_cv_tzname" = "yes"
 then
-  AC_DEFINE(HAVE_TZNAME)
+  AC_DEFINE([HAVE_TZNAME], [1], [Have the tzname variable])
 fi
 ])
 
@@ -182,7 +187,7 @@ int link_test()
 ], mysql_cv_compress=yes, mysql_cv_compress=no)])
 if test "$mysql_cv_compress" = "yes"
 then
-  AC_DEFINE(HAVE_COMPRESS)
+  AC_DEFINE([HAVE_COMPRESS], [1], [ZLIB and compress])
 else
   LIBS="$save_LIBS"
 fi
@@ -203,7 +208,7 @@ main()
 AC_MSG_RESULT($ac_cv_ulong)
 if test "$ac_cv_ulong" = "yes"
 then
-  AC_DEFINE(HAVE_ULONG)
+  AC_DEFINE([HAVE_ULONG], [1], [system headers define ulong])
 fi
 ])
 
@@ -221,7 +226,7 @@ main()
 AC_MSG_RESULT($ac_cv_uchar)
 if test "$ac_cv_uchar" = "yes"
 then
-  AC_DEFINE(HAVE_UCHAR)
+  AC_DEFINE([HAVE_UCHAR], [1], [system headers define uchar])
 fi
 ])
 
@@ -239,7 +244,7 @@ main()
 AC_MSG_RESULT($ac_cv_uint)
 if test "$ac_cv_uint" = "yes"
 then
-  AC_DEFINE(HAVE_UINT)
+  AC_DEFINE([HAVE_UINT], [1], [system headers define uint])
 fi
 ])
 
@@ -261,7 +266,7 @@ int main(int argc, char **argv)
 AC_MSG_RESULT($ac_cv_in_addr_t)
 if test "$ac_cv_in_addr_t" = "yes"
 then
-  AC_DEFINE(HAVE_IN_ADDR_T)
+  AC_DEFINE([HAVE_IN_ADDR_T], [1], [system headers define in_addr_t])
 fi
 ])
 
@@ -279,7 +284,8 @@ extern "C"
 ], ac_cv_pthread_yield_zero_arg=yes, ac_cv_pthread_yield_zero_arg=yeso)])
 if test "$ac_cv_pthread_yield_zero_arg" = "yes"
 then
-  AC_DEFINE(HAVE_PTHREAD_YIELD_ZERO_ARG)
+  AC_DEFINE([HAVE_PTHREAD_YIELD_ZERO_ARG], [1],
+            [pthread_yield that doesn't take any arguments])
 fi
 ]
 [AC_CACHE_CHECK([if pthread_yield takes 1 argument], ac_cv_pthread_yield_one_arg,
@@ -294,7 +300,8 @@ extern "C"
 ], ac_cv_pthread_yield_one_arg=yes, ac_cv_pthread_yield_one_arg=no)])
 if test "$ac_cv_pthread_yield_one_arg" = "yes"
 then
-  AC_DEFINE(HAVE_PTHREAD_YIELD_ONE_ARG)
+  AC_DEFINE([HAVE_PTHREAD_YIELD_ONE_ARG], [1],
+            [pthread_yield function with one argument])
 fi
 ]
 )
@@ -318,7 +325,7 @@ main()
 AC_MSG_RESULT($ac_cv_fp_except)
 if test "$ac_cv_fp_except" = "yes"
 then
-  AC_DEFINE(HAVE_FP_EXCEPT)
+  AC_DEFINE([HAVE_FP_EXCEPT], [1], [fp_except from ieeefp.h])
 fi
 ])
 
@@ -459,11 +466,12 @@ AC_CACHE_VAL(mysql_cv_signal_vintage,
 ])
 AC_MSG_RESULT($mysql_cv_signal_vintage)
 if test "$mysql_cv_signal_vintage" = posix; then
-AC_DEFINE(HAVE_POSIX_SIGNALS)
+AC_DEFINE(HAVE_POSIX_SIGNALS, [1],
+          [Signal handling is POSIX (sigset/sighold, etc)])
 elif test "$mysql_cv_signal_vintage" = "4.2bsd"; then
-AC_DEFINE(HAVE_BSD_SIGNALS)
+AC_DEFINE([HAVE_BSD_SIGNALS], [1], [BSD style signals])
 elif test "$mysql_cv_signal_vintage" = svr3; then
-AC_DEFINE(HAVE_USG_SIGHOLD)
+AC_DEFINE(HAVE_USG_SIGHOLD, [1], [sighold() is present and usable])
 fi
 ])
 
@@ -476,7 +484,7 @@ extern struct passwd *getpwent();], [struct passwd *z; z = getpwent();],
   mysql_cv_can_redecl_getpw=yes,mysql_cv_can_redecl_getpw=no)])
 AC_MSG_RESULT($mysql_cv_can_redecl_getpw)
 if test "$mysql_cv_can_redecl_getpw" = "no"; then
-AC_DEFINE(HAVE_GETPW_DECLS)
+AC_DEFINE(HAVE_GETPW_DECLS, [1], [getpwent() declaration present])
 fi
 ])
 
@@ -488,7 +496,8 @@ AC_CACHE_VAL(mysql_cv_tiocgwinsz_in_ioctl,
   mysql_cv_tiocgwinsz_in_ioctl=yes,mysql_cv_tiocgwinsz_in_ioctl=no)])
 AC_MSG_RESULT($mysql_cv_tiocgwinsz_in_ioctl)
 if test "$mysql_cv_tiocgwinsz_in_ioctl" = "yes"; then   
-AC_DEFINE(GWINSZ_IN_SYS_IOCTL)
+AC_DEFINE([GWINSZ_IN_SYS_IOCTL], [1],
+          [READLINE: your system defines TIOCGWINSZ in sys/ioctl.h.])
 fi
 ])
 
@@ -500,7 +509,7 @@ AC_CACHE_VAL(mysql_cv_fionread_in_ioctl,
   mysql_cv_fionread_in_ioctl=yes,mysql_cv_fionread_in_ioctl=no)])
 AC_MSG_RESULT($mysql_cv_fionread_in_ioctl)
 if test "$mysql_cv_fionread_in_ioctl" = "yes"; then   
-AC_DEFINE(FIONREAD_IN_SYS_IOCTL)
+AC_DEFINE([FIONREAD_IN_SYS_IOCTL], [1], [Do we have FIONREAD])
 fi
 ])
 
@@ -512,7 +521,8 @@ AC_CACHE_VAL(mysql_cv_tiocstat_in_ioctl,
   mysql_cv_tiocstat_in_ioctl=yes,mysql_cv_tiocstat_in_ioctl=no)])
 AC_MSG_RESULT($mysql_cv_tiocstat_in_ioctl)
 if test "$mysql_cv_tiocstat_in_ioctl" = "yes"; then   
-AC_DEFINE(TIOCSTAT_IN_SYS_IOCTL)
+AC_DEFINE(TIOCSTAT_IN_SYS_IOCTL, [1],
+          [declaration of TIOCSTAT in sys/ioctl.h])
 fi
 ])
 
@@ -545,7 +555,8 @@ struct dirent d; int z; z = d.d_ino;
 ], mysql_cv_dirent_has_dino=yes, mysql_cv_dirent_has_dino=no)])
 AC_MSG_RESULT($mysql_cv_dirent_has_dino)
 if test "$mysql_cv_dirent_has_dino" = "yes"; then
-AC_DEFINE(STRUCT_DIRENT_HAS_D_INO)
+AC_DEFINE(STRUCT_DIRENT_HAS_D_INO, [1],
+          [d_ino member present in struct dirent])
 fi
 ])
 
@@ -564,7 +575,7 @@ void (*signal ()) ();],
 [int i;], mysql_cv_void_sighandler=yes, mysql_cv_void_sighandler=no)])dnl
 AC_MSG_RESULT($mysql_cv_void_sighandler)
 if test "$mysql_cv_void_sighandler" = "yes"; then
-AC_DEFINE(VOID_SIGHANDLER)
+AC_DEFINE(VOID_SIGHANDLER, [1], [sighandler type is void (*signal ()) ();])
 fi
 ])
 
@@ -583,7 +594,7 @@ AC_LANG_RESTORE
 ])
 AC_MSG_RESULT($mysql_cv_have_bool)
 if test "$mysql_cv_have_bool" = yes; then
-AC_DEFINE(HAVE_BOOL)
+AC_DEFINE([HAVE_BOOL], [1], [bool is not defined by all C++ compilators])
 fi
 ])dnl
 
@@ -624,7 +635,7 @@ then
    ac_cv_header_alloca_h=yes, ac_cv_header_alloca_h=no)])
  if test "$ac_cv_header_alloca_h" = "yes"
  then
-	AC_DEFINE(HAVE_ALLOCA)
+	AC_DEFINE(HAVE_ALLOCA, 1)
  fi
  
  AC_CACHE_CHECK([for alloca], ac_cv_func_alloca_works,
@@ -647,7 +658,7 @@ then
  ], [char *p = (char *) alloca(1);],
    ac_cv_func_alloca_works=yes, ac_cv_func_alloca_works=no)])
  if test "$ac_cv_func_alloca_works" = "yes"; then
-   AC_DEFINE(HAVE_ALLOCA)
+   AC_DEFINE([HAVE_ALLOCA], [1], [If we have a working alloca() implementation])
  fi
  
  if test "$ac_cv_func_alloca_works" = "no"; then
@@ -656,7 +667,7 @@ then
    # contain a buggy version.  If you still want to use their alloca,
    # use ar to extract alloca.o from them instead of compiling alloca.c.
    ALLOCA=alloca.o
-   AC_DEFINE(C_ALLOCA)
+   AC_DEFINE(C_ALLOCA, 1)
  
  AC_CACHE_CHECK(whether alloca needs Cray hooks, ac_cv_os_cray,
  [AC_EGREP_CPP(webecray,
@@ -761,7 +772,7 @@ AC_DEFUN(MYSQL_CHECK_VIO, [
   then
     vio_dir="vio"
     vio_libs="../vio/libvio.la"
-    AC_DEFINE(HAVE_VIO)
+    AC_DEFINE(HAVE_VIO, 1)
   else
     vio_dir=""
     vio_libs=""
@@ -852,7 +863,7 @@ AC_MSG_CHECKING(for OpenSSL)
     #force VIO use
     vio_dir="vio"
     vio_libs="../vio/libvio.la"
-    AC_DEFINE(HAVE_VIO)
+    AC_DEFINE([HAVE_VIO], [1], [Virtual IO])
     AC_MSG_RESULT(yes)
     openssl_libs="-L$OPENSSL_LIB -lssl -lcrypto"
     # Don't set openssl_includes to /usr/include as this gives us a lot of
@@ -866,7 +877,7 @@ AC_MSG_CHECKING(for OpenSSL)
     then
     	openssl_includes="$openssl_includes -I$OPENSSL_KERBEROS_INCLUDE"
     fi
-    AC_DEFINE(HAVE_OPENSSL)
+    AC_DEFINE([HAVE_OPENSSL], [1], [OpenSSL])
 
     # openssl-devel-0.9.6 requires dlopen() and we can't link staticly
     # on many platforms (We should actually test this here, but it's quite
@@ -927,7 +938,7 @@ then
   orbit_libs=`orbit-config --libs server`
   orbit_idl="$orbit_exec_prefix/bin/orbit-idl"
   AC_MSG_RESULT(found!)
-  AC_DEFINE(HAVE_ORBIT)
+  AC_DEFINE([HAVE_ORBIT], [1], [ORBIT])
 else
   orbit_exec_prefix=
   orbit_includes=
@@ -949,7 +960,7 @@ AC_DEFUN([MYSQL_CHECK_ISAM], [
   isam_libs=
   if test X"$with_isam" = X"yes"
   then
-    AC_DEFINE(HAVE_ISAM)
+    AC_DEFINE([HAVE_ISAM], [1], [Using old ISAM tables])
     isam_libs="\$(top_builddir)/isam/libnisam.a\
  \$(top_builddir)/merge/libmerge.a"
   fi
@@ -1245,7 +1256,7 @@ AC_DEFUN([MYSQL_CHECK_INNODB], [
   case "$innodb" in
     yes )
       AC_MSG_RESULT([Using Innodb])
-      AC_DEFINE(HAVE_INNOBASE_DB)
+      AC_DEFINE([HAVE_INNOBASE_DB], [1], [Using Innobase DB])
       have_innodb="yes"
       innodb_includes="-I../innobase/include"
       innodb_system_libs=""
@@ -1318,7 +1329,7 @@ AC_DEFUN([MYSQL_CHECK_EXAMPLEDB], [
 
   case "$exampledb" in
     yes )
-      AC_DEFINE(HAVE_EXAMPLE_DB)
+      AC_DEFINE([HAVE_EXAMPLE_DB], [1], [Builds Example DB])
       AC_MSG_RESULT([yes])
       [exampledb=yes]
       ;;
@@ -1348,7 +1359,7 @@ AC_DEFUN([MYSQL_CHECK_ARCHIVEDB], [
 
   case "$archivedb" in
     yes )
-      AC_DEFINE(HAVE_ARCHIVE_DB)
+      AC_DEFINE([HAVE_ARCHIVE_DB], [1], [Builds Archive Storage Engine])
       AC_MSG_RESULT([yes])
       [archivedb=yes]
       ;;
@@ -1397,7 +1408,8 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
   case "$ndb_shm" in
     yes )
       AC_MSG_RESULT([-- including shared memory transporter])
-      AC_DEFINE(NDB_SHM_TRANSPORTER)
+      AC_DEFINE([NDB_SHM_TRANSPORTER], [1],
+                [Including Ndb Cluster DB shared memory transporter])
       have_ndb_shm="yes"
       ;;
     * )
@@ -1409,7 +1421,8 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
   case "$ndb_sci" in
     yes )
       AC_MSG_RESULT([-- including sci transporter])
-      AC_DEFINE(NDB_SCI_TRANSPORTER)
+      AC_DEFINE([NDB_SCI_TRANSPORTER], [1],
+                [Including Ndb Cluster DB sci transporter])
       have_ndb_sci="yes"
       ;;
     * )
@@ -1457,7 +1470,7 @@ AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [
   case "$ndbcluster" in
     yes )
       AC_MSG_RESULT([Using NDB Cluster])
-      AC_DEFINE(HAVE_NDBCLUSTER_DB)
+      AC_DEFINE([HAVE_NDBCLUSTER_DB], [1], [Using Ndb Cluster DB])
       have_ndbcluster="yes"
       ndbcluster_includes="-I../ndb/include -I../ndb/include/ndbapi"
       ndbcluster_libs="\$(top_builddir)/ndb/src/.libs/libndbclient.a"
@@ -1602,7 +1615,7 @@ AC_DEFUN(MYSQL_SYS_LARGEFILE,
 	esac])
      AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE,
        ac_cv_sys_largefile_source,
-       [Define to make fseeko etc. visible, on some hosts.],
+       [makes fseeko etc. visible, on some hosts.],
        [case "$host_os" in
 	# HP-UX 10.20 and later
 	hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)
@@ -1610,7 +1623,7 @@ AC_DEFUN(MYSQL_SYS_LARGEFILE,
 	esac])
      AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES,
        ac_cv_sys_large_files,
-       [Define for large files, on AIX-style hosts.],
+       [Large files support on AIX-style hosts.],
        [case "$host_os" in
 	# AIX 4.2 and later
 	aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*)
diff --git a/configure.in b/configure.in
index 0d5387b679b..31c5fb8bedb 100644
--- a/configure.in
+++ b/configure.in
@@ -62,9 +62,11 @@ AC_SUBST(MYSQL_NO_DASH_VERSION)
 AC_SUBST(MYSQL_BASE_VERSION)
 AC_SUBST(MYSQL_VERSION_ID)
 AC_SUBST(PROTOCOL_VERSION)
-AC_DEFINE_UNQUOTED(PROTOCOL_VERSION, $PROTOCOL_VERSION)
+AC_DEFINE_UNQUOTED([PROTOCOL_VERSION], [$PROTOCOL_VERSION],
+                   [mysql client protocoll version])
 AC_SUBST(DOT_FRM_VERSION)
-AC_DEFINE_UNQUOTED(DOT_FRM_VERSION, $DOT_FRM_VERSION)
+AC_DEFINE_UNQUOTED([DOT_FRM_VERSION], [$DOT_FRM_VERSION],
+                   [Version of .frm files])
 AC_SUBST(SHARED_LIB_VERSION)
 AC_SUBST(AVAILABLE_LANGUAGES)
 AC_SUBST(AVAILABLE_LANGUAGES_ERRORS)
@@ -74,19 +76,25 @@ AC_SUBST([NDB_VERSION_MAJOR])
 AC_SUBST([NDB_VERSION_MINOR])
 AC_SUBST([NDB_VERSION_BUILD])
 AC_SUBST([NDB_VERSION_STATUS])
-AC_DEFINE_UNQUOTED([NDB_VERSION_MAJOR], [$NDB_VERSION_MAJOR])
-AC_DEFINE_UNQUOTED([NDB_VERSION_MINOR], [$NDB_VERSION_MINOR])
-AC_DEFINE_UNQUOTED([NDB_VERSION_BUILD], [$NDB_VERSION_BUILD])
-AC_DEFINE_UNQUOTED([NDB_VERSION_STATUS], ["$NDB_VERSION_STATUS"])
+AC_DEFINE_UNQUOTED([NDB_VERSION_MAJOR], [$NDB_VERSION_MAJOR],
+                   [NDB major version])
+AC_DEFINE_UNQUOTED([NDB_VERSION_MINOR], [$NDB_VERSION_MINOR],
+                   [NDB minor version])
+AC_DEFINE_UNQUOTED([NDB_VERSION_BUILD], [$NDB_VERSION_BUILD],
+                   [NDB build version])
+AC_DEFINE_UNQUOTED([NDB_VERSION_STATUS], ["$NDB_VERSION_STATUS"],
+                   [NDB status version])
 
 
 # Canonicalize the configuration name.
 SYSTEM_TYPE="$host_vendor-$host_os"
 MACHINE_TYPE="$host_cpu"
 AC_SUBST(SYSTEM_TYPE)
-AC_DEFINE_UNQUOTED(SYSTEM_TYPE, "$SYSTEM_TYPE")
+AC_DEFINE_UNQUOTED([SYSTEM_TYPE], ["$SYSTEM_TYPE"],
+                   [Name of system, eg solaris])
 AC_SUBST(MACHINE_TYPE)
-AC_DEFINE_UNQUOTED(MACHINE_TYPE, "$MACHINE_TYPE")
+AC_DEFINE_UNQUOTED([MACHINE_TYPE], ["$MACHINE_TYPE"],
+                   [Machine type name, eg sun10])
 
 # Detect intel x86 like processor
 BASE_MACHINE_TYPE=$MACHINE_TYPE
@@ -230,7 +238,7 @@ AC_MSG_CHECKING("return type of sprintf")
 #check the return type of sprintf
 case $SYSTEM_TYPE in
   *netware*)
-    AC_DEFINE(SPRINTF_RETURNS_INT) AC_MSG_RESULT("int")
+    AC_DEFINE(SPRINTF_RETURNS_INT, [1]) AC_MSG_RESULT("int")
     ;;
   *)
 AC_TRY_RUN([
@@ -244,8 +252,9 @@ AC_TRY_RUN([
       return -1;
      }
    ],
-AC_DEFINE(SPRINTF_RETURNS_INT) AC_MSG_RESULT("int"),
- AC_TRY_RUN([
+   [AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf])
+   AC_MSG_RESULT("int")],
+   [AC_TRY_RUN([
  int main()
    {
      char* s = "hello";
@@ -253,9 +262,12 @@ AC_DEFINE(SPRINTF_RETURNS_INT) AC_MSG_RESULT("int"),
      if((char*)sprintf(buf,s) == buf + strlen(s))
        return 0;
      return -1;
-   }
-], AC_DEFINE(SPRINTF_RETURNS_PTR) AC_MSG_RESULT("ptr"),
- AC_DEFINE(SPRINTF_RETURNS_GARBAGE) AC_MSG_RESULT("garbage")))
+   }           ],
+               [AC_DEFINE(SPRINTF_RETURNS_PTR, [1], [Broken sprintf])
+                AC_MSG_RESULT("ptr")],
+               [AC_DEFINE(SPRINTF_RETURNS_GARBAGE, [1], [Broken sprintf])
+                AC_MSG_RESULT("garbage")])
+   ])
     ;;
 esac
 
@@ -701,7 +713,7 @@ AC_ARG_WITH(raid,
 if test "$USE_RAID" = "yes"
 then
   AC_MSG_RESULT([yes])
-  AC_DEFINE([USE_RAID])
+  AC_DEFINE([USE_RAID], [1], [Use MySQL RAID])
 else
   AC_MSG_RESULT([no])
 fi
@@ -745,7 +757,8 @@ AC_ARG_ENABLE(local-infile,
 if test "$ENABLED_LOCAL_INFILE" = "yes"
 then
   AC_MSG_RESULT([yes])
-  AC_DEFINE([ENABLED_LOCAL_INFILE])
+  AC_DEFINE([ENABLED_LOCAL_INFILE], [1],
+            [If LOAD DATA LOCAL INFILE should be enabled by default])
 else
   AC_MSG_RESULT([no])
 fi
@@ -789,7 +802,7 @@ AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open))
 AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind))
 # For crypt() on Linux
 AC_CHECK_LIB(crypt, crypt)
-AC_CHECK_FUNC(crypt, AC_DEFINE(HAVE_CRYPT)) 
+AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt])) 
 
 # For sem_xxx functions on Solaris 2.6
 AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))
@@ -797,7 +810,7 @@ AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))
 # For compress in zlib
 case $SYSTEM_TYPE in
   *netware* | *modesto*)
-    AC_DEFINE(HAVE_COMPRESS)
+    AC_DEFINE(HAVE_COMPRESS, [1])
     ;;
   *)
     MYSQL_CHECK_ZLIB_WITH_COMPRESS($with_named_zlib)
@@ -832,8 +845,8 @@ int deny_severity  = 0;
 struct request_info *req;
 ],[hosts_access (req)],
         AC_MSG_RESULT(yes)
-        AC_DEFINE(LIBWRAP)
-        AC_DEFINE(HAVE_LIBWRAP)
+        AC_DEFINE([LIBWRAP], [1], [Define if you have -lwrap])
+        AC_DEFINE([HAVE_LIBWRAP], [1], [Define if have -lwrap])
 	if test "$with_libwrap" != "yes"; then
 	    WRAPLIBS="-L${with_libwrap}/lib"
 	fi
@@ -861,7 +874,10 @@ int main()
   atomic_add(5, &v);
   return atomic_read(&v) == 28 ? 0 : -1;
 }
-  ], AC_DEFINE(HAVE_ATOMIC_ADD) atom_ops="${atom_ops}atomic_add ",
+  ],
+  [AC_DEFINE([HAVE_ATOMIC_ADD], [1],
+             [atomic_add() from <asm/atomic.h> (Linux only)])
+   atom_ops="${atom_ops}atomic_add "],
   )
   AC_TRY_RUN([
 #include <asm/atomic.h>
@@ -873,7 +889,10 @@ int main()
   atomic_sub(5, &v);
   return atomic_read(&v) == 18 ? 0 : -1;
 }
-  ], AC_DEFINE(HAVE_ATOMIC_SUB) atom_ops="${atom_ops}atomic_sub ",
+  ],
+  [AC_DEFINE([HAVE_ATOMIC_SUB], [1],
+             [atomic_sub() from <asm/atomic.h> (Linux only)])
+   atom_ops="${atom_ops}atomic_sub "],
   )
 
   if test -z "$atom_ops"; then atom_ops="no"; fi
@@ -903,7 +922,7 @@ dnl I have no idea if this is a good test - can not find docs for libiberty
       with_mysqld_ldflags="-all-static"
       AC_SUBST([pstack_dirs])
       AC_SUBST([pstack_libs])
-      AC_DEFINE([USE_PSTACK])
+      AC_DEFINE([USE_PSTACK], [1], [the pstack backtrace library])
 dnl This check isn't needed, but might be nice to give some feedback....
 dnl    AC_CHECK_HEADER(libiberty.h,
 dnl      have_libiberty_h=yes,
@@ -952,7 +971,11 @@ int main()
   int8 i;
   return 0;
 }
-], AC_DEFINE(HAVE_INT_8_16_32) AC_MSG_RESULT([yes]), AC_MSG_RESULT([no])
+],
+[AC_DEFINE([HAVE_INT_8_16_32], [1],
+           [whether int8, int16 and int32 types exist])
+AC_MSG_RESULT([yes])],
+[AC_MSG_RESULT([no])]
 )
     ;;
 esac
@@ -1097,7 +1120,8 @@ case $SYSTEM_TYPE in
   *bsdi*)
     echo "Adding fix for BSDI"
     CFLAGS="$CFLAGS -D__BSD__ -DHAVE_BROKEN_REALPATH"
-    AC_DEFINE_UNQUOTED(SOCKOPT_OPTLEN_TYPE, size_t)
+    AC_DEFINE_UNQUOTED([SOCKOPT_OPTLEN_TYPE], [size_t],
+                       [Last argument to get/setsockopt])
     ;;
    *sgi-irix6*)
     if test "$with_named_thread" = "no"
@@ -1247,7 +1271,8 @@ then
     if test "$res" -gt 0
     then
       AC_MSG_RESULT("Found")
-      AC_DEFINE(HAVE_LINUXTHREADS)
+      AC_DEFINE([HAVE_LINUXTHREADS], [1],
+                [Whether we are using Xavier Leroy's LinuxThreads])
       # Linux 2.0 sanity check
       AC_TRY_COMPILE([#include <sched.h>], [int a = sched_get_priority_min(1);], ,
       AC_MSG_ERROR([Syntax error in sched.h. Change _P to __P in the /usr/include/sched.h file. See the Installation chapter in the Reference Manual]))
@@ -1270,7 +1295,8 @@ Reference Manual for more information.])
 	  with_named_thread="-lpthread -lmach -lexc"
 	  CFLAGS="$CFLAGS -D_REENTRANT"
 	  CXXFLAGS="$CXXFLAGS -D_REENTRANT"
-	  AC_DEFINE(HAVE_DEC_THREADS)
+	  AC_DEFINE(HAVE_DEC_THREADS, [1],
+                    [Whether we are using DEC threads])
 	  AC_MSG_RESULT("yes")
 	else
 	  AC_MSG_RESULT("no")
@@ -1278,8 +1304,9 @@ Reference Manual for more information.])
           if test -f /usr/shlib/libpthreads.so -a -f /usr/lib/libmach.a -a -f /usr/ccs/lib/cmplrs/cc/libexc.a
 	  then
 	    with_named_thread="-lpthreads -lmach -lc_r"
-	    AC_DEFINE(HAVE_DEC_THREADS)
-	    AC_DEFINE(HAVE_DEC_3_2_THREADS)
+	    AC_DEFINE(HAVE_DEC_THREADS, [1])
+            AC_DEFINE([HAVE_DEC_3_2_THREADS], [1],
+                      [Whether we are using OSF1 DEC threads on 3.2])
             with_osf32_threads="yes"
             MYSQLD_DEFAULT_SWITCHES="--skip-thread-priority"
 	    AC_MSG_RESULT("yes")
@@ -1353,9 +1380,9 @@ then
           fi
           if expr "$SYSTEM_TYPE" : ".*unixware7.0.0" > /dev/null
           then
-            AC_DEFINE(HAVE_UNIXWARE7_THREADS)
+            AC_DEFINE(HAVE_UNIXWARE7_THREADS, [1])
           else
-            AC_DEFINE(HAVE_UNIXWARE7_POSIX)
+            AC_DEFINE(HAVE_UNIXWARE7_POSIX, [1])
           fi
           AC_MSG_RESULT("yes")
           # We must have cc
@@ -1399,9 +1426,9 @@ then
       fi
       if expr "$SYSTEM_TYPE" : ".*unixware7.0.0" > /dev/null
       then
-        AC_DEFINE(HAVE_UNIXWARE7_THREADS)
+        AC_DEFINE(HAVE_UNIXWARE7_THREADS, [1])
       else
-        AC_DEFINE(HAVE_UNIXWARE7_POSIX)
+        AC_DEFINE(HAVE_UNIXWARE7_POSIX, [1])
       fi
       # We must have cc
       AC_MSG_CHECKING("for gcc")
@@ -1440,9 +1467,11 @@ then
       fi
       if expr "$SYSTEM_TYPE" : ".*unixware7.0.0" > /dev/null
       then
-        AC_DEFINE(HAVE_UNIXWARE7_THREADS)
+        AC_DEFINE([HAVE_UNIXWARE7_THREADS], [1],
+                  [UNIXWARE7 threads are not posix])
       else
-        AC_DEFINE(HAVE_UNIXWARE7_POSIX)
+        AC_DEFINE([HAVE_UNIXWARE7_POSIX], [1],
+                  [new UNIXWARE7 threads that are not yet posix])
       fi
       # We must have cc
       AC_MSG_CHECKING("for gcc")
@@ -1889,7 +1918,7 @@ AC_CHECK_FUNCS(alarm bcmp bfill bmove bzero chsize cuserid fchmod fcntl \
 AC_MSG_CHECKING(for isinf with <math.h>)
 AC_TRY_LINK([#include <math.h>], [float f = 0.0; isinf(f)],
  AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_ISINF,,[isinf() macro or function]),
+ AC_DEFINE(HAVE_ISINF, [1], [isinf() macro or function]),
  AC_MSG_RESULT(no))
  
 CFLAGS="$ORG_CFLAGS"
@@ -1943,7 +1972,8 @@ AC_LANG_RESTORE
 CXXFLAGS="$ac_save_CXXFLAGS"
 if test "$mysql_cv_gethost_style" = "solaris"
 then
-  AC_DEFINE(HAVE_SOLARIS_STYLE_GETHOST)
+  AC_DEFINE([HAVE_SOLARIS_STYLE_GETHOST], [1],
+            [Solaris define gethostbyaddr_r with 7 arguments. glibc2 defines this with 8 arguments])
 fi
 
 #---START: Used in for client configure
@@ -1977,7 +2007,8 @@ AC_LANG_RESTORE
 CXXFLAGS="$ac_save_CXXFLAGS"
 if test "$mysql_cv_gethostname_style" = "glibc2"
 then
-  AC_DEFINE(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE)
+  AC_DEFINE([HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE], [1],
+            [Solaris define gethostbyname_r with 5 arguments. glibc2 defines this with 6 arguments])
 fi
 
 # Check 3rd argument of getthostbyname_r
@@ -2008,7 +2039,8 @@ AC_LANG_RESTORE
 CXXFLAGS="$ac_save_CXXFLAGS"
 if test "$mysql_cv_gethostname_arg" = "hostent_data"
 then
-  AC_DEFINE(HAVE_GETHOSTBYNAME_R_RETURN_INT)
+  AC_DEFINE([HAVE_GETHOSTBYNAME_R_RETURN_INT], [1],
+            [In OSF 4.0f the 3'd argument to gethostname_r is hostent_data *])
 fi
 
 
@@ -2027,7 +2059,8 @@ pthread_getspecific((pthread_key_t) NULL); ],
 mysql_cv_getspecific_args=POSIX, mysql_cv_getspecific_args=other))
   if test "$mysql_cv_getspecific_args" = "other"
   then
-    AC_DEFINE(HAVE_NONPOSIX_PTHREAD_GETSPECIFIC)
+    AC_DEFINE([HAVE_NONPOSIX_PTHREAD_GETSPECIFIC], [1],
+              [For some non posix threads])
   fi
 
   # Check definition of pthread_mutex_init
@@ -2045,7 +2078,8 @@ mysql_cv_getspecific_args=POSIX, mysql_cv_getspecific_args=other))
 mysql_cv_mutex_init_args=POSIX, mysql_cv_mutex_init_args=other))
   if test "$mysql_cv_mutex_init_args" = "other"
   then
-    AC_DEFINE(HAVE_NONPOSIX_PTHREAD_MUTEX_INIT)
+    AC_DEFINE([HAVE_NONPOSIX_PTHREAD_MUTEX_INIT], [1],
+              [For some non posix threads])
   fi
 fi
 #---END:
@@ -2065,7 +2099,7 @@ readdir_r((DIR *) NULL, (struct dirent *) NULL, (struct dirent **) NULL); ],
 mysql_cv_readdir_r=POSIX, mysql_cv_readdir_r=other))
 if test "$mysql_cv_readdir_r" = "POSIX"
 then
-  AC_DEFINE(HAVE_READDIR_R)
+  AC_DEFINE([HAVE_READDIR_R], [1], [POSIX readdir_r])
 fi
 
 # Check definition of posix sigwait()
@@ -2085,7 +2119,7 @@ sigwait(&set,&sig);
 mysql_cv_sigwait=POSIX, mysql_cv_sigwait=other))
 if test "$mysql_cv_sigwait" = "POSIX"
 then
-  AC_DEFINE(HAVE_SIGWAIT)
+  AC_DEFINE([HAVE_SIGWAIT], [1], [POSIX sigwait])
 fi
 
 if test "$mysql_cv_sigwait" != "POSIX"
@@ -2106,7 +2140,7 @@ sigwait(&set);],
 mysql_cv_sigwait=NONPOSIX, mysql_cv_sigwait=other))
 if test "$mysql_cv_sigwait" = "NONPOSIX"
 then
-  AC_DEFINE(HAVE_NONPOSIX_SIGWAIT)
+  AC_DEFINE([HAVE_NONPOSIX_SIGWAIT], [1], [sigwait with one argument])
 fi
 fi
 #---END:
@@ -2124,7 +2158,7 @@ pthread_attr_setscope(&thr_attr,0);],
 mysql_cv_pthread_attr_setscope=yes, mysql_cv_pthread_attr_setscope=no))
 if test "$mysql_cv_pthread_attr_setscope" = "yes"
 then
-  AC_DEFINE(HAVE_PTHREAD_ATTR_SETSCOPE)
+  AC_DEFINE([HAVE_PTHREAD_ATTR_SETSCOPE], [1], [pthread_attr_setscope])
 fi
 
 # Check for bad includes
@@ -2140,7 +2174,7 @@ AC_TRY_COMPILE(
 netinet_inc=yes, netinet_inc=no)
 if test "$netinet_inc" = "no"
 then
-  AC_DEFINE(HAVE_BROKEN_NETINET_INCLUDES)
+  AC_DEFINE([HAVE_BROKEN_NETINET_INCLUDES], [1], [Can netinet be included])
 fi
 AC_MSG_RESULT("$netinet_inc")
 
@@ -2165,7 +2199,7 @@ AC_ARG_WITH(query_cache,
 
 if test "$with_query_cache" = "yes"
 then
-  AC_DEFINE(HAVE_QUERY_CACHE)
+  AC_DEFINE([HAVE_QUERY_CACHE], [1], [If we want to have query cache])
 fi
 
 AC_ARG_WITH(geometry,
@@ -2176,8 +2210,8 @@ AC_ARG_WITH(geometry,
 
 if test "$with_geometry" = "yes"
 then
-  AC_DEFINE(HAVE_SPATIAL)
-  AC_DEFINE(HAVE_RTREE_KEYS)
+  AC_DEFINE([HAVE_SPATIAL], [1], [Spatial extentions])
+  AC_DEFINE([HAVE_RTREE_KEYS], [1], [RTree keys])
 fi
 
 AC_ARG_WITH(embedded_privilege_control,
@@ -2190,7 +2224,8 @@ AC_ARG_WITH(embedded_privilege_control,
 
 if test "$with_embedded_privilege_control" = "yes"
 then
-  AC_DEFINE(HAVE_EMBEDDED_PRIVILEGE_CONTROL)
+  AC_DEFINE([HAVE_EMBEDDED_PRIVILEGE_CONTROL], [1],
+            [Access checks in embedded library])
 fi
 
 AC_ARG_WITH(extra-tools,
@@ -2300,7 +2335,7 @@ then
     readline_link="\$(top_builddir)/cmd-line-utils/libedit/liblibedit.a"
     readline_h_ln_cmd="\$(LN) -s \$(top_builddir)/cmd-line-utils/libedit/readline readline"
     compile_libedit=yes
-    AC_DEFINE_UNQUOTED(USE_LIBEDIT_INTERFACE)
+    AC_DEFINE_UNQUOTED(USE_LIBEDIT_INTERFACE, 1)
 elif test "$with_readline" = "yes"
 then
     readline_topdir="cmd-line-utils"
@@ -2309,7 +2344,7 @@ then
     readline_link="\$(top_builddir)/cmd-line-utils/readline/libreadline.a"
     readline_h_ln_cmd="\$(LN) -s \$(top_builddir)/cmd-line-utils/readline readline"
     compile_readline=yes
-    AC_DEFINE_UNQUOTED(USE_NEW_READLINE_INTERFACE)
+    AC_DEFINE_UNQUOTED(USE_NEW_READLINE_INTERFACE, 1)
 else
     MYSQL_CHECK_LIBEDIT_INTERFACE
     MYSQL_CHECK_NEW_RL_INTERFACE
@@ -2397,121 +2432,124 @@ for cs in $CHARSETS
 do
   case $cs in 
     armscii8)
-      AC_DEFINE(HAVE_CHARSET_armscii8)
+      AC_DEFINE(HAVE_CHARSET_armscii8, 1,
+                [Define to enable charset armscii8])
       ;;
     ascii)
-      AC_DEFINE(HAVE_CHARSET_ascii)
+      AC_DEFINE(HAVE_CHARSET_ascii, 1,
+                [Define to enable ascii character set])
       ;;
     big5)
-      AC_DEFINE(HAVE_CHARSET_big5)
-      AC_DEFINE(USE_MB)
-      AC_DEFINE(USE_MB_IDENT)
+      AC_DEFINE(HAVE_CHARSET_big5, 1, [Define to enable charset big5])
+      AC_DEFINE([USE_MB], [1], [Use multi-byte character routines])
+      AC_DEFINE(USE_MB_IDENT, [1], [ ])
       ;;
     binary)
       ;;
     cp1250)
-      AC_DEFINE(HAVE_CHARSET_cp1250)
+      AC_DEFINE(HAVE_CHARSET_cp1250, 1, [Define to enable cp1250])
       ;;
     cp1251)
-      AC_DEFINE(HAVE_CHARSET_cp1251)
+      AC_DEFINE(HAVE_CHARSET_cp1251, 1, [Define to enable charset cp1251])
       ;;
     cp1256)
-      AC_DEFINE(HAVE_CHARSET_cp1256)
+      AC_DEFINE(HAVE_CHARSET_cp1256, 1, [Define to enable charset cp1256])
       ;;
     cp1257)
-      AC_DEFINE(HAVE_CHARSET_cp1257)
+      AC_DEFINE(HAVE_CHARSET_cp1257, 1, [Define to enable charset cp1257])
       ;;
     cp850)
-      AC_DEFINE(HAVE_CHARSET_cp850)
+      AC_DEFINE(HAVE_CHARSET_cp850, 1, [Define to enable charset cp850])
       ;;
     cp852)
-      AC_DEFINE(HAVE_CHARSET_cp852)
+      AC_DEFINE(HAVE_CHARSET_cp852, 1, [Define to enable charset cp852])
       ;;
     cp866)
-      AC_DEFINE(HAVE_CHARSET_cp866)
+      AC_DEFINE(HAVE_CHARSET_cp866, 1, [Define to enable charset cp866])
       ;;
     dec8)
-      AC_DEFINE(HAVE_CHARSET_dec8)
+      AC_DEFINE(HAVE_CHARSET_dec8, 1, [Define to enable charset dec8])
       ;;
     euckr)
-      AC_DEFINE(HAVE_CHARSET_euckr)
-      AC_DEFINE(USE_MB)
-      AC_DEFINE(USE_MB_IDENT)
+      AC_DEFINE(HAVE_CHARSET_euckr, 1, [Define to enable charset euckr])
+      AC_DEFINE([USE_MB], [1], [Use multi-byte character routines])
+      AC_DEFINE(USE_MB_IDENT, 1)
       ;;
     gb2312)
-      AC_DEFINE(HAVE_CHARSET_gb2312)
-      AC_DEFINE(USE_MB)
-      AC_DEFINE(USE_MB_IDENT)
+      AC_DEFINE(HAVE_CHARSET_gb2312, 1, [Define to enable charset gb2312])
+      AC_DEFINE([USE_MB], 1, [Use multi-byte character routines])
+      AC_DEFINE(USE_MB_IDENT, 1)
       ;;
     gbk)
-      AC_DEFINE(HAVE_CHARSET_gbk)
-      AC_DEFINE(USE_MB)
-      AC_DEFINE(USE_MB_IDENT)
+      AC_DEFINE(HAVE_CHARSET_gbk, 1, [Define to enable charset gbk])
+      AC_DEFINE([USE_MB], [1], [Use multi-byte character routines])
+      AC_DEFINE(USE_MB_IDENT, 1)
       ;;
     geostd8)
-      AC_DEFINE(HAVE_CHARSET_geostd8)
+      AC_DEFINE(HAVE_CHARSET_geostd8, 1, [Define to enable charset geostd8])
       ;;
     greek)
-      AC_DEFINE(HAVE_CHARSET_greek)
+      AC_DEFINE(HAVE_CHARSET_greek, 1, [Define to enable charset greek])
       ;;
     hebrew)
-      AC_DEFINE(HAVE_CHARSET_hebrew)
+      AC_DEFINE(HAVE_CHARSET_hebrew, 1, [Define to enable charset hebrew])
       ;;
     hp8)
-      AC_DEFINE(HAVE_CHARSET_hp8)
+      AC_DEFINE(HAVE_CHARSET_hp8, 1, [Define to enable charset hp8])
       ;;
     keybcs2)
-      AC_DEFINE(HAVE_CHARSET_keybcs2)
+      AC_DEFINE(HAVE_CHARSET_keybcs2, 1, [Define to enable charset keybcs2])
       ;;
     koi8r)
-      AC_DEFINE(HAVE_CHARSET_koi8r)
+      AC_DEFINE(HAVE_CHARSET_koi8r, 1, [Define to enable charset koi8r])
       ;;
     koi8u)
-      AC_DEFINE(HAVE_CHARSET_koi8u)
+      AC_DEFINE(HAVE_CHARSET_koi8u, 1, [Define to enable charset koi8u])
       ;;
     latin1)
-      AC_DEFINE(HAVE_CHARSET_latin1)
+      AC_DEFINE(HAVE_CHARSET_latin1, 1, [Define to enable charset latin1])
       ;;
     latin2)
-      AC_DEFINE(HAVE_CHARSET_latin2)
+      AC_DEFINE(HAVE_CHARSET_latin2, 1, [Define to enable charset latin2])
       ;;
     latin5)
-      AC_DEFINE(HAVE_CHARSET_latin5)
+      AC_DEFINE(HAVE_CHARSET_latin5, 1, [Define to enable charset latin5])
       ;;
     latin7)
-      AC_DEFINE(HAVE_CHARSET_latin7)
+      AC_DEFINE(HAVE_CHARSET_latin7, 1, [Define to enable charset latin7])
       ;;
     macce)
-      AC_DEFINE(HAVE_CHARSET_macce)
+      AC_DEFINE(HAVE_CHARSET_macce, 1, [Define to enable charset macce])
       ;;
     macroman)
-      AC_DEFINE(HAVE_CHARSET_macroman)
+      AC_DEFINE(HAVE_CHARSET_macroman, 1,
+                [Define to enable charset macroman])
       ;;
     sjis)
-      AC_DEFINE(HAVE_CHARSET_sjis)
-      AC_DEFINE(USE_MB)
-      AC_DEFINE(USE_MB_IDENT)
+      AC_DEFINE(HAVE_CHARSET_sjis, 1, [Define to enable charset sjis])
+      AC_DEFINE([USE_MB], 1, [Use multi-byte character routines])
+      AC_DEFINE(USE_MB_IDENT, 1)
       ;;
     swe7)
-      AC_DEFINE(HAVE_CHARSET_swe7)
+      AC_DEFINE(HAVE_CHARSET_swe7, 1, [Define to enable charset swe7])
       ;;
     tis620)
-      AC_DEFINE(HAVE_CHARSET_tis620)
+      AC_DEFINE(HAVE_CHARSET_tis620, 1, [Define to enable charset tis620])
       ;;
     ucs2)
-      AC_DEFINE(HAVE_CHARSET_ucs2)
-      AC_DEFINE(USE_MB)
-      AC_DEFINE(USE_MB_IDENT)
+      AC_DEFINE(HAVE_CHARSET_ucs2, 1, [Define to enable charset ucs2])
+      AC_DEFINE([USE_MB], [1], [Use multi-byte character routines])
+      AC_DEFINE(USE_MB_IDENT, 1)
       ;;
     ujis)
-      AC_DEFINE(HAVE_CHARSET_ujis)
-      AC_DEFINE(USE_MB)
-      AC_DEFINE(USE_MB_IDENT)
+      AC_DEFINE(HAVE_CHARSET_ujis, 1, [Define to enable charset ujis])
+      AC_DEFINE([USE_MB], [1], [Use multi-byte character routines])
+      AC_DEFINE(USE_MB_IDENT, 1)
       ;;
     utf8)
-      AC_DEFINE(HAVE_CHARSET_utf8)
-      AC_DEFINE(USE_MB)
-      AC_DEFINE(USE_MB_IDENT)
+      AC_DEFINE(HAVE_CHARSET_utf8, 1, [Define to enable ut8])
+      AC_DEFINE([USE_MB], 1, [Use multi-byte character routines])
+      AC_DEFINE(USE_MB_IDENT, 1)
       ;;
     *)
       AC_MSG_ERROR([Charset '$cs' not available. (Available are: $CHARSETS_AVAILABLE).
@@ -2709,8 +2747,10 @@ else
   ]);
 fi
 
-AC_DEFINE_UNQUOTED(MYSQL_DEFAULT_CHARSET_NAME,"$default_charset")
-AC_DEFINE_UNQUOTED(MYSQL_DEFAULT_COLLATION_NAME,"$default_collation")
+AC_DEFINE_UNQUOTED([MYSQL_DEFAULT_CHARSET_NAME], ["$default_charset"],
+                   [Define the default charset name])
+AC_DEFINE_UNQUOTED([MYSQL_DEFAULT_COLLATION_NAME], ["$default_collation"],
+                   [Define the default charset name])
 
 MYSQL_CHECK_ISAM
 MYSQL_CHECK_BDB
@@ -2733,7 +2773,7 @@ if test "$THREAD_SAFE_CLIENT" != "no"
 then
   sql_client_dirs="libmysql_r $sql_client_dirs"
   linked_client_targets="$linked_client_targets linked_libmysql_r_sources"
-  AC_DEFINE(THREAD_SAFE_CLIENT)
+  AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should be client be thread safe])
 fi
 
 CLIENT_LIBS="$CLIENT_LIBS $STATIC_NSS_FLAGS"
@@ -2759,7 +2799,8 @@ ac_configure_args="$ac_configure_args CFLAGS='$CFLAGS' CXXFLAGS='$CXXFLAGS'"
 
 if test "$with_server" = "yes" -o "$THREAD_SAFE_CLIENT" != "no"
 then
-  AC_DEFINE(THREAD)
+  AC_DEFINE([THREAD], [1],
+            [Define if you want to have threaded code. This may be undef on client code])
   # Avoid _PROGRAMS names
   THREAD_LPROGRAMS="test_thr_alarm\$(EXEEXT) test_thr_lock\$(EXEEXT)"
   AC_SUBST(THREAD_LPROGRAMS)
@@ -2819,7 +2860,7 @@ dnl       echo "bdb = '$bdb'; inc = '$bdb_includes', lib = '$bdb_libs'"
       echo "END OF BERKELEY DB CONFIGURATION"
     fi
 
-    AC_DEFINE(HAVE_BERKELEY_DB)
+    AC_DEFINE([HAVE_BERKELEY_DB], [1], [Have berkeley db installed])
   else
     if test -d bdb; then :
     else
@@ -2876,7 +2917,7 @@ EOF
   then
     # MIT user level threads
     thread_dirs="mit-pthreads"
-    AC_DEFINE(HAVE_mit_thread)
+    AC_DEFINE([HAVE_mit_thread], [1], [Do we use user level threads])
     MT_INCLUDES="-I\$(top_srcdir)/mit-pthreads/include"
     AC_SUBST(MT_INCLUDES)
     if test -n "$OVERRIDE_MT_LD_ADD"
@@ -2910,7 +2951,7 @@ AC_SUBST(server_scripts)
 #if test "$with_posix_threads" = "no" -o "$with_mit_threads" = "yes"
 #then
   # MIT pthreads does now support connecting with unix sockets
-  # AC_DEFINE(HAVE_THREADS_WITHOUT_SOCKETS)
+  # AC_DEFINE([HAVE_THREADS_WITHOUT_SOCKETS], [], [MIT pthreads does not support connecting with unix sockets])
 #fi
 
 # Some usefull subst