From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 15 Jul 2002 04:14:51 +0000 (-0400)
Subject: Autoheader template conversion.
X-Git-Tag: NTP_4_1_1C_RC1~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cce0c8cd33e88edb78f9e2886234836d5fc8b256;p=thirdparty%2Fntp.git

Autoheader template conversion.

bk: 3d324c3bZYQTEKvvZ9I_LX6R5Tac6g
---

diff --git a/acconfig.h b/acconfig.h
index a53ba82e40..0a973f7b13 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,485 +1 @@
-/* debugging code */
-#undef DEBUG
-
-/* Minutes per DST adjustment */
-#undef DSTMINUTES
-
-/* MD5 authentication */
-#undef MD5
-
-/* DES authentication (COCOM only) */
-#undef DES
-
-/* time_t */
-#undef time_t
-
-/* reference clock interface */
-#undef REFCLOCK
-
-/* Audio CHU? */
-#undef AUDIO_CHU
-
-/* PARSE kernel PLL PPS support */
-#undef PPS_SYNC
-
-/* ACTS modem service */
-#undef CLOCK_ACTS
-
-/* Arbiter 1088A/B GPS receiver */
-#undef CLOCK_ARBITER
-
-/* DHD19970505: ARCRON support. */
-#undef CLOCK_ARCRON_MSF
-
-/* Austron 2200A/2201A GPS receiver */
-#undef CLOCK_AS2201
-
-/* PPS interface */
-#undef CLOCK_ATOM
-
-/* PPS auxiliary interface for ATOM */
-#undef PPS_SAMPLE
-
-/* Datum/Bancomm bc635/VME interface */
-#undef CLOCK_BANC
-
-/* Diems Computime Radio Clock */
-#undef CLOCK_COMPUTIME
-
-/* Chronolog K-series WWVB receiver */
-#undef CLOCK_CHRONOLOG
-
-/* Datum Programmable Time System */
-#undef CLOCK_DATUM
-
-/* ELV/DCF7000 clock */
-#undef CLOCK_DCF7000
-
-/* Dumb generic hh:mm:ss local clock */
-#undef CLOCK_DUMBCLOCK
-
-/* Forum Graphic GPS datating station driver */
-#undef CLOCK_FG
-
-/* TrueTime GPS receiver/VME interface */
-#undef CLOCK_GPSVME
-
-/* Heath GC-1000 WWV/WWVH receiver */
-#undef CLOCK_HEATH
-
-/* HOPF 6021 clock */
-#undef CLOCK_HOPF6021
-
-/* HOPF PCI clock device */
-#undef CLOCK_HOPF_PCI
-
-/* HOPF serial clock device*/
-#undef CLOCK_HOPF_SERIAL
-
-/* HP 58503A GPS receiver */
-#undef CLOCK_HPGPS
-
-/* Sun IRIG audio decoder */
-#undef CLOCK_IRIG
-
-/* JJY receiver */
-#undef CLOCK_JJY
-
-/* Rockwell Jupiter GPS clock */
-#undef CLOCK_JUPITER
-
-/* Leitch CSD 5300 Master Clock System Driver */
-#undef CLOCK_LEITCH
-
-/* local clock reference */
-#undef CLOCK_LOCAL
-
-/* Meinberg clocks */
-#undef CLOCK_MEINBERG
-
-/* EES M201 MSF receiver */
-#undef CLOCK_MSFEES
-
-/* Magnavox MX4200 GPS receiver */
-#undef CLOCK_MX4200
-
-/* NMEA GPS receiver */
-#undef CLOCK_NMEA
-
-/* Motorola UT Oncore GPS */
-#undef CLOCK_ONCORE
-
-/* Palisade clock */
-#undef CLOCK_PALISADE
-
-/* PARSE driver interface */
-#undef CLOCK_PARSE
-
-/* Conrad parallel port radio clock */
-#undef CLOCK_PCF
-
-/* PCL 720 clock support */
-#undef CLOCK_PPS720
-
-/* PST/Traconex 1020 WWV/WWVH receiver */
-#undef CLOCK_PST
-
-/* PTB modem service */
-#undef CLOCK_PTBACTS
-
-/* DCF77 raw time code */
-#undef CLOCK_RAWDCF
-
-/* RCC 8000 clock */
-#undef CLOCK_RCC8000
-
-/* Schmid DCF77 clock */
-#undef CLOCK_SCHMID
-
-/* clock thru shared memory */
-#undef CLOCK_SHM
-
-/* Spectracom 8170/Netclock/2 WWVB receiver */
-#undef CLOCK_SPECTRACOM
-
-/* KSI/Odetics TPRO/S GPS receiver/IRIG interface */
-#undef CLOCK_TPRO
-
-/* TRAK 8810 GPS receiver */
-#undef CLOCK_TRAK
-
-/* Trimble GPS receiver/TAIP protocol */
-#undef CLOCK_TRIMTAIP
-
-/* Trimble GPS receiver/TSIP protocol */
-#undef CLOCK_TRIMTSIP
-
-/* Kinemetrics/TrueTime receivers */
-#undef CLOCK_TRUETIME
-
-/* Ultralink M320 WWVB receiver */
-#undef CLOCK_ULINK
-
-/* USNO modem service */
-#undef CLOCK_USNO
-
-/* WHARTON 400A Series protocol */
-#undef CLOCK_WHARTON_400A
-
-/* WWV audio driver */
-#undef CLOCK_WWV
-
-/* VARITEXT protocol */
-#undef CLOCK_VARITEXT
-
-/* define if we need to declare int errno; */
-#undef DECL_ERRNO
-
-/* define if we may declare int h_errno; */
-#undef DECL_H_ERRNO
-
-/* define if it's OK to declare char *sys_errlist[]; */
-#undef CHAR_SYS_ERRLIST
-
-/* define if it's OK to declare int syscall P((int, struct timeval *, struct timeval *)); */
-#undef DECL_SYSCALL
-
-/* define if we have syscall is buggy (Solaris 2.4) */
-#undef SYSCALL_BUG
-
-/* Do we need extra room for SO_RCVBUF? (HPUX <8) */
-#undef NEED_RCVBUF_SLOP
-
-/* Should we open the broadcast socket? */
-#undef OPEN_BCAST_SOCKET
-
-/* Do we want the HPUX FindConfig()? */
-#undef NEED_HPUX_FINDCONFIG
-
-/* canonical system (cpu-vendor-os) string */
-#undef STR_SYSTEM
-
-/* define if NetInfo support is available */
-#undef HAVE_NETINFO
-
-/* define if [gs]ettimeofday() only takes 1 argument */
-#undef SYSV_TIMEOFDAY
-
-/* define if struct sockaddr has sa_len */
-#undef HAVE_SA_LEN_IN_STRUCT_SOCKADDR
-
-/* define if struct clockinfo has hz */
-#undef HAVE_HZ_IN_STRUCT_CLOCKINFO
-
-/* define if struct sigaction has sa_sigaction */
-#undef HAVE_SA_SIGACTION_IN_STRUCT_SIGACTION
-
-/* define if struct clockinfo has tickadj */
-#undef HAVE_TICKADJ_IN_STRUCT_CLOCKINFO
-
-/* define if struct ntptimeval uses time.tv_nsec instead of time.tv_usec */ 
-#undef HAVE_TV_NSEC_IN_NTPTIMEVAL 
-
-/* Does a system header defind struct ppsclockev? */
-#undef HAVE_STRUCT_PPSCLOCKEV
-
-/* define if function prototypes are OK */
-#undef HAVE_PROTOTYPES
-
-/* define if setpgrp takes 0 arguments */
-#undef HAVE_SETPGRP_0
-
-/* hardwire a value for tick? */
-#undef PRESET_TICK
-
-/* hardwire a value for tickadj? */
-#undef PRESET_TICKADJ
-
-/* is adjtime() accurate? */
-#undef ADJTIME_IS_ACCURATE
-
-/* should we NOT read /dev/kmem? */
-#undef NOKMEM
-
-/* use UDP Wildcard Delivery? */
-#undef UDP_WILDCARD_DELIVERY
-
-/* always slew the clock? */
-#undef SLEWALWAYS
-
-/* step, then slew the clock? */
-#undef STEP_SLEW
-
-/* force ntpdate to step the clock if !defined(STEP_SLEW) ? */
-#undef FORCE_NTPDATE_STEP
-
-/* synch TODR hourly? */
-#undef DOSYNCTODR
-
-/* do we set process groups with -pid? */
-#undef UDP_BACKWARDS_SETOWN
-
-/* must we have a CTTY for fsetown? */
-#undef USE_FSETOWNCTTY
-
-/* can we use SIGIO for tcp and udp IO? */
-#undef HAVE_SIGNALED_IO
-
-/* can we use SIGPOLL for UDP? */
-#undef USE_UDP_SIGPOLL
-
-/* can we use SIGPOLL for tty IO? */
-#undef USE_TTY_SIGPOLL
-
-/* should we use clock_settime()? */
-#undef USE_CLOCK_SETTIME
-
-/* do we want the CHU driver? */
-#undef CLOCK_CHU
-
-/* do we have the ppsclock streams module? */
-#undef PPS
-
-/* do we have the tty_clk line discipline/streams module? */
-#undef TTYCLK
-
-/* does the kernel support precision time discipline? */
-#undef KERNEL_PLL
-
-/* does the kernel support multicasting IP? */
-#undef MCAST
-
-/* do we have ntp_{adj,get}time in libc? */
-#undef NTP_SYSCALLS_LIBC
-
-/* do we have ntp_{adj,get}time in the kernel? */
-#undef NTP_SYSCALLS_STD
-
-/* do we have STREAMS/TLI? (Can we replace this with HAVE_SYS_STROPTS_H? */
-#undef STREAMS_TLI
-
-/* do we need an s_char typedef? */
-#undef NEED_S_CHAR_TYPEDEF
-
-/* include the GDT Surveying code? */
-#undef GDT_SURVEYING
-
-/* does SIOCGIFCONF return size in the buffer? */
-#undef SIZE_RETURNED_IN_BUFFER
-
-/* what is the name of TICK in the kernel? */
-#undef K_TICK_NAME
-
-/* Is K_TICK_NAME (nsec_per_tick, for example) in nanoseconds? */
-#undef TICK_NANO
-
-/* what is the name of TICKADJ in the kernel? */
-#undef K_TICKADJ_NAME
-
-/* Is K_TICKADJ_NAME (hrestime_adj, for example) in nanoseconds? */
-#undef TICKADJ_NANO
-
-/* what is (probably) the name of DOSYNCTODR in the kernel? */
-#undef K_DOSYNCTODR_NAME
-
-/* what is (probably) the name of NOPRINTF in the kernel? */
-#undef K_NOPRINTF_NAME
-
-/* do we need HPUX adjtime() library support? */
-#undef NEED_HPUX_ADJTIME
-
-/* Might nlist() values require an extra level of indirection (AIX)? */
-#undef NLIST_EXTRA_INDIRECTION
-
-/* Other needed NLIST stuff */
-#undef NLIST_STRUCT
-#undef NLIST_NAME_UNION
-
-/* Should we recommend a minimum value for tickadj? */
-#undef MIN_REC_TICKADJ
-
-/* Is there a problem using PARENB and IGNPAR (IRIX)? */
-#undef NO_PARENB_IGNPAR
-
-/* Should we not IGNPAR (Linux)? */
-#undef RAWDCF_NO_IGNPAR
-
-/* Does the compiler like "volatile"? */
-#undef volatile
-
-/* Does qsort expect to work on "void *" stuff? */
-#undef QSORT_USES_VOID_P
-
-/* What is the fallback value for HZ? */
-#undef DEFAULT_HZ
-
-/* Do we need to override the system's idea of HZ? */
-#undef OVERRIDE_HZ
-
-/* Do we want the SCO clock hacks? */
-#undef SCO5_CLOCK
-
-/* Do we want the ReliantUNIX clock hacks? */
-#undef RELIANTUNIX_CLOCK
-
-/* Does the kernel have an FLL bug? */
-#undef KERNEL_FLL_BUG
-
-/* Define if you have the TIOCGPPSEV ioctl (Solaris) */
-#undef HAVE_TIOCGPPSEV
-
-/* Define if you have the TIOCSPPS ioctl (Solaris) */
-#undef HAVE_TIOCSPPS
-
-/* Define if you have the CIOGETEV ioctl (SunOS, Linux) */
-#undef HAVE_CIOGETEV
-
-/* Define if you have the TIOCGSERIAL, TIOCSSERIAL, ASYNC_PPS_CD_POS, and ASYNC_PPS_CD_NEG ioctls (linux) */
-#undef HAVE_TIO_SERIAL_STUFF
-
-/* Define if you have the interface in the Draft RFC */
-#undef HAVE_PPSAPI
-
-/* Do we need to #define _SVID3 when we #include <termios.h>? */
-#undef TERMIOS_NEEDS__SVID3
-
-/* Do we have support for SHMEM_STATUS? */
-#undef ONCORE_SHMEM_STATUS
-
-/***/
-
-/* Which way should we declare... */
-
-/* adjtime()? */
-#undef DECL_ADJTIME_0
-
-/* bcopy()? */
-#undef DECL_BCOPY_0
-
-/* bzero()? */
-#undef DECL_BZERO_0
-
-/* cfset[io]speed()? */
-#undef DECL_CFSETISPEED_0
-
-/* hstrerror()? */
-#undef DECL_HSTRERROR_0
-
-/* inet_ntoa()? */
-#undef DECL_INET_NTOA_0
-
-/* ioctl()? */
-#undef DECL_IOCTL_0
-
-/* IPC? (bind, connect, recvfrom, sendto, setsockopt, socket) */
-#undef DECL_IPC_0
-
-/* memmove()? */
-#undef DECL_MEMMOVE_0
-
-/* memset()? */
-#undef DECL_MEMSET_0
-
-/* mkstemp()? */
-#undef DECL_MKSTEMP_0
-
-/* mktemp()? */
-#undef DECL_MKTEMP_0
-
-/* mrand48()? */
-#undef DECL_MRAND48_0
-
-/* nlist()? */
-#undef DECL_NLIST_0
-
-/* plock()? */
-#undef DECL_PLOCK_0
-
-/* rename()? */
-#undef DECL_RENAME_0
-
-/* select()? */
-#undef DECL_SELECT_0
-
-/* setitimer()? */
-#undef DECL_SETITIMER_0
-
-/* setpriority()? */
-#undef DECL_SETPRIORITY_0
-#undef DECL_SETPRIORITY_1
-
-/* sigvec()? */
-#undef DECL_SIGVEC_0
-
-/* srand48()? */
-#undef DECL_SRAND48_0
-
-/* stdio stuff? */
-#undef DECL_STDIO_0
-
-/* stime()? */
-#undef DECL_STIME_0
-#undef DECL_STIME_1
-
-/* strtol()? */
-#undef DECL_STRTOL_0
-
-/* syslog() stuff? */
-#undef DECL_SYSLOG_0
-
-/* time()? */
-#undef DECL_TIME_0
-
-/* [gs]ettimeofday()? */
-#undef DECL_TIMEOFDAY_0
-
-/* tolower()? */
-#undef DECL_TOLOWER_0
-
-/* toupper()? */
-#undef DECL_TOUPPER_0
-
-/* strerror()? */
-#undef DECL_STRERROR_0
-
 #undef ULONG_CONST
diff --git a/configure.in b/configure.in
index e8c49696b2..8503d6cded 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl -*-fundamental-*-
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(ntpd/ntp_refclock.c)
 AC_CANONICAL_SYSTEM
-AC_DEFINE_UNQUOTED(STR_SYSTEM, "$host")
+AC_DEFINE_UNQUOTED(STR_SYSTEM, "$host", [canonical system (cpu-vendor-os) string])
 AM_CONFIG_HEADER(config.h)
 AC_ARG_PROGRAM
 AM_INIT_AUTOMAKE(ntp, 4.1.1a)
@@ -229,7 +229,7 @@ AC_CHECK_HEADERS(poll.h resolv.h sched.h sgtty.h stdlib.h string.h termio.h)
 AC_CHECK_HEADERS(termios.h timepps.h timex.h unistd.h utmp.h utmpx.h)
 AC_CHECK_HEADERS(arpa/nameser.h net/if.h netinet/in_system.h)
 AC_CHECK_HEADERS(netinet/in_systm.h netinet/in.h netinet/ip.h)
-AC_CHECK_HEADERS(netinfo/ni.h, [AC_DEFINE(HAVE_NETINFO)])
+AC_CHECK_HEADERS(netinfo/ni.h, [AC_DEFINE(HAVE_NETINFO, 1, [NetInfo support?])])
 AC_CHECK_HEADERS(sun/audioio.h sys/audioio.h)
 dnl AC_CHECK_HEADERS(sys/chudefs.h)
 AC_CHECK_HEADERS(sys/clkdefs.h sys/file.h)
@@ -268,13 +268,13 @@ case "$host" in
 esac
 
 AC_CHECK_HEADER(nlist.h,
-[AC_DEFINE(NLIST_STRUCT)
+[AC_DEFINE(NLIST_STRUCT, 1, [nlist stuff])
 AC_CACHE_CHECK([for n_un in struct nlist], ac_cv_struct_nlist_n_un,
 [AC_TRY_COMPILE([#include <nlist.h>],
 [struct nlist n; n.n_un.n_name = 0;],
 ac_cv_struct_nlist_n_un=yes, ac_cv_struct_nlist_n_un=no)])
 if test $ac_cv_struct_nlist_n_un = yes; then
-  AC_DEFINE(NLIST_NAME_UNION)
+  AC_DEFINE(NLIST_NAME_UNION, 1, [does struct nlist use a name union?])
 fi
 ])dnl
 
@@ -287,7 +287,7 @@ volatile int x;],
 case "$ac_cv_c_volatile" in
  yes)
     ;;
- *) AC_DEFINE(volatile,)
+ *) AC_DEFINE(volatile, , [Does the compiler like "volatile"?])
     ;;
 esac
 
@@ -306,7 +306,7 @@ int foo(short i) { return i; }],[
 int i;], ac_cv_have_prototypes=yes, ac_cv_have_prototypes=no)
 ])
 if test "$ac_cv_have_prototypes" = yes; then
-  AC_DEFINE(HAVE_PROTOTYPES)
+  AC_DEFINE(HAVE_PROTOTYPES, 1, [Are function prototypes OK?])
 fi
 
 AC_C_CONST
@@ -342,7 +342,7 @@ case "$host" in
     ac_cv_var_default_hz=256
     ;;
 esac])
-AC_DEFINE_UNQUOTED(DEFAULT_HZ, $ac_cv_var_default_hz)
+AC_DEFINE_UNQUOTED(DEFAULT_HZ, $ac_cv_var_default_hz, [What is the fallback value for HZ?])
 
 AC_CACHE_CHECK(if we need to override the system's value for HZ, ac_cv_var_override_hz,
 [ac_cv_var_override_hz=no
@@ -362,7 +362,7 @@ case "$host" in
 esac])
 case "$ac_cv_var_override_hz" in
  yes)
-    AC_DEFINE(OVERRIDE_HZ)
+    AC_DEFINE(OVERRIDE_HZ, 1, [Do we need to override the system's idea of HZ?])
     ;;
 esac
 
@@ -401,7 +401,7 @@ AC_CACHE_CHECK(
   ]
 )
 if test $ac_cv_struct_sigaction_has_sa_sigaction = yes; then
-  AC_DEFINE(HAVE_SA_SIGACTION_IN_STRUCT_SIGACTION)
+  AC_DEFINE(HAVE_SA_SIGACTION_IN_STRUCT_SIGACTION, 1, [Obvious...])
 fi
 
 AC_CACHE_CHECK(for struct ppsclockev, ac_cv_struct_ppsclockev,
@@ -422,7 +422,7 @@ return pce->serial;],
 	ac_cv_struct_ppsclockev=no)
 ])
 if test $ac_cv_struct_ppsclockev = yes; then
-    AC_DEFINE(HAVE_STRUCT_PPSCLOCKEV)
+    AC_DEFINE(HAVE_STRUCT_PPSCLOCKEV, 1, [Does a system header define struct ppsclockev?])
 fi
 
 AC_CACHE_CHECK(struct sockaddr for sa_len, ac_cv_struct_sockaddr_has_sa_len,
@@ -435,7 +435,7 @@ return ps->sa_len;],
 	ac_cv_struct_sockaddr_has_sa_len=no)
 ])
 if test $ac_cv_struct_sockaddr_has_sa_len = yes; then
-    AC_DEFINE(HAVE_SA_LEN_IN_STRUCT_SOCKADDR)
+    AC_DEFINE(HAVE_SA_LEN_IN_STRUCT_SOCKADDR, 1, [Should be obvious...])
 fi
 
 case "$ac_cv_header_machine_soundcard_h$ac_cv_header_sys_soundcard_h" in
@@ -468,7 +468,7 @@ return pc->hz;],
 	ac_cv_struct_clockinfo_has_hz=no)
 ])
 if test $ac_cv_struct_clockinfo_has_hz = yes; then
-    AC_DEFINE(HAVE_HZ_IN_STRUCT_CLOCKINFO)
+    AC_DEFINE(HAVE_HZ_IN_STRUCT_CLOCKINFO, 1, [Obvious...])
 fi
 
 AC_CACHE_CHECK(struct clockinfo for tickadj, ac_cv_struct_clockinfo_has_tickadj,
@@ -480,7 +480,7 @@ return pc->tickadj;],
 	ac_cv_struct_clockinfo_has_tickadj=no)
 ])
 if test $ac_cv_struct_clockinfo_has_tickadj = yes; then
-    AC_DEFINE(HAVE_TICKADJ_IN_STRUCT_CLOCKINFO)
+    AC_DEFINE(HAVE_TICKADJ_IN_STRUCT_CLOCKINFO, 1, [Obvious...])
 fi
 
 AC_CACHE_CHECK([for struct timespec], ac_cv_struct_timespec,
@@ -539,7 +539,7 @@ case "$ac_cv_c_char_unsigned$ac_cv_sizeof_signed_char$ac_cv_type_s_char" in
     ;;
  no0no)
     # We have signed chars, can't say 'signed char', no s_char typedef.
-    AC_DEFINE(NEED_S_CHAR_TYPEDEF)
+    AC_DEFINE(NEED_S_CHAR_TYPEDEF, 1, [Do we need an s_char typedef?])
     ;;
  no1no)
     # We have signed chars, can say 'signed char', no s_char typedef.
@@ -689,7 +689,7 @@ settimeofday((struct timeval*)0,(struct timezone*)0);
 	ac_cv_func_Xettimeofday_nargs=2, ac_cv_func_Xettimeofday_nargs=1)
 ])
 if test $ac_cv_func_Xettimeofday_nargs = 1; then
-	AC_DEFINE(SYSV_TIMEOFDAY)
+	AC_DEFINE(SYSV_TIMEOFDAY, 1, [Does Xettimeofday take 1 arg?])
 fi
 
 AC_CACHE_CHECK(number of arguments taken by setpgrp(), ac_cv_func_setpgrp_nargs,
@@ -704,7 +704,7 @@ AC_CACHE_CHECK(number of arguments taken by setpgrp(), ac_cv_func_setpgrp_nargs,
         ac_cv_func_setpgrp_nargs=2, ac_cv_func_setpgrp_nargs=0)
 ])
 if test $ac_cv_func_setpgrp_nargs = 0; then
-        AC_DEFINE(HAVE_SETPGRP_0)
+        AC_DEFINE(HAVE_SETPGRP_0, 1, [define if setpgrp takes 0 arguments])
 fi
 
 save_CFLAGS=$CFLAGS
@@ -733,7 +733,7 @@ qsort(base, 2, sizeof(char *), sortfunc);
 ])
 case "$ac_cv_func_qsort_argtype" in
  void)
-    AC_DEFINE(QSORT_USES_VOID_P)
+    AC_DEFINE(QSORT_USES_VOID_P, 1, [Does qsort expect to work on "void *" stuff?])
     ;;
 esac
 
@@ -746,7 +746,7 @@ AC_CACHE_CHECK(if we need to declare 'errno', ac_cv_decl_errno,
   [errno = 0;],
   ac_cv_decl_errno=no, ac_cv_decl_errno=yes)])
 case "$ac_cv_decl_errno" in
- yes) AC_DEFINE(DECL_ERRNO) ;;
+ yes) AC_DEFINE(DECL_ERRNO, 1, [Declare errno?]) ;;
 esac
 
 dnl FIXME: from ntpd/ntp_intres.c, but there's no info which header produces
@@ -774,7 +774,7 @@ AC_CACHE_CHECK(if we may declare 'h_errno', ac_cv_decl_h_errno,
   [extern int h_errno;],
   ac_cv_decl_h_errno=yes, ac_cv_decl_h_errno=no)])
 case "$ac_cv_decl_h_errno" in
- yes) AC_DEFINE(DECL_H_ERRNO) ;;
+ yes) AC_DEFINE(DECL_H_ERRNO, 1, [Declare h_errno?]) ;;
 esac
 
 dnl See if char *sys_errlist[] is OK.
@@ -787,7 +787,7 @@ AC_CACHE_CHECK([[if declaring 'char *sys_errlist[]' is ok]], ac_cv_decl_sys_errl
 ],
   ac_cv_decl_sys_errlist=yes, ac_cv_decl_sys_errlist=no)])
 case "$ac_cv_decl_sys_errlist" in
- yes) AC_DEFINE(CHAR_SYS_ERRLIST) ;;
+ yes) AC_DEFINE(CHAR_SYS_ERRLIST, 1, [Declare char *sys_errlist array]) ;;
 esac
 
 AC_CACHE_CHECK(if declaring 'syscall()' is ok, ac_cv_decl_syscall,
@@ -807,110 +807,110 @@ AC_CACHE_CHECK(if declaring 'syscall()' is ok, ac_cv_decl_syscall,
   [extern int syscall P((int, ...));],
   ac_cv_decl_syscall=yes, ac_cv_decl_syscall=no)])
 case "$ac_cv_decl_syscall" in
- yes) AC_DEFINE(DECL_SYSCALL) ;;
+ yes) AC_DEFINE(DECL_SYSCALL, 1, [Declare syscall()?]) ;;
 esac
 
 case "$host" in
  *-*-aix4.3.*)
-    AC_DEFINE(DECL_HSTRERROR_0)		# Needed for XLC under AIX 4.3.2
+    AC_DEFINE(DECL_HSTRERROR_0, 1, [Declaration style])		# Needed for XLC under AIX 4.3.2
     ;;
  *-*-mpeix*)
-    AC_DEFINE(DECL_ADJTIME_0)
-    AC_DEFINE(DECL_INET_NTOA_0)
-    AC_DEFINE(DECL_MKTEMP_0)
-    AC_DEFINE(DECL_MRAND48_0)
-    AC_DEFINE(DECL_SELECT_0)
-    AC_DEFINE(DECL_SETITIMER_0)
-    AC_DEFINE(DECL_SRAND48_0)
-    AC_DEFINE(DECL_SYSLOG_0)
-    AC_DEFINE(DECL_TIMEOFDAY_0)
+    AC_DEFINE(DECL_ADJTIME_0, 1, [Declaration style])
+    AC_DEFINE(DECL_INET_NTOA_0, 1, [Declaration style])
+    AC_DEFINE(DECL_MKTEMP_0, 1, [Declaration style])
+    AC_DEFINE(DECL_MRAND48_0, 1, [Declaration style])
+    AC_DEFINE(DECL_SELECT_0, 1, [Declaration style])
+    AC_DEFINE(DECL_SETITIMER_0, 1, [Declaration style])
+    AC_DEFINE(DECL_SRAND48_0, 1, [Declaration style])
+    AC_DEFINE(DECL_SYSLOG_0, 1, [Declaration style])
+    AC_DEFINE(DECL_TIMEOFDAY_0, 1, [Declaration style])
     ;;
  *-*-osf[[45]]*)
-    AC_DEFINE(DECL_PLOCK_0)
-    AC_DEFINE(DECL_STIME_1)
+    AC_DEFINE(DECL_PLOCK_0, 1, [Declaration style])
+    AC_DEFINE(DECL_STIME_1, 1, [Declaration style])
     ;;
  *-*-qnx*)
-    AC_DEFINE(DECL_ADJTIME_0)
+    AC_DEFINE(DECL_ADJTIME_0, 1, [Declaration style])
     ;;
  *-*-riscos4*)
-    AC_DEFINE(DECL_ADJTIME_0)
-    AC_DEFINE(DECL_BZERO_0)
-    AC_DEFINE(DECL_IOCTL_0)
-    AC_DEFINE(DECL_IPC_0)
-    AC_DEFINE(DECL_MEMMOVE_0)
-    AC_DEFINE(DECL_MKTEMP_0)
-    AC_DEFINE(DECL_RENAME_0)
-    AC_DEFINE(DECL_SELECT_0)
-    AC_DEFINE(DECL_SETITIMER_0)
-    AC_DEFINE(DECL_SETPRIORITY_0)
-    AC_DEFINE(DECL_STDIO_0)
-    AC_DEFINE(DECL_STRTOL_0)
-    AC_DEFINE(DECL_SYSLOG_0)
-    AC_DEFINE(DECL_TIME_0)
-    AC_DEFINE(DECL_TIMEOFDAY_0)
-    AC_DEFINE(DECL_TOLOWER_0)
+    AC_DEFINE(DECL_ADJTIME_0, 1, [Declaration style])
+    AC_DEFINE(DECL_BZERO_0, 1, [Declaration style])
+    AC_DEFINE(DECL_IOCTL_0, 1, [Declaration style])
+    AC_DEFINE(DECL_IPC_0, 1, [Declaration style])
+    AC_DEFINE(DECL_MEMMOVE_0, 1, [Declaration style])
+    AC_DEFINE(DECL_MKTEMP_0, 1, [Declaration style])
+    AC_DEFINE(DECL_RENAME_0, 1, [Declaration style])
+    AC_DEFINE(DECL_SELECT_0, 1, [Declaration style])
+    AC_DEFINE(DECL_SETITIMER_0, 1, [Declaration style])
+    AC_DEFINE(DECL_SETPRIORITY_0, 1, [Declaration style])
+    AC_DEFINE(DECL_STDIO_0, 1, [Declaration style])
+    AC_DEFINE(DECL_STRTOL_0, 1, [Declaration style])
+    AC_DEFINE(DECL_SYSLOG_0, 1, [Declaration style])
+    AC_DEFINE(DECL_TIME_0, 1, [Declaration style])
+    AC_DEFINE(DECL_TIMEOFDAY_0, 1, [Declaration style])
+    AC_DEFINE(DECL_TOLOWER_0, 1, [Declaration style])
     ;;
  *-*-solaris2*)
-    AC_DEFINE(DECL_MKSTEMP_0)
-    AC_DEFINE(DECL_SETPRIORITY_1)
+    AC_DEFINE(DECL_MKSTEMP_0, 1, [Declaration style])
+    AC_DEFINE(DECL_SETPRIORITY_1, 1, [Declaration style])
     case "$host" in
      *-*-solaris2.4)
-        AC_DEFINE(DECL_TIMEOFDAY_0)
+        AC_DEFINE(DECL_TIMEOFDAY_0, 1, [Declaration style])
 	;;
     esac
     ;;
  *-*-sunos4*)
-    AC_DEFINE(DECL_ADJTIME_0)
-    AC_DEFINE(DECL_BCOPY_0)
-    AC_DEFINE(DECL_BZERO_0)
-    AC_DEFINE(DECL_IOCTL_0)
-    AC_DEFINE(DECL_IPC_0)
-    AC_DEFINE(DECL_MEMMOVE_0)
-    AC_DEFINE(DECL_MKTEMP_0)
-    AC_DEFINE(DECL_MKSTEMP_0)
-    AC_DEFINE(DECL_MRAND48_0)
-    AC_DEFINE(DECL_RENAME_0)
-    AC_DEFINE(DECL_SELECT_0)
-    AC_DEFINE(DECL_SETITIMER_0)
-    AC_DEFINE(DECL_SETPRIORITY_0)
-    AC_DEFINE(DECL_SIGVEC_0)
-    AC_DEFINE(DECL_SRAND48_0)
+    AC_DEFINE(DECL_ADJTIME_0, 1, [Declaration style])
+    AC_DEFINE(DECL_BCOPY_0, 1, [Declaration style])
+    AC_DEFINE(DECL_BZERO_0, 1, [Declaration style])
+    AC_DEFINE(DECL_IOCTL_0, 1, [Declaration style])
+    AC_DEFINE(DECL_IPC_0, 1, [Declaration style])
+    AC_DEFINE(DECL_MEMMOVE_0, 1, [Declaration style])
+    AC_DEFINE(DECL_MKTEMP_0, 1, [Declaration style])
+    AC_DEFINE(DECL_MKSTEMP_0, 1, [Declaration style])
+    AC_DEFINE(DECL_MRAND48_0, 1, [Declaration style])
+    AC_DEFINE(DECL_RENAME_0, 1, [Declaration style])
+    AC_DEFINE(DECL_SELECT_0, 1, [Declaration style])
+    AC_DEFINE(DECL_SETITIMER_0, 1, [Declaration style])
+    AC_DEFINE(DECL_SETPRIORITY_0, 1, [Declaration style])
+    AC_DEFINE(DECL_SIGVEC_0, 1, [Declaration style])
+    AC_DEFINE(DECL_SRAND48_0, 1, [Declaration style])
     case "`basename $ac_cv_prog_CC`" in
      acc*) ;;
-     *) AC_DEFINE(DECL_STDIO_0)
+     *) AC_DEFINE(DECL_STDIO_0, 1, [Declaration style])
 	;;
     esac
-    AC_DEFINE(DECL_STRTOL_0)
-    AC_DEFINE(DECL_SYSLOG_0)
-    AC_DEFINE(DECL_TIME_0)
-    AC_DEFINE(DECL_TIMEOFDAY_0)
-    AC_DEFINE(DECL_TOLOWER_0)
-    AC_DEFINE(DECL_TOUPPER_0)
-    AC_DEFINE(DECL_STRERROR_0)
+    AC_DEFINE(DECL_STRTOL_0, 1, [Declaration style])
+    AC_DEFINE(DECL_SYSLOG_0, 1, [Declaration style])
+    AC_DEFINE(DECL_TIME_0, 1, [Declaration style])
+    AC_DEFINE(DECL_TIMEOFDAY_0, 1, [Declaration style])
+    AC_DEFINE(DECL_TOLOWER_0, 1, [Declaration style])
+    AC_DEFINE(DECL_TOUPPER_0, 1, [Declaration style])
+    AC_DEFINE(DECL_STRERROR_0, 1, [Declaration style])
     ;;
  *-*-ultrix4*)
-    AC_DEFINE(DECL_ADJTIME_0)
-    AC_DEFINE(DECL_BZERO_0)
-    AC_DEFINE(DECL_CFSETISPEED_0)
-    AC_DEFINE(DECL_IOCTL_0)
-    AC_DEFINE(DECL_IPC_0)
-    AC_DEFINE(DECL_MKTEMP_0)
-    AC_DEFINE(DECL_MRAND48_0)
-    AC_DEFINE(DECL_NLIST_0)
-    AC_DEFINE(DECL_PLOCK_0)
-    AC_DEFINE(DECL_SELECT_0)
-    AC_DEFINE(DECL_SETITIMER_0)
-    AC_DEFINE(DECL_SETPRIORITY_0)
-    AC_DEFINE(DECL_SRAND48_0)
-    AC_DEFINE(DECL_STIME_0)
-    AC_DEFINE(DECL_SYSLOG_0)
-    AC_DEFINE(DECL_TIMEOFDAY_0)
+    AC_DEFINE(DECL_ADJTIME_0, 1, [Declaration style])
+    AC_DEFINE(DECL_BZERO_0, 1, [Declaration style])
+    AC_DEFINE(DECL_CFSETISPEED_0, 1, [Declaration style])
+    AC_DEFINE(DECL_IOCTL_0, 1, [Declaration style])
+    AC_DEFINE(DECL_IPC_0, 1, [Declaration style])
+    AC_DEFINE(DECL_MKTEMP_0, 1, [Declaration style])
+    AC_DEFINE(DECL_MRAND48_0, 1, [Declaration style])
+    AC_DEFINE(DECL_NLIST_0, 1, [Declaration style])
+    AC_DEFINE(DECL_PLOCK_0, 1, [Declaration style])
+    AC_DEFINE(DECL_SELECT_0, 1, [Declaration style])
+    AC_DEFINE(DECL_SETITIMER_0, 1, [Declaration style])
+    AC_DEFINE(DECL_SETPRIORITY_0, 1, [Declaration style])
+    AC_DEFINE(DECL_SRAND48_0, 1, [Declaration style])
+    AC_DEFINE(DECL_STIME_0, 1, [Declaration style])
+    AC_DEFINE(DECL_SYSLOG_0, 1, [Declaration style])
+    AC_DEFINE(DECL_TIMEOFDAY_0, 1, [Declaration style])
     ;;
 esac
 
 case "$host" in
  *-*-sco3.2*)
-    AC_DEFINE(TERMIOS_NEEDS__SVID3)
+    AC_DEFINE(TERMIOS_NEEDS__SVID3, 1, [Do we need to #define _SVID3 when we #include <termios.h>?])
     ;;
 esac
 
@@ -927,7 +927,7 @@ case "$host" in
 esac
 ac_cv_var_rcvbuf_slop=$ans])
 case "$ac_cv_var_rcvbuf_slop" in
- yes) AC_DEFINE(NEED_RCVBUF_SLOP) ;;
+ yes) AC_DEFINE(NEED_RCVBUF_SLOP, 1, [Do we need extra room for SO_RCVBUF? (HPUX <8)]) ;;
 esac
 
 AC_CACHE_CHECK(if we will open the broadcast socket, ac_cv_var_open_bcast_socket,
@@ -942,7 +942,7 @@ case "$host" in
 esac
 ac_cv_var_open_bcast_socket=$ans])
 case "$ac_cv_var_open_bcast_socket" in
- yes) AC_DEFINE(OPEN_BCAST_SOCKET) ;;
+ yes) AC_DEFINE(OPEN_BCAST_SOCKET, 1, [Should we open the broadcast socket?]) ;;
 esac
 
 AC_CACHE_CHECK(if we want the HPUX version of FindConfig(), ac_cv_var_hpux_findconfig,
@@ -954,7 +954,7 @@ case "$host" in
 esac
 ac_cv_var_hpux_findconfig=$ans])
 case "$ac_cv_var_hpux_findconfig" in
- yes) AC_DEFINE(NEED_HPUX_FINDCONFIG) ;;
+ yes) AC_DEFINE(NEED_HPUX_FINDCONFIG, 1, [Do we want the HPUX FindConfig()?]) ;;
 esac
 
 AC_CACHE_CHECK(if process groups are set with -pid, ac_cv_arg_setpgrp_negpid,
@@ -980,7 +980,7 @@ AC_CACHE_CHECK(if process groups are set with -pid, ac_cv_arg_setpgrp_negpid,
 esac
 ac_cv_arg_setpgrp_negpid=$ans])
 case "$ac_cv_arg_setpgrp_negpid" in
- yes) AC_DEFINE(UDP_BACKWARDS_SETOWN) ;;
+ yes) AC_DEFINE(UDP_BACKWARDS_SETOWN, 1, [Do we set process groups with -pid?]) ;;
 esac
 
 AC_CACHE_CHECK(if we need a ctty for F_SETOWN, ac_cv_func_ctty_for_f_setown,
@@ -1005,7 +1005,7 @@ AC_CACHE_CHECK(if we need a ctty for F_SETOWN, ac_cv_func_ctty_for_f_setown,
 esac
 ac_cv_func_ctty_for_f_setown=$ans])
 case "$ac_cv_func_ctty_for_f_setown" in
- yes) AC_DEFINE(USE_FSETOWNCTTY) ;;
+ yes) AC_DEFINE(USE_FSETOWNCTTY, 1, [Must we have a CTTY for fsetown?]) ;;
 esac
 
 ntp_warning='GRONK'
@@ -1047,7 +1047,7 @@ AC_CACHE_CHECK(if we have a losing syscall(), ac_cv_var_syscall_bug,
 esac
 ac_cv_var_syscall_bug=$ans])
 case "$ac_cv_var_syscall_bug" in
- yes) AC_DEFINE(SYSCALL_BUG) ;;
+ yes) AC_DEFINE(SYSCALL_BUG, 1, [Buggy syscall() (Solaris2.4)?]) ;;
 esac
 
 AC_CACHE_CHECK(for Streams/TLI, ac_cv_var_streams_tli,
@@ -1065,7 +1065,7 @@ AC_CACHE_CHECK(for Streams/TLI, ac_cv_var_streams_tli,
  ac_cv_var_streams_tli=$ans])
 case "$ac_cv_var_streams_tli" in
  yes)
-    AC_DEFINE(STREAMS_TLI)
+    AC_DEFINE(STREAMS_TLI, 1, [Do we have STREAMS/TLI? (Can we replace this with HAVE_SYS_STROPTS_H?)])
     ;;
 esac
 
@@ -1116,7 +1116,7 @@ case "$ac_cv_hdr_def_sigio" in
 esac
 ac_cv_var_signalled_io=$ans])
 case "$ac_cv_var_signalled_io" in
- yes) AC_DEFINE(HAVE_SIGNALED_IO) ;;
+ yes) AC_DEFINE(HAVE_SIGNALED_IO, 1, [Can we use SIGIO for tcp and udp IO?]) ;;
 esac
 
 AC_CACHE_CHECK(for SIGPOLL, ac_cv_hdr_def_sigpoll,
@@ -1180,7 +1180,7 @@ case "$ac_cv_hdr_def_sigpoll" in
 esac
 ac_cv_var_use_udp_sigpoll=$ans])
 case "$ac_cv_var_use_udp_sigpoll" in
- yes) AC_DEFINE(USE_UDP_SIGPOLL) ;;
+ yes) AC_DEFINE(USE_UDP_SIGPOLL, 1, [Can we use SIGPOLL for UDP?]) ;;
 esac
 
 AC_CACHE_CHECK(if we can use SIGPOLL for TTY I/O, ac_cv_var_use_tty_sigpoll,
@@ -1228,7 +1228,7 @@ case "$ac_cv_hdr_def_sigpoll" in
 esac
 ac_cv_var_use_tty_sigpoll=$ans])
 case "$ac_cv_var_use_tty_sigpoll" in
- yes) AC_DEFINE(USE_TTY_SIGPOLL) ;;
+ yes) AC_DEFINE(USE_TTY_SIGPOLL, 1, [Can we use SIGPOLL for tty IO?]) ;;
 esac
 
 case "$ac_cv_header_sys_sio_h" in
@@ -1259,7 +1259,7 @@ case "$host" in
 esac
 ac_cv_var_nlist_extra_indirection=$ans])
 case "$ac_cv_var_nlist_extra_indirection" in
- yes) AC_DEFINE(NLIST_EXTRA_INDIRECTION) ;;
+ yes) AC_DEFINE(NLIST_EXTRA_INDIRECTION, 1, [Might nlist() values require an extra level of indirection (AIX)?]) ;;
 esac
 
 AC_CACHE_CHECK(for a minimum recommended value of tickadj,
@@ -1273,7 +1273,7 @@ esac
 ac_cv_var_min_rec_tickadj=$ans])
 case "$ac_cv_var_min_rec_tickadj" in
  ''|no) ;;
- *) AC_DEFINE_UNQUOTED(MIN_REC_TICKADJ, $ac_cv_var_min_rec_tickadj) ;;
+ *) AC_DEFINE_UNQUOTED(MIN_REC_TICKADJ, $ac_cv_var_min_rec_tickadj, [Should we recommend a minimum value for tickadj?]) ;;
 esac
 
 AC_CACHE_CHECK(if the TTY code permits PARENB and IGNPAR,
@@ -1294,21 +1294,21 @@ case "$host" in
 esac
 ac_cv_var_no_parenb_ignpar=$ans])
 case "$ac_cv_var_no_parenb_ignpar" in
- yes) AC_DEFINE(NO_PARENB_IGNPAR) ;;
+ yes) AC_DEFINE(NO_PARENB_IGNPAR, 1, [Is there a problem using PARENB and IGNPAR (IRIX)?]) ;;
 esac
 
 AC_MSG_CHECKING(if we're including debugging code)
 AC_ARG_ENABLE(debugging,	[  --enable-debugging      + include debugging code],
     [ntp_ok=$enableval], [ntp_ok=yes])
 if test "$ntp_ok" = "yes"; then
-    AC_DEFINE(DEBUG)
+    AC_DEFINE(DEBUG, 1, [Enable debugging?])
 fi
 AC_MSG_RESULT($ntp_ok)
 
 AC_MSG_CHECKING(for a the number of minutes in a DST adjustment)
 AC_ARG_ENABLE(dst_minutes,	[  --enable-dst-minutes=60 + minutes per DST adjustment],
     [ans=$enableval], [ans=60])
-AC_DEFINE_UNQUOTED(DSTMINUTES, $ans)
+AC_DEFINE_UNQUOTED(DSTMINUTES, $ans, [The number of minutes in a DST adjustment])
 AC_MSG_RESULT($ans)
 
 AC_CACHE_CHECK(if we have the tty_clk line discipline/streams module,
@@ -1317,14 +1317,14 @@ AC_CACHE_CHECK(if we have the tty_clk line discipline/streams module,
   *yes*) ac_cv_var_tty_clk=yes ;;
  esac])
 case "$ac_cv_var_tty_clk" in
- yes) AC_DEFINE(TTYCLK) ;;
+ yes) AC_DEFINE(TTYCLK, 1, [Do we have the tty_clk line discipline/streams module?]) ;;
 esac
 
 AC_CACHE_CHECK(for the ppsclock streams module,
  ac_cv_var_ppsclock,
  ac_cv_var_ppsclock=$ac_cv_struct_ppsclockev)
 case "$ac_cv_var_ppsclock" in
- yes) AC_DEFINE(PPS) ;;
+ yes) AC_DEFINE(PPS, 1, [Do we have the ppsclock streams module?]) ;;
 esac
 
 AC_CACHE_CHECK(for kernel multicast support, ac_cv_var_mcast,
@@ -1339,7 +1339,7 @@ AC_CACHE_CHECK(for kernel multicast support, ac_cv_var_mcast,
   ], ac_cv_var_mcast=yes) ;;
   esac])
 case "$ac_cv_var_mcast" in
- yes) AC_DEFINE(MCAST) ;;
+ yes) AC_DEFINE(MCAST, 1, [Does the kernel support multicasting IP?]) ;;
 esac
 
 AC_CACHE_CHECK([[availability of ntp_{adj,get}time()]], ac_cv_var_ntp_syscalls,
@@ -1364,10 +1364,10 @@ AC_CACHE_CHECK([[availability of ntp_{adj,get}time()]], ac_cv_var_ntp_syscalls,
  esac])
 case "$ac_cv_var_ntp_syscalls" in
  libc)
-    AC_DEFINE(NTP_SYSCALLS_LIBC)
+    AC_DEFINE(NTP_SYSCALLS_LIBC, 1, [Do we have ntp_{adj,get}time in libc?])
     ;;
  kernel)
-    AC_DEFINE(NTP_SYSCALLS_STD)
+    AC_DEFINE(NTP_SYSCALLS_STD, 1, [Do we have ntp_{adj,get}time in the kernel?])
     ;;
  *)
     ;;
@@ -1392,7 +1392,7 @@ case "$ac_cv_header_sys_timex_h$ac_cv_struct_ntptimeval$ac_cv_var_sta_fll$ac_cv_
 esac])
 case "$ac_cv_var_kernel_pll" in
  yes)
-    AC_DEFINE(KERNEL_PLL)
+    AC_DEFINE(KERNEL_PLL, 1, [Does the kernel support precision time discipline?])
     ;;
 esac
 
@@ -1411,7 +1411,7 @@ AC_CACHE_CHECK(if SIOCGIFCONF returns buffer size in the buffer, ac_cv_var_size_
   esac
   ac_cv_var_size_returned_in_buffer=$ans])
 case "$ac_cv_var_size_returned_in_buffer" in
- yes) AC_DEFINE(SIZE_RETURNED_IN_BUFFER) ;;
+ yes) AC_DEFINE(SIZE_RETURNED_IN_BUFFER, 1, [Does SIOCGIFCONF return size in the buffer?]) ;;
 esac
 
 dnl AC_CACHE_CHECK(if we want GDT surveying code, ac_cv_var_gdt_surveying,
@@ -1419,7 +1419,7 @@ dnl [AC_ARG_ENABLE(gdt-surveying,	[  --enable-gdt-surveying   - include GDT surv
 dnl     [ans=$enableval], [ans=no])
 dnl ac_cv_var_gdt_surveying=$ans])
 dnl case "$ac_cv_var_gdt_surveying" in
-dnl  yes) AC_DEFINE(GDT_SURVEYING) ;;
+dnl  yes) AC_DEFINE(GDT_SURVEYING, 1, [Include the GDT Surveying code?]) ;;
 dnl esac
 
 # Check for ioctls TIOCGPPSEV
@@ -1435,7 +1435,7 @@ else
 ntp_ok=no
 fi
 if test "$ntp_ok" = "yes"; then
-    AC_DEFINE(HAVE_TIOCGPPSEV)
+    AC_DEFINE(HAVE_TIOCGPPSEV, 1, [Do we have the TIOCGPPSEV ioctl (Solaris)?])
     ac_cv_var_oncore_ok=yes
 fi
 AC_MSG_RESULT($ntp_ok)
@@ -1454,7 +1454,7 @@ else
 fi
 
 if test "$ntp_ok" = "yes"; then
-    AC_DEFINE(HAVE_TIOCSPPS)
+    AC_DEFINE(HAVE_TIOCSPPS, 1, [Do we have the TIOCSPPS ioctl (Solaris)?])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -1472,7 +1472,7 @@ ntp_ok=no
 fi
 if test "$ntp_ok" = "yes"; then
     ac_cv_var_oncore_ok=yes
-    AC_DEFINE(HAVE_CIOGETEV)
+    AC_DEFINE(HAVE_CIOGETEV, 1, [Do we have the CIOGETEV ioctl (SunOS, Linux)?])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -1498,7 +1498,7 @@ ac_cv_var_atom_ok=yes
 
 case "$ac_cv_c_inline$ac_cv_struct_timespec$ac_cv_header_timepps_h$ac_cv_header_sys_timepps_h" in
  inlineyes*yes*)
-    AC_DEFINE(HAVE_PPSAPI)
+    AC_DEFINE(HAVE_PPSAPI, 1, [Do we have the PPS API per the Draft RFC?])
     ac_cv_var_oncore_ok=yes
     ac_cv_var_ripe_ncc_ok=yes
     ;;
@@ -1534,7 +1534,7 @@ typedef int u_int;
 	;;
 esac
 if test "$ntp_ok" = "yes"; then
-    AC_DEFINE(HAVE_TIO_SERIAL_STUFF)
+    AC_DEFINE(HAVE_TIO_SERIAL_STUFF, 1, [Do we have the TIO serial stuff?])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -1545,7 +1545,7 @@ case "$ac_cv_header_sys_mman_h" in
  *)   ntp_ok=no  ;;
 esac
 if test "$ntp_ok" = "yes"; then
-    AC_DEFINE(ONCORE_SHMEM_STATUS)
+    AC_DEFINE(ONCORE_SHMEM_STATUS, 1, [Do we have support for SHMEM_STATUS?])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -1571,7 +1571,7 @@ AC_ARG_ENABLE(BANCOMM,
     [ntp_ok=$enableval], [ntp_ok=no])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_BANC)
+    AC_DEFINE(CLOCK_BANC, 1, [Datum/Bancomm bc635/VME interface?])
 fi
 AC_MSG_RESULT($ntp_ok)
 case "$ntp_ok$host" in
@@ -1586,7 +1586,7 @@ AC_ARG_ENABLE(GPSVME,
     [ntp_ok=$enableval], [ntp_ok=no])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_GPSVME)
+    AC_DEFINE(CLOCK_GPSVME, 1, [TrueTime GPS receiver/VME interface?])
 fi
 AC_MSG_RESULT($ntp_ok)
 case "$ntp_ok$host" in
@@ -1597,7 +1597,7 @@ esac
 AC_MSG_CHECKING(for PCL720 clock support)
 case "$ac_cv_header_machine_inline_h$ac_cv_header_sys_pcl720_h$ac_cv_header_sys_i8253_h" in
  yesyesyes)
-    AC_DEFINE(CLOCK_PPS720)
+    AC_DEFINE(CLOCK_PPS720, 1, [PCL 720 clock support])
     ans=yes
     ;;
  *)
@@ -1612,7 +1612,7 @@ AC_ARG_ENABLE(SHM,
     [ntp_ok=$enableval], [ntp_ok=no])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_SHM)
+    AC_DEFINE(CLOCK_SHM, 1, [clock thru shared memory])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -1658,7 +1658,7 @@ AC_ARG_ENABLE(ACTS,
          ], ntp_ok=$ntp_eac, ntp_ok=no)])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_ACTS)
+    AC_DEFINE(CLOCK_ACTS, 1, [ACTS modem service])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -1668,7 +1668,7 @@ AC_ARG_ENABLE(ARBITER,
     [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_ARBITER)
+    AC_DEFINE(CLOCK_ARBITER, 1, [Arbiter 1088A/B GPS receiver])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -1678,7 +1678,7 @@ AC_ARG_ENABLE(ARCRON_MSF,
     [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_ARCRON_MSF)
+    AC_DEFINE(CLOCK_ARCRON_MSF, 1, [ARCRON support?])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -1688,7 +1688,7 @@ AC_ARG_ENABLE(AS2201,
     [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_AS2201)
+    AC_DEFINE(CLOCK_AS2201, 1, [Austron 2200A/2201A GPS receiver?])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -1701,7 +1701,7 @@ case "$ac_cv_var_atom_ok" in
 esac
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_ATOM)
+    AC_DEFINE(CLOCK_ATOM, 1, [PPS interface?])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -1711,7 +1711,7 @@ AC_ARG_ENABLE(CHRONOLOG,
     [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_CHRONOLOG)
+    AC_DEFINE(CLOCK_CHRONOLOG, 1, [Chronolog K-series WWVB receiver?])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -1721,7 +1721,7 @@ AC_ARG_ENABLE(CHU,
     [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_CHU)
+    AC_DEFINE(CLOCK_CHU, 1, [CHU modem/decoder])
 fi
 AC_MSG_RESULT($ntp_ok)
 ac_refclock_chu=$ntp_ok
@@ -1735,7 +1735,7 @@ AC_ARG_ENABLE(AUDIO-CHU,
  *)	ntp_ok=yes ;;
 esac])
 if test "$ntp_ok" = "yes"; then
-    AC_DEFINE(AUDIO_CHU)
+    AC_DEFINE(AUDIO_CHU, 1, [CHU audio/decoder?])
 fi
 AC_MSG_RESULT($ntp_ok)
 # We used to check for sunos/solaris target...
@@ -1757,7 +1757,7 @@ AC_ARG_ENABLE(DATUM,
     esac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_DATUM)
+    AC_DEFINE(CLOCK_DATUM, 1, [Datum Programmable Time System?])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -1767,7 +1767,7 @@ AC_ARG_ENABLE(DUMBCLOCK,
     [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_DUMBCLOCK)
+    AC_DEFINE(CLOCK_DUMBCLOCK, 1, [Dumb generic hh:mm:ss local clock?])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -1777,7 +1777,7 @@ AC_ARG_ENABLE(FG,
     [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_FG)
+    AC_DEFINE(CLOCK_FG, 1, [Forum Graphic GPS datating station driver?])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -1797,7 +1797,7 @@ AC_ARG_ENABLE(HEATH,
          ], ntp_ok=$ntp_eac, ntp_ok=no)])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_HEATH)
+    AC_DEFINE(CLOCK_HEATH, 1, [Heath GC-1000 WWV/WWVH receiver?])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -1807,7 +1807,7 @@ AC_ARG_ENABLE(HOPFSERIAL,
     [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_HOPF_SERIAL)
+    AC_DEFINE(CLOCK_HOPF_SERIAL, 1, [HOPF serial clock device?])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -1817,7 +1817,7 @@ AC_ARG_ENABLE(HOPFPCI,
     [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_HOPF_PCI)
+    AC_DEFINE(CLOCK_HOPF_PCI, 1, [HOPF PCI clock device?])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -1827,13 +1827,13 @@ AC_ARG_ENABLE(HPGPS,
     [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_HPGPS)
+    AC_DEFINE(CLOCK_HPGPS, 1, [HP 58503A GPS receiver?])
 fi
 AC_MSG_RESULT($ntp_ok)
 
-AC_MSG_CHECKING(Sun IRIG audio decoder)
+AC_MSG_CHECKING(IRIG audio decoder)
 AC_ARG_ENABLE(IRIG,
-    AC_HELP_STRING([--enable-IRIG], [s Sun IRIG audio decoder]),
+    AC_HELP_STRING([--enable-IRIG], [s iRIG audio decoder]),
     [ntp_ok=$enableval],
     [case "$ntp_eac$ntp_canaudio" in
      *no*)	ntp_ok=no  ;;
@@ -1841,7 +1841,7 @@ AC_ARG_ENABLE(IRIG,
     esac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_IRIG)
+    AC_DEFINE(CLOCK_IRIG, 1, [IRIG audio decoder?])
 fi
 AC_MSG_RESULT($ntp_ok)
 case "$ntp_ok$ntp_canaudio" in
@@ -1854,7 +1854,7 @@ AC_ARG_ENABLE(JJY,
     [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_JJY)
+    AC_DEFINE(CLOCK_JJY, 1, [JJY receiver?])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -1871,7 +1871,7 @@ AC_ARG_ENABLE(JUPITER,
     esac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_JUPITER)
+    AC_DEFINE(CLOCK_JUPITER, 1, [Rockwell Jupiter GPS clock?])
 fi
 AC_MSG_RESULT($ntp_ok)
 case "$ntp_ok$host" in
@@ -1884,7 +1884,7 @@ AC_ARG_ENABLE(LEITCH,
     [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_LEITCH)
+    AC_DEFINE(CLOCK_LEITCH, 1, [Leitch CSD 5300 Master Clock System Driver?])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -1894,7 +1894,7 @@ AC_ARG_ENABLE(LOCAL-CLOCK,
     [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_LOCAL)
+    AC_DEFINE(CLOCK_LOCAL, 1, [local clock reference?])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -1904,7 +1904,7 @@ AC_ARG_ENABLE(MSFEES,
     [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_MSFEES)
+    AC_DEFINE(CLOCK_MSFEES, 1, [EES M201 MSF receiver])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -1921,7 +1921,7 @@ AC_ARG_ENABLE(MX4200,
     esac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_MX4200)
+    AC_DEFINE(CLOCK_MX4200, 1, [Magnavox MX4200 GPS receiver])
 fi
 AC_MSG_RESULT($ntp_ok)
 case "$ntp_ok$host" in
@@ -1934,7 +1934,7 @@ AC_ARG_ENABLE(NMEA,
     [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_NMEA)
+    AC_DEFINE(CLOCK_NMEA, 1, [NMEA GPS receiver])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -1947,7 +1947,7 @@ case "$ac_cv_var_oncore_ok" in
 esac
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_ONCORE)
+    AC_DEFINE(CLOCK_ONCORE, 1, [Motorola UT Oncore GPS])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -1965,7 +1965,7 @@ AC_ARG_ENABLE(PALISADE,
 
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_PALISADE)
+    AC_DEFINE(CLOCK_PALISADE, 1, [Palisade clock])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -1975,7 +1975,7 @@ AC_ARG_ENABLE(PCF,
     [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_PCF)
+    AC_DEFINE(CLOCK_PCF, 1, [Conrad parallel port radio clock])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -1985,7 +1985,7 @@ AC_ARG_ENABLE(PST,
     [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_PST)
+    AC_DEFINE(CLOCK_PST, 1, [PST/Traconex 1020 WWV/WWVH receiver])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -2005,7 +2005,7 @@ AC_ARG_ENABLE(PTBACTS,
          ], ntp_ok=$ntp_eac, ntp_ok=no)])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_PTBACTS)
+    AC_DEFINE(CLOCK_PTBACTS, 1, [PTB modem service])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -2029,7 +2029,7 @@ AC_ARG_ENABLE(SPECTRACOM,
     [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_SPECTRACOM)
+    AC_DEFINE(CLOCK_SPECTRACOM, 1, [Spectracom 8170/Netclock/2 WWVB receiver])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -2046,7 +2046,7 @@ AC_ARG_ENABLE(TPRO,
     esac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_TPRO)
+    AC_DEFINE(CLOCK_TPRO, 1, [KSI/Odetics TPRO/S GPS receiver/IRIG interface])
 fi
 AC_MSG_RESULT($ntp_ok)
 case "$ntp_ok$ac_cv_header_sys_tpro" in
@@ -2059,7 +2059,7 @@ AC_ARG_ENABLE(TRAK,
     [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_TRAK)
+    AC_DEFINE(CLOCK_TRAK, 1, [TRAK 8810 GPS receiver])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -2078,7 +2078,7 @@ AC_ARG_ENABLE(TRUETIME,
     esac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_TRUETIME)
+    AC_DEFINE(CLOCK_TRUETIME, 1, [Kinemetrics/TrueTime receivers])
 fi
 AC_MSG_RESULT($ntp_ok)
 case "$ntp_ok$host" in
@@ -2101,7 +2101,7 @@ AC_ARG_ENABLE(ULINK,
     [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_ULINK)
+    AC_DEFINE(CLOCK_ULINK, 1, [Ultralink M320 WWVB receiver])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -2121,7 +2121,7 @@ AC_ARG_ENABLE(USNO,
          ], ntp_ok=$ntp_eac, ntp_ok=no)])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_USNO)
+    AC_DEFINE(CLOCK_USNO, 1, [USNO modem service])
 fi
 AC_MSG_RESULT($ntp_ok)
 
@@ -2135,7 +2135,7 @@ AC_ARG_ENABLE(WWV,
     esac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_WWV)
+    AC_DEFINE(CLOCK_WWV, 1, [WWV audio driver])
 fi
 AC_MSG_RESULT($ntp_ok)
 case "$ntp_ok$ntp_canaudio" in
@@ -2184,7 +2184,7 @@ AC_ARG_ENABLE(COMPUTIME,
 if test "$ntp_ok" = "yes"; then
     ntp_libparse=yes
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_COMPUTIME)
+    AC_DEFINE(CLOCK_COMPUTIME, 1, [Diems Computime Radio Clock?])
 fi
 AC_MSG_RESULT($ntp_ok)
 case "$ntp_ok$ntp_canparse" in
@@ -2200,7 +2200,7 @@ AC_ARG_ENABLE(DCF7000,
 if test "$ntp_ok" = "yes"; then
     ntp_libparse=yes
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_DCF7000)
+    AC_DEFINE(CLOCK_DCF7000, 1, [ELV/DCF7000 clock?])
 fi
 AC_MSG_RESULT($ntp_ok)
 case "$ntp_ok$ntp_canparse" in
@@ -2216,7 +2216,7 @@ AC_ARG_ENABLE(HOPF6021,
 if test "$ntp_ok" = "yes"; then
     ntp_libparse=yes
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_HOPF6021)
+    AC_DEFINE(CLOCK_HOPF6021, 1, [HOPF 6021 clock?])
 fi
 AC_MSG_RESULT($ntp_ok)
 case "$ntp_ok$ntp_canparse" in
@@ -2232,7 +2232,7 @@ AC_ARG_ENABLE(MEINBERG,
 if test "$ntp_ok" = "yes"; then
     ntp_libparse=yes
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_MEINBERG)
+    AC_DEFINE(CLOCK_MEINBERG, 1, [Meinberg clocks])
 fi
 AC_MSG_RESULT($ntp_ok)
 case "$ntp_ok$ntp_canparse" in
@@ -2250,7 +2250,7 @@ if test "$ntp_ok" = "yes"; then
     ntp_parseutil=yes
     ntp_refclock=yes
     ntp_rawdcf=yes
-    AC_DEFINE(CLOCK_RAWDCF)
+    AC_DEFINE(CLOCK_RAWDCF, 1, [DCF77 raw time code])
 fi
 AC_MSG_RESULT($ntp_ok)
 case "$ntp_ok$ntp_canparse" in
@@ -2271,7 +2271,7 @@ case "$ntp_rawdcf" in
     esac
     ac_cv_var_rawdcf_parity=$ans])
     case "$ac_cv_var_rawdcf_parity" in
-     yes) AC_DEFINE(RAWDCF_NO_IGNPAR) ;;
+     yes) AC_DEFINE(RAWDCF_NO_IGNPAR, 1, [Should we not IGNPAR (Linux)?]) ;;
     esac
     ;;
 
@@ -2287,7 +2287,7 @@ AC_ARG_ENABLE(RCC8000,
 if test "$ntp_ok" = "yes"; then
     ntp_libparse=yes
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_RCC8000)
+    AC_DEFINE(CLOCK_RCC8000, 1, [RCC 8000 clock])
 fi
 AC_MSG_RESULT($ntp_ok)
 case "$ntp_ok$ntp_canparse" in
@@ -2303,7 +2303,7 @@ AC_ARG_ENABLE(SCHMID,
 if test "$ntp_ok" = "yes"; then
     ntp_libparse=yes
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_SCHMID)
+    AC_DEFINE(CLOCK_SCHMID, 1, [Schmid DCF77 clock])
 fi
 AC_MSG_RESULT($ntp_ok)
 case "$ntp_ok$ntp_canparse" in
@@ -2319,7 +2319,7 @@ AC_ARG_ENABLE(TRIMTAIP,
 if test "$ntp_ok" = "yes"; then
     ntp_libparse=yes
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_TRIMTAIP)
+    AC_DEFINE(CLOCK_TRIMTAIP, 1, [Trimble GPS receiver/TAIP protocol])
 fi
 AC_MSG_RESULT($ntp_ok)
 case "$ntp_ok$ntp_canparse" in
@@ -2335,7 +2335,7 @@ AC_ARG_ENABLE(TRIMTSIP,
 if test "$ntp_ok" = "yes"; then
     ntp_libparse=yes
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_TRIMTSIP)
+    AC_DEFINE(CLOCK_TRIMTSIP, 1, [Trimble GPS receiver/TSIP protocol])
 fi
 AC_MSG_RESULT($ntp_ok)
 case "$ntp_ok$ntp_canparse" in
@@ -2351,7 +2351,7 @@ AC_ARG_ENABLE(WHARTON,
 if test "$ntp_ok" = "yes"; then
     ntp_libparse=yes
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_WHARTON_400A)
+    AC_DEFINE(CLOCK_WHARTON_400A, 1, [WHARTON 400A Series protocol])
 fi
 AC_MSG_RESULT($ntp_ok)
 case "$ntp_ok$ntp_canparse" in
@@ -2367,7 +2367,7 @@ AC_ARG_ENABLE(VARITEXT,
 if test "$ntp_ok" = "yes"; then
     ntp_libparse=yes
     ntp_refclock=yes
-    AC_DEFINE(CLOCK_VARITEXT)
+    AC_DEFINE(CLOCK_VARITEXT, 1, [VARITEXT protocol])
 fi
 AC_MSG_RESULT($ntp_ok)
 case "$ntp_ok$ntp_canparse" in
@@ -2384,11 +2384,11 @@ ans=no
 case "$ntp_libparse" in
  yes)
     ans=yes
-    AC_DEFINE(CLOCK_PARSE)
+    AC_DEFINE(CLOCK_PARSE, 1, [PARSE driver interface])
     LIBPARSE=../libparse/libparse.a
     MAKE_LIBPARSE=libparse.a
     MAKE_CHECK_Y2K=check_y2k
-    AC_DEFINE(PPS_SAMPLE)
+    AC_DEFINE(PPS_SAMPLE, 1, [PPS auxiliary interface for ATOM?])
     AC_DEFINE(CLOCK_ATOM)
     ;;
 esac
@@ -2492,7 +2492,7 @@ case "$ans" in
 	    CPPFLAGS="$CPPFLAGS -I$OPENSSL_INC"
 	    LDFLAGS="$LDFLAGS -L$OPENSSL_LIB"
 	    LIBS="$LIBS -lcrypto"
-	    AC_DEFINE(DES)
+	    AC_DEFINE(DES, 1, [Use DES?])
 	    AC_DEFINE(OPENSSL, , [Use OpenSSL?])
 	    AC_DEFINE(PUBKEY, , [Public key?])
 	fi
@@ -2518,7 +2518,7 @@ case "$ans" in
 	if test "$ans" = "rsaref"; then
 	    LIBRSAREF=../librsaref/librsaref.a
 	    MAKE_LIBRSAREF=librsaref.a
-	    AC_DEFINE(DES)
+	    AC_DEFINE(DES, 1, [Use DES?])
 	    AC_DEFINE(PUBKEY)
 	    AC_DEFINE(RSAREF, , [Use RSAREF?])
 	fi
@@ -2580,7 +2580,7 @@ case "$ntp_parseutil$ac_cv_header_sys_stropts_h" in
      sparc-*-sunos4*)
         case "$ac_cv_var_kernel_pll" in
 	yes)
-	    AC_DEFINE(PPS_SYNC)
+	    AC_DEFINE(PPS_SYNC, 1, [PARSE kernel PLL PPS support])
 	    ;;
 	esac
 	ans=parsestreams
@@ -2597,7 +2597,7 @@ AC_MSG_RESULT($ans)
 
 AC_MSG_CHECKING(if we need basic refclock support)
 if test "$ntp_refclock" = "yes"; then
-    AC_DEFINE(REFCLOCK)
+    AC_DEFINE(REFCLOCK, 1, [Basic refclock support?])
 fi
 AC_MSG_RESULT($ntp_refclock)
 
@@ -2617,7 +2617,7 @@ case "$host" in
 esac
 if test "$ans" = "yes"; then
     MAKE_ADJTIMED=adjtimed
-    AC_DEFINE(NEED_HPUX_ADJTIME)
+    AC_DEFINE(NEED_HPUX_ADJTIME, 1, [Do we need HPUX adjtime() library support?])
 fi
 AC_MSG_RESULT($ans)
 
@@ -2669,7 +2669,7 @@ ac_cv_var_can_kmem=$ans])
 
 case "$ac_cv_var_can_kmem" in
  *yes*) ;;
- *) AC_DEFINE(NOKMEM) ;;
+ *) AC_DEFINE(NOKMEM, 1, [Should we NOT read /dev/kmem?]) ;;
 esac
 
 AC_CACHE_CHECK(if adjtime is accurate, ac_cv_var_adjtime_is_accurate,
@@ -2707,7 +2707,7 @@ AC_CACHE_CHECK(if adjtime is accurate, ac_cv_var_adjtime_is_accurate,
      ])
 ac_cv_var_adjtime_is_accurate=$ans])
 case "$ac_cv_var_adjtime_is_accurate" in
- yes) AC_DEFINE(ADJTIME_IS_ACCURATE) ;;
+ yes) AC_DEFINE(ADJTIME_IS_ACCURATE, 1, [Is adjtime() accurate?]) ;;
 esac
 
 AC_CACHE_CHECK([the name of 'tick' in the kernel],
@@ -2745,7 +2745,7 @@ esac
 ac_cv_var_nlist_tick=$ans])
 case "$ac_cv_var_nlist_tick" in
  ''|no) ;;	# HMS: I think we can only get 'no' here...
- *) AC_DEFINE_UNQUOTED(K_TICK_NAME, "$ac_cv_var_nlist_tick") ;;
+ *) AC_DEFINE_UNQUOTED(K_TICK_NAME, "$ac_cv_var_nlist_tick", [What is the name of TICK in the kernel?]) ;;
 esac
 #
 AC_CACHE_CHECK([for the units of 'tick'],
@@ -2759,7 +2759,7 @@ esac
 ac_cv_var_tick_nano=$ans])
 case "$ac_cv_var_tick_nano" in
  nsec)
-    AC_DEFINE(TICK_NANO)
+    AC_DEFINE(TICK_NANO, 1, [Is K_TICK_NAME in nanoseconds?])
     ;;
 esac
 #
@@ -2807,7 +2807,7 @@ esac
 ac_cv_var_nlist_tickadj=$ans])
 case "$ac_cv_var_nlist_tickadj" in
  ''|no) ;;	# HMS: I think we can only get 'no' here...
- *) AC_DEFINE_UNQUOTED(K_TICKADJ_NAME, "$ac_cv_var_nlist_tickadj") ;;
+ *) AC_DEFINE_UNQUOTED(K_TICKADJ_NAME, "$ac_cv_var_nlist_tickadj", [What is the name of TICKADJ in the kernel?]) ;;
 esac
 #
 AC_CACHE_CHECK([for the units of 'tickadj'],
@@ -2821,7 +2821,7 @@ esac
 ac_cv_var_tickadj_nano=$ans])
 case "$ac_cv_var_tickadj_nano" in
  nsec)
-    AC_DEFINE(TICKADJ_NANO)
+    AC_DEFINE(TICKADJ_NANO, 1, [Is K_TICKADJ_NAME in nanoseconds?])
     ;;
 esac
 #
@@ -2868,7 +2868,7 @@ esac
 ac_cv_var_nlist_dosynctodr=$ans])
 case "$ac_cv_var_nlist_dosynctodr" in
  no) ;;
- *)  AC_DEFINE_UNQUOTED(K_DOSYNCTODR_NAME, "$ac_cv_var_nlist_dosynctodr")
+ *)  AC_DEFINE_UNQUOTED(K_DOSYNCTODR_NAME, "$ac_cv_var_nlist_dosynctodr", [What is (probably) the name of DOSYNCTODR in the kernel?])
      ;;
 esac
 #
@@ -2909,7 +2909,7 @@ esac
 ac_cv_var_nlist_noprintf=$ans])
 case "$ac_cv_var_nlist_noprintf" in
  no) ;;
- *)  AC_DEFINE_UNQUOTED(K_NOPRINTF_NAME, "$ac_cv_var_nlist_noprintf")
+ *)  AC_DEFINE_UNQUOTED(K_NOPRINTF_NAME, "$ac_cv_var_nlist_noprintf", [What is (probably) the name of NOPRINTF in the kernel?])
      ;;
 esac
 
@@ -2959,7 +2959,7 @@ AC_CACHE_CHECK(for a default value for 'tick', ac_cv_var_tick,
 ac_cv_var_tick=$ans])
 case "$ac_cv_var_tick" in
  ''|no) ;;	# HMS: I think we can only get 'no' here...
- *) AC_DEFINE_UNQUOTED(PRESET_TICK, $ac_cv_var_tick) ;;
+ *) AC_DEFINE_UNQUOTED(PRESET_TICK, $ac_cv_var_tick, [Preset a value for 'tick'?]) ;;
 esac
 
 AC_CACHE_CHECK(for a default value for 'tickadj', ac_cv_var_tickadj,
@@ -3016,7 +3016,7 @@ AC_CACHE_CHECK(for a default value for 'tickadj', ac_cv_var_tickadj,
 ac_cv_var_tickadj=$ans])
 case "$ac_cv_var_tickadj" in
  ''|no) ;;	# HMS: I think we can only get 'no' here...
- *) AC_DEFINE_UNQUOTED(PRESET_TICKADJ, $ac_cv_var_tickadj) ;;
+ *) AC_DEFINE_UNQUOTED(PRESET_TICKADJ, $ac_cv_var_tickadj, [Preset a value for 'tickadj'?]) ;;
 esac
 
 # Newer versions of ReliantUNIX round adjtime() values down to
@@ -3024,11 +3024,11 @@ esac
 # Unfortunately, there is no easy way to know if particular release
 # has this "feature" or any obvious way to test for it.
 case "$host" in
- mips-sni-sysv4*) AC_DEFINE(RELIANTUNIX_CLOCK) ;;
+ mips-sni-sysv4*) AC_DEFINE(RELIANTUNIX_CLOCK, 1, [Do we want the ReliantUNIX clock hacks?]) ;;
 esac
 
 case "$host" in
- *-*-sco3.2v5*) AC_DEFINE(SCO5_CLOCK) ;;
+ *-*-sco3.2v5*) AC_DEFINE(SCO5_CLOCK, 1, [Do we want the SCO clock hacks?]) ;;
 esac
 
 ac_cv_make_tickadj=yes
@@ -3176,7 +3176,7 @@ AC_CACHE_CHECK(if we want UDP wildcard delivery, ac_cv_var_udp_wildcard_delivery
      esac])
 ac_cv_var_udp_wildcard_delivery=$ans])
 case "$ac_cv_var_udp_wildcard_delivery" in
- yes) AC_DEFINE(UDP_WILDCARD_DELIVERY) ;;
+ yes) AC_DEFINE(UDP_WILDCARD_DELIVERY, 1, [use UDP Wildcard Delivery?]) ;;
 esac
 
 case "$build" in
@@ -3212,7 +3212,7 @@ AC_CACHE_CHECK(if we should always slew the time, ac_cv_var_slew_always,
      ])
 ac_cv_var_slew_always=$ans])
 case "$ac_cv_var_slew_always" in
- yes) AC_DEFINE(SLEWALWAYS) ;;
+ yes) AC_DEFINE(SLEWALWAYS, 1, [Slew always?]) ;;
 esac
 
 AC_CACHE_CHECK(if we should step and slew the time, ac_cv_var_step_slew,
@@ -3240,7 +3240,7 @@ AC_CACHE_CHECK(if we should step and slew the time, ac_cv_var_step_slew,
      ])
 ac_cv_var_step_slew=$ans])
 case "$ac_cv_var_step_slew" in
- yes) AC_DEFINE(STEP_SLEW) ;;
+ yes) AC_DEFINE(STEP_SLEW, 1, [Step, then slew the clock?]) ;;
 esac
 
 AC_CACHE_CHECK(if ntpdate should step the time, ac_cv_var_ntpdate_step,
@@ -3256,7 +3256,7 @@ AC_CACHE_CHECK(if ntpdate should step the time, ac_cv_var_ntpdate_step,
      ])
 ac_cv_var_ntpdate_step=$ans])
 case "$ac_cv_var_ntpdate_step" in
- yes) AC_DEFINE(FORCE_NTPDATE_STEP) ;;
+ yes) AC_DEFINE(FORCE_NTPDATE_STEP, 1, [force ntpdate to step the clock if !defined(STEP_SLEW) ?]) ;;
 esac
 
 AC_CACHE_CHECK(if we should sync TODR clock every hour, ac_cv_var_sync_todr,
@@ -3275,7 +3275,7 @@ AC_CACHE_CHECK(if we should sync TODR clock every hour, ac_cv_var_sync_todr,
      esac])
 ac_cv_var_sync_todr=$ans])
 case "$ac_cv_var_sync_todr" in
- yes) AC_DEFINE(DOSYNCTODR) ;;
+ yes) AC_DEFINE(DOSYNCTODR, 1, [synch TODR hourly?]) ;;
 esac
 
 AC_CACHE_CHECK(if we should avoid kernel FLL bug, ac_cv_var_kernel_fll_bug,
@@ -3328,7 +3328,7 @@ AC_CACHE_CHECK(if we should avoid kernel FLL bug, ac_cv_var_kernel_fll_bug,
     ])
 ac_cv_var_kernel_fll_bug=$ans])
 case "$ac_cv_var_kernel_fll_bug" in
- yes) AC_DEFINE(KERNEL_FLL_BUG) ;;
+ yes) AC_DEFINE(KERNEL_FLL_BUG, 1, [Does the kernel have an FLL bug?]) ;;
 esac
 
 case "$build" in
diff --git a/ports/winnt/include/config.h b/ports/winnt/include/config.h
index 99bf623fc1..bb7932028e 100644
--- a/ports/winnt/include/config.h
+++ b/ports/winnt/include/config.h
@@ -19,7 +19,6 @@
 # undef  OPEN_BCAST_SOCKET		/* for	ntp_io.c */ 													
 # undef  UDP_WILDCARD_DELIVERY	/* for	ntp_io.c */ 				/*	98/06/01  */
 # undef  DES				/* from libntp.mak */
-# define  MD5				/* from libntp.mak */	
 # define HAVE_RANDOM 
 #define MAXHOSTNAMELEN 64
 #define AUTOKEY