aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOllivier Robert <roberto@FreeBSD.org>2001-08-29 14:35:15 +0000
committerOllivier Robert <roberto@FreeBSD.org>2001-08-29 14:35:15 +0000
commit224ba2bd37e182b64f7d78defef8a6cacaad3415 (patch)
tree3cfb63f1a112ee17469b17fc1593a88d004ddda6
parent1c80946020d06ca926154926c7c890d211708395 (diff)
downloadsrc-224ba2bd37e182b64f7d78defef8a6cacaad3415.tar.gz
src-224ba2bd37e182b64f7d78defef8a6cacaad3415.zip
Virgin import of ntpd 4.1.0
Notes
Notes: svn path=/vendor/ntp/dist/; revision=82498
-rw-r--r--contrib/ntp/COPYRIGHT242
-rw-r--r--contrib/ntp/ChangeLog3233
-rw-r--r--contrib/ntp/INSTALL2
-rw-r--r--contrib/ntp/Makefile.am59
-rw-r--r--contrib/ntp/Makefile.in364
-rw-r--r--contrib/ntp/NEWS17
-rw-r--r--contrib/ntp/README5
-rw-r--r--contrib/ntp/README.cvs44
-rw-r--r--contrib/ntp/README.des9
-rw-r--r--contrib/ntp/README.rsa105
-rw-r--r--contrib/ntp/TODO2
-rw-r--r--contrib/ntp/acconfig.h23
-rw-r--r--contrib/ntp/acinclude.m436
-rw-r--r--contrib/ntp/aclocal.m4512
-rw-r--r--contrib/ntp/adjtimed/Makefile.in277
-rwxr-xr-xcontrib/ntp/build37
-rw-r--r--contrib/ntp/clockstuff/Makefile.in273
-rw-r--r--contrib/ntp/conf/baldwin.conf13
-rw-r--r--contrib/ntp/conf/grundoon.conf162
-rw-r--r--contrib/ntp/conf/pogo.conf69
-rw-r--r--contrib/ntp/conf/rackety.conf48
-rwxr-xr-xcontrib/ntp/config.guess747
-rw-r--r--contrib/ntp/config.h.in612
-rwxr-xr-xcontrib/ntp/config.sub309
-rwxr-xr-xcontrib/ntp/configure15113
-rw-r--r--contrib/ntp/configure.in593
-rwxr-xr-xcontrib/ntp/depcomp152
-rwxr-xr-xcontrib/ntp/flock-build45
-rw-r--r--contrib/ntp/html/Oncore-SHMEM.htm257
-rw-r--r--contrib/ntp/html/accopt.htm427
-rw-r--r--contrib/ntp/html/assoc.htm259
-rw-r--r--contrib/ntp/html/audio.htm270
-rw-r--r--contrib/ntp/html/authopt.htm696
-rw-r--r--contrib/ntp/html/biblio.htm343
-rw-r--r--contrib/ntp/html/build.htm419
-rw-r--r--contrib/ntp/html/clockopt.htm259
-rw-r--r--contrib/ntp/html/config.htm417
-rw-r--r--contrib/ntp/html/confopt.htm563
-rw-r--r--contrib/ntp/html/copyright.htm236
-rw-r--r--contrib/ntp/html/debug.htm761
-rw-r--r--contrib/ntp/html/driver1.htm314
-rw-r--r--contrib/ntp/html/driver20.htm208
-rw-r--r--contrib/ntp/html/driver22.htm286
-rw-r--r--contrib/ntp/html/driver23.htm231
-rw-r--r--contrib/ntp/html/driver30.htm61
-rw-r--r--contrib/ntp/html/driver34.htm62
-rw-r--r--contrib/ntp/html/driver35.htm48
-rw-r--r--contrib/ntp/html/driver36.htm1285
-rw-r--r--contrib/ntp/html/driver38.htm191
-rw-r--r--contrib/ntp/html/driver39.htm162
-rw-r--r--contrib/ntp/html/driver6.htm427
-rw-r--r--contrib/ntp/html/driver7.htm834
-rw-r--r--contrib/ntp/html/driver9.htm38
-rw-r--r--contrib/ntp/html/exec.htm617
-rw-r--r--contrib/ntp/html/extern.htm146
-rw-r--r--contrib/ntp/html/gadget.htm127
-rw-r--r--contrib/ntp/html/genkeys.htm181
-rw-r--r--contrib/ntp/html/hints.htm10
-rw-r--r--contrib/ntp/html/hints/freebsd15
-rw-r--r--contrib/ntp/html/hints/vxworks.htm153
-rw-r--r--contrib/ntp/html/hints/winnt.htm43
-rw-r--r--contrib/ntp/html/howto.htm7
-rw-r--r--contrib/ntp/html/index.htm424
-rw-r--r--contrib/ntp/html/kern.htm171
-rw-r--r--contrib/ntp/html/kernpps.htm32
-rw-r--r--contrib/ntp/html/ldisc.htm206
-rw-r--r--contrib/ntp/html/leap.htm250
-rw-r--r--contrib/ntp/html/measure.htm43
-rw-r--r--contrib/ntp/html/miscopt.htm441
-rw-r--r--contrib/ntp/html/monopt.htm9
-rw-r--r--contrib/ntp/html/mx4200data.htm198
-rw-r--r--contrib/ntp/html/notes.htm2
-rw-r--r--contrib/ntp/html/ntpd.htm636
-rw-r--r--contrib/ntp/html/ntpdate.htm371
-rw-r--r--contrib/ntp/html/ntpdc.htm1181
-rw-r--r--contrib/ntp/html/ntpq.htm1399
-rw-r--r--contrib/ntp/html/ntptime.htm128
-rw-r--r--contrib/ntp/html/ntptrace.htm167
-rw-r--r--contrib/ntp/html/patches.htm64
-rw-r--r--contrib/ntp/html/porting.htm8
-rw-r--r--contrib/ntp/html/pps.htm174
-rw-r--r--contrib/ntp/html/prefer.htm425
-rw-r--r--contrib/ntp/html/quick.htm173
-rw-r--r--contrib/ntp/html/rdebug.htm72
-rw-r--r--contrib/ntp/html/refclock.htm391
-rw-r--r--contrib/ntp/html/release.htm485
-rw-r--r--contrib/ntp/html/tickadj.htm204
-rw-r--r--contrib/ntp/include/Makefile.am7
-rw-r--r--contrib/ntp/include/Makefile.in167
-rw-r--r--contrib/ntp/include/audio.h2
-rw-r--r--contrib/ntp/include/global.h3
-rw-r--r--contrib/ntp/include/hopf6039.h144
-rw-r--r--contrib/ntp/include/l_stdlib.h9
-rw-r--r--contrib/ntp/include/ntp.h619
-rw-r--r--contrib/ntp/include/ntp_cmdargs.h4
-rw-r--r--contrib/ntp/include/ntp_config.h151
-rw-r--r--contrib/ntp/include/ntp_control.h41
-rw-r--r--contrib/ntp/include/ntp_crypto.h93
-rw-r--r--contrib/ntp/include/ntp_if.h6
-rw-r--r--contrib/ntp/include/ntp_machine.h19
-rw-r--r--contrib/ntp/include/ntp_proto.h2
-rw-r--r--contrib/ntp/include/ntp_refclock.h13
-rw-r--r--contrib/ntp/include/ntp_request.h45
-rw-r--r--contrib/ntp/include/ntp_stdlib.h37
-rw-r--r--contrib/ntp/include/ntp_syscall.h5
-rw-r--r--contrib/ntp/include/ntp_syslog.h7
-rw-r--r--contrib/ntp/include/ntp_tty.h68
-rw-r--r--contrib/ntp/include/ntp_types.h4
-rw-r--r--contrib/ntp/include/ntp_unixtime.h2
-rw-r--r--contrib/ntp/include/ntpd.h70
-rw-r--r--contrib/ntp/kernel/Makefile.in197
-rw-r--r--contrib/ntp/kernel/sys/Makefile.in161
-rw-r--r--contrib/ntp/kernel/sys/pcl720.h2
-rw-r--r--contrib/ntp/libntp/Makefile.am6
-rw-r--r--contrib/ntp/libntp/Makefile.in546
-rw-r--r--contrib/ntp/libntp/a_md5encrypt.c48
-rw-r--r--contrib/ntp/libntp/audio.c64
-rw-r--r--contrib/ntp/libntp/authencrypt.c2
-rw-r--r--contrib/ntp/libntp/authkeys.c47
-rw-r--r--contrib/ntp/libntp/authparity.c9
-rw-r--r--contrib/ntp/libntp/authreadkeys.c8
-rw-r--r--contrib/ntp/libntp/authusekey.c6
-rw-r--r--contrib/ntp/libntp/buftvtots.c45
-rw-r--r--contrib/ntp/libntp/clocktypes.c4
-rw-r--r--contrib/ntp/libntp/emalloc.c6
-rw-r--r--contrib/ntp/libntp/gpstolfp.c2
-rw-r--r--contrib/ntp/libntp/humandate.c7
-rw-r--r--contrib/ntp/libntp/icom.c12
-rw-r--r--contrib/ntp/libntp/iosignal.c27
-rw-r--r--contrib/ntp/libntp/lib_strbuf.c1
-rw-r--r--contrib/ntp/libntp/machines.c6
-rw-r--r--contrib/ntp/libntp/mktime.c10
-rw-r--r--contrib/ntp/libntp/msyslog.c17
-rw-r--r--contrib/ntp/libntp/prettydate.c4
-rw-r--r--contrib/ntp/libntp/random.c482
-rw-r--r--contrib/ntp/libntp/recvbuff.c2
-rw-r--r--contrib/ntp/libntp/snprintf.c55
-rw-r--r--contrib/ntp/libntp/strdup.c20
-rw-r--r--contrib/ntp/libntp/systime.c28
-rw-r--r--contrib/ntp/libntp/tvtoa.c7
-rw-r--r--contrib/ntp/libntp/uglydate.c4
-rw-r--r--contrib/ntp/libntp/utvtoa.c4
-rw-r--r--contrib/ntp/libparse/Makefile.am97
-rw-r--r--contrib/ntp/libparse/Makefile.in448
-rw-r--r--contrib/ntp/libparse/clk_computime.c6
-rw-r--r--contrib/ntp/libparse/clk_dcf7000.c5
-rw-r--r--contrib/ntp/libparse/clk_hopf6021.c5
-rw-r--r--contrib/ntp/libparse/clk_meinberg.c7
-rw-r--r--contrib/ntp/libparse/clk_rawdcf.c5
-rw-r--r--contrib/ntp/libparse/clk_rcc8000.c5
-rw-r--r--contrib/ntp/libparse/clk_schmid.c5
-rw-r--r--contrib/ntp/libparse/clk_trimtaip.c4
-rw-r--r--contrib/ntp/libparse/clk_trimtsip.c9
-rw-r--r--contrib/ntp/libparse/clk_varitext.c11
-rw-r--r--contrib/ntp/libparse/clk_wharton.c9
-rw-r--r--contrib/ntp/libparse/parse.c7
-rw-r--r--contrib/ntp/libparse/parse_conf.c3
-rw-r--r--contrib/ntp/libparse/parsesolaris.c2
-rw-r--r--contrib/ntp/librsaref/Makefile.am46
-rw-r--r--contrib/ntp/librsaref/Makefile.in324
-rwxr-xr-xcontrib/ntp/missing25
-rwxr-xr-xcontrib/ntp/mkinstalldirs2
-rwxr-xr-xcontrib/ntp/ntp_update69
-rw-r--r--contrib/ntp/ntpd/Makefile.am16
-rw-r--r--contrib/ntp/ntpd/Makefile.in558
-rw-r--r--contrib/ntp/ntpd/check_y2k.c14
-rw-r--r--contrib/ntp/ntpd/cmd_args.c313
-rw-r--r--contrib/ntp/ntpd/ntp_config.c937
-rw-r--r--contrib/ntp/ntpd/ntp_control.c1477
-rw-r--r--contrib/ntp/ntpd/ntp_crypto.c2060
-rw-r--r--contrib/ntp/ntpd/ntp_intres.c246
-rw-r--r--contrib/ntp/ntpd/ntp_io.c298
-rw-r--r--contrib/ntp/ntpd/ntp_loopfilter.c651
-rw-r--r--contrib/ntp/ntpd/ntp_monitor.c17
-rw-r--r--contrib/ntp/ntpd/ntp_peer.c566
-rw-r--r--contrib/ntp/ntpd/ntp_proto.c2559
-rw-r--r--contrib/ntp/ntpd/ntp_refclock.c384
-rw-r--r--contrib/ntp/ntpd/ntp_request.c272
-rw-r--r--contrib/ntp/ntpd/ntp_resolver.c987
-rw-r--r--contrib/ntp/ntpd/ntp_timer.c45
-rw-r--r--contrib/ntp/ntpd/ntp_util.c57
-rw-r--r--contrib/ntp/ntpd/ntpd.c226
-rw-r--r--contrib/ntp/ntpd/refclock_acts.c34
-rw-r--r--contrib/ntp/ntpd/refclock_arbiter.c7
-rw-r--r--contrib/ntp/ntpd/refclock_arc.c10
-rw-r--r--contrib/ntp/ntpd/refclock_as2201.c7
-rw-r--r--contrib/ntp/ntpd/refclock_atom.c608
-rw-r--r--contrib/ntp/ntpd/refclock_bancomm.c77
-rw-r--r--contrib/ntp/ntpd/refclock_chronolog.c8
-rw-r--r--contrib/ntp/ntpd/refclock_chu.c215
-rw-r--r--contrib/ntp/ntpd/refclock_conf.c21
-rw-r--r--contrib/ntp/ntpd/refclock_datum.c32
-rw-r--r--contrib/ntp/ntpd/refclock_dumbclock.c8
-rw-r--r--contrib/ntp/ntpd/refclock_fg.c2
-rw-r--r--contrib/ntp/ntpd/refclock_gpsvme.c13
-rw-r--r--contrib/ntp/ntpd/refclock_heath.c288
-rw-r--r--contrib/ntp/ntpd/refclock_hopfpci.c274
-rw-r--r--contrib/ntp/ntpd/refclock_hopfser.c372
-rw-r--r--contrib/ntp/ntpd/refclock_hpgps.c10
-rw-r--r--contrib/ntp/ntpd/refclock_irig.c15
-rw-r--r--contrib/ntp/ntpd/refclock_jupiter.c9
-rw-r--r--contrib/ntp/ntpd/refclock_leitch.c10
-rw-r--r--contrib/ntp/ntpd/refclock_local.c16
-rw-r--r--contrib/ntp/ntpd/refclock_msfees.c9
-rw-r--r--contrib/ntp/ntpd/refclock_mx4200.c404
-rw-r--r--contrib/ntp/ntpd/refclock_nmea.c427
-rw-r--r--contrib/ntp/ntpd/refclock_oncore.c2039
-rw-r--r--contrib/ntp/ntpd/refclock_palisade.c2
-rw-r--r--contrib/ntp/ntpd/refclock_palisade.h6
-rw-r--r--contrib/ntp/ntpd/refclock_parse.c44
-rw-r--r--contrib/ntp/ntpd/refclock_pcf.c28
-rw-r--r--contrib/ntp/ntpd/refclock_pst.c7
-rw-r--r--contrib/ntp/ntpd/refclock_shm.c44
-rw-r--r--contrib/ntp/ntpd/refclock_tpro.c7
-rw-r--r--contrib/ntp/ntpd/refclock_trak.c11
-rw-r--r--contrib/ntp/ntpd/refclock_true.c69
-rw-r--r--contrib/ntp/ntpd/refclock_ulink.c395
-rw-r--r--contrib/ntp/ntpd/refclock_usno.c15
-rw-r--r--contrib/ntp/ntpd/refclock_wwv.c44
-rw-r--r--contrib/ntp/ntpd/refclock_wwvb.c18
-rw-r--r--contrib/ntp/ntpdate/Makefile.am2
-rw-r--r--contrib/ntp/ntpdate/Makefile.in294
-rw-r--r--contrib/ntp/ntpdate/ntpdate.c65
-rw-r--r--contrib/ntp/ntpdate/ntpdate.h4
-rw-r--r--contrib/ntp/ntpdate/ntptime_config.c13
-rw-r--r--contrib/ntp/ntpdate/ntptimeset.c42
-rw-r--r--contrib/ntp/ntpdc/Makefile.in280
-rw-r--r--contrib/ntp/ntpdc/ntpdc.c44
-rw-r--r--contrib/ntp/ntpdc/ntpdc_ops.c32
-rw-r--r--contrib/ntp/ntpq/Makefile.am2
-rw-r--r--contrib/ntp/ntpq/Makefile.in282
-rw-r--r--contrib/ntp/ntpq/ntpq.c52
-rw-r--r--contrib/ntp/ntpq/ntpq_ops.c16
-rw-r--r--contrib/ntp/ntptrace/Makefile.in278
-rw-r--r--contrib/ntp/ntptrace/ntptrace.c39
-rw-r--r--contrib/ntp/parseutil/Makefile.am1
-rw-r--r--contrib/ntp/parseutil/Makefile.in262
-rw-r--r--contrib/ntp/parseutil/testdcf.c6
-rw-r--r--contrib/ntp/scripts/Makefile.am5
-rw-r--r--contrib/ntp/scripts/Makefile.in201
-rw-r--r--contrib/ntp/scripts/README6
-rw-r--r--contrib/ntp/scripts/calc_tickadj.in38
-rw-r--r--contrib/ntp/scripts/checktime.in79
-rw-r--r--contrib/ntp/scripts/freq_adj.in97
-rw-r--r--contrib/ntp/scripts/mkver.in13
-rw-r--r--contrib/ntp/scripts/monitoring/README32
-rw-r--r--contrib/ntp/scripts/monitoring/lr.pl156
-rw-r--r--contrib/ntp/scripts/monitoring/ntp.pl9
-rw-r--r--contrib/ntp/scripts/monitoring/ntploopstat5
-rwxr-xr-xcontrib/ntp/scripts/ntp-close8
-rwxr-xr-xcontrib/ntp/scripts/ntp-restart7
-rw-r--r--contrib/ntp/scripts/ntp-wait.in42
-rw-r--r--contrib/ntp/scripts/ntpsweep.in301
-rw-r--r--contrib/ntp/scripts/plot_summary.in337
-rwxr-xr-xcontrib/ntp/scripts/stats/summary.sh2
-rw-r--r--contrib/ntp/scripts/summary.in373
-rw-r--r--contrib/ntp/util/Makefile.am9
-rw-r--r--contrib/ntp/util/Makefile.in384
-rw-r--r--contrib/ntp/util/hist.c10
-rw-r--r--contrib/ntp/util/jitter.c3
-rw-r--r--contrib/ntp/util/kern.c1
-rw-r--r--contrib/ntp/util/ntp-genkeys.c1042
-rw-r--r--contrib/ntp/util/ntptime.c69
-rw-r--r--contrib/ntp/util/precision.c5
-rw-r--r--contrib/ntp/util/tickadj.c8
-rw-r--r--contrib/ntp/util/timetrim.c10
266 files changed, 44394 insertions, 23421 deletions
diff --git a/contrib/ntp/COPYRIGHT b/contrib/ntp/COPYRIGHT
index 17504188d668..72d07a813009 100644
--- a/contrib/ntp/COPYRIGHT
+++ b/contrib/ntp/COPYRIGHT
@@ -2,162 +2,172 @@ This file is automatically generated from html/copyright.htm
Copyright Notice
- [INLINE] "Clone me," says Dolly sheepishly
+ [sheepb.jpg] "Clone me," says Dolly sheepishly
_________________________________________________________________
The following copyright notice applies to all files collectively
called the Network Time Protocol Version 4 Distribution. Unless
specifically declared otherwise in an individual file, this notice
applies as if the text was explicitly included in the file.
-
-/***********************************************************************
- * *
- * Copyright (c) David L. Mills 1992-2000 *
- * *
- * Permission to use, copy, modify, and distribute this software and *
- * its documentation for any purpose and without fee is hereby *
- * granted, provided that the above copyright notice appears in all *
- * copies and that both the copyright notice and this permission *
- * notice appear in supporting documentation, and that the name *
- * University of Delaware not be used in advertising or publicity *
- * pertaining to distribution of the software without specific, *
- * written prior permission. The University of Delaware makes no *
- * representations about the suitability this software for any *
- * purpose. It is provided "as is" without express or implied *
- * warranty. *
- * *
- ***********************************************************************
- */
+***********************************************************************
+* *
+* Copyright (c) David L. Mills 1992-2001 *
+* *
+* Permission to use, copy, modify, and distribute this software and *
+* its documentation for any purpose and without fee is hereby *
+* granted, provided that the above copyright notice appears in all *
+* copies and that both the copyright notice and this permission *
+* notice appear in supporting documentation, and that the name *
+* University of Delaware not be used in advertising or publicity *
+* pertaining to distribution of the software without specific, *
+* written prior permission. The University of Delaware makes no *
+* representations about the suitability this software for any *
+* purpose. It is provided "as is" without express or implied *
+* warranty. *
+* *
+***********************************************************************
The following individuals contributed in part to the Network Time
Protocol Distribution Version 4 and are acknowledged as authors of
this work.
1. [1]Mark Andrews <marka@syd.dms.csiro.au> Leitch atomic clock
controller
- 2. [2]Viraj Bais <vbais@mailman1.intel.com> and [3]Clayton Kirkwood
+ 2. [2]Bernd Altmeier <altmeier@atlsoft.de> hopf Elektronik serial
+ line and PCI-bus devices
+ 3. [3]Viraj Bais <vbais@mailman1.intel.com> and [4]Clayton Kirkwood
<kirkwood@striderfm.intel.com> port to WindowsNT 3.5
- 3. [4]Michael Barone <michael,barone@lmco.com> GPSVME fixes
- 4. [5]Karl Berry <karl@owl.HQ.ileaf.com> syslog to file option
- 5. [6]Greg Brackley <greg.brackley@bigfoot.com> Major rework of WINNT
+ 4. [5]Michael Barone <michael,barone@lmco.com> GPSVME fixes
+ 5. [6]Karl Berry <karl@owl.HQ.ileaf.com> syslog to file option
+ 6. [7]Greg Brackley <greg.brackley@bigfoot.com> Major rework of WINNT
port. Clean up recvbuf and iosignal code into separate modules.
- 6. [7]Piete Brooks <Piete.Brooks@cl.cam.ac.uk> MSF clock driver,
+ 7. [8]Marc Brett <Marc.Brett@westgeo.com> Magnavox GPS clock driver
+ 8. [9]Piete Brooks <Piete.Brooks@cl.cam.ac.uk> MSF clock driver,
Trimble PARSE support
- 7. [8]Steve Clift <clift@ml.csiro.au> OMEGA clock driver
- 8. [9]Casey Crellin <casey@csc.co.za> vxWorks (Tornado) port and help
- with target configuration
- 9. [10]Sven Dietrich <sven_dietrich@trimble.com> Palisade reference
+ 9. [10]Reg Clemens <reg@dwf.com> Oncore driver (Current maintainer)
+ 10. [11]Steve Clift <clift@ml.csiro.au> OMEGA clock driver
+ 11. [12]Casey Crellin <casey@csc.co.za> vxWorks (Tornado) port and
+ help with target configuration
+ 12. [13]Sven Dietrich <sven_dietrich@trimble.com> Palisade reference
clock driver, NT adj. residuals, integrated Greg's Winnt port.
- 10. [11]John A. Dundas III <dundas@salt.jpl.nasa.gov> Apple A/UX port
- 11. [12]Torsten Duwe <duwe@immd4.informatik.uni-erlangen.de> Linux
+ 13. [14]John A. Dundas III <dundas@salt.jpl.nasa.gov> Apple A/UX port
+ 14. [15]Torsten Duwe <duwe@immd4.informatik.uni-erlangen.de> Linux
port
- 12. [13]Dennis Ferguson <dennis@mrbill.canet.ca> foundation code for
+ 15. [16]Dennis Ferguson <dennis@mrbill.canet.ca> foundation code for
NTP Version 2 as specified in RFC-1119
- 13. [14]Glenn Hollinger <glenn@herald.usask.ca> GOES clock driver
- 14. [15]Mike Iglesias <iglesias@uci.edu> DEC Alpha port
- 15. [16]Jim Jagielski <jim@jagubox.gsfc.nasa.gov> A/UX port
- 16. [17]Jeff Johnson <jbj@chatham.usdesign.com> massive prototyping
+ 16. [17]Glenn Hollinger <glenn@herald.usask.ca> GOES clock driver
+ 17. [18]Mike Iglesias <iglesias@uci.edu> DEC Alpha port
+ 18. [19]Jim Jagielski <jim@jagubox.gsfc.nasa.gov> A/UX port
+ 19. [20]Jeff Johnson <jbj@chatham.usdesign.com> massive prototyping
overhaul
- 17. [18]William L. Jones <jones@hermes.chpc.utexas.edu> RS/6000 AIX
- modifications, HPUX modifications
- 18. [19]Hans Lambermont <Hans.Lambermont@nl.origin-it.com> or
- [20]<H.Lambermont@chello.nl> ntpsweep
- 19. [21]Frank Kardel [22]<Frank.Kardel@informatik.uni-erlangen.de>
+ 20. [21]Hans Lambermont <Hans.Lambermont@nl.origin-it.com> or
+ [22]<H.Lambermont@chello.nl> ntpsweep
+ 21. [23]Poul-Henning Kamp <phk@FreeBSD.ORG> Oncore driver (Original
+ author)
+ 22. [24]Frank Kardel [25]<Frank.Kardel@informatik.uni-erlangen.de>
PARSE <GENERIC> driver (14 reference clocks), STREAMS modules for
PARSE, support scripts, syslog cleanup
- 20. [23]Dave Katz <dkatz@cisco.com> RS/6000 AIX port
- 21. [24]Craig Leres <leres@ee.lbl.gov> 4.4BSD port, ppsclock,
- Maganavox GPS clock driver
- 22. [25]George Lindholm <lindholm@ucs.ubc.ca> SunOS 5.1 port
- 23. [26]Louis A. Mamakos <louie@ni.umd.edu> MD5-based authentication
- 24. [27]Lars H. Mathiesen <thorinn@diku.dk> adaptation of foundation
+ 23. [26]William L. Jones <jones@hermes.chpc.utexas.edu> RS/6000 AIX
+ modifications, HPUX modifications
+ 24. [27]Dave Katz <dkatz@cisco.com> RS/6000 AIX port
+ 25. [28]Craig Leres <leres@ee.lbl.gov> 4.4BSD port, ppsclock, Magnavox
+ GPS clock driver
+ 26. [29]George Lindholm <lindholm@ucs.ubc.ca> SunOS 5.1 port
+ 27. [30]Louis A. Mamakos <louie@ni.umd.edu> MD5-based authentication
+ 28. [31]Lars H. Mathiesen <thorinn@diku.dk> adaptation of foundation
code for Version 3 as specified in RFC-1305
- 25. [28]David L. Mills <mills@udel.edu> Version 4 foundation: clock
+ 29. [32]David L. Mills <mills@udel.edu> Version 4 foundation: clock
discipline, authentication, precision kernel; clock drivers:
Spectracom, Austron, Arbiter, Heath, ATOM, ACTS, KSI/Odetics;
audio clock drivers: CHU, WWV/H, IRIG
- 26. [29]Wolfgang Moeller <moeller@gwdgv1.dnet.gwdg.de> VMS port
- 27. [30]Jeffrey Mogul <mogul@pa.dec.com> ntptrace utility
- 28. [31]Tom Moore <tmoore@fievel.daytonoh.ncr.com> i386 svr4 port
- 29. [32]Derek Mulcahy <derek@toybox.demon.co.uk> and [33]Damon
+ 30. [33]Wolfgang Moeller <moeller@gwdgv1.dnet.gwdg.de> VMS port
+ 31. [34]Jeffrey Mogul <mogul@pa.dec.com> ntptrace utility
+ 32. [35]Tom Moore <tmoore@fievel.daytonoh.ncr.com> i386 svr4 port
+ 33. [36]Kamal A Mostafa <kamal@whence.com> SCO OpenServer port
+ 34. [37]Derek Mulcahy <derek@toybox.demon.co.uk> and [38]Damon
Hart-Davis <d@hd.org> ARCRON MSF clock driver
- 30. [34]Rainer Pruy <Rainer.Pruy@informatik.uni-erlangen.de>
+ 35. [39]Rainer Pruy <Rainer.Pruy@informatik.uni-erlangen.de>
monitoring/trap scripts, statistics file handling
- 31. [35]Dirce Richards <dirce@zk3.dec.com> Digital UNIX V4.0 port
- 32. [36]Wilfredo Sánchez <wsanchez@apple.com> added support for
+ 36. [40]Dirce Richards <dirce@zk3.dec.com> Digital UNIX V4.0 port
+ 37. [41]Wilfredo Sánchez <wsanchez@apple.com> added support for
NetInfo
- 33. [37]Nick Sayer <mrapple@quack.kfu.com> SunOS streams modules
- 34. [38]Jack Sasportas <jack@innovativeinternet.com> Saved a Lot of
+ 38. [42]Nick Sayer <mrapple@quack.kfu.com> SunOS streams modules
+ 39. [43]Jack Sasportas <jack@innovativeinternet.com> Saved a Lot of
space on the stuff in the html/pic/ subdirectory
- 35. [39]Ray Schnitzler <schnitz@unipress.com> Unixware1 port
- 36. [40]Michael Shields <shields@tembel.org> USNO clock driver
- 37. [41]Jeff Steinman <jss@pebbles.jpl.nasa.gov> Datum PTS clock
+ 40. [44]Ray Schnitzler <schnitz@unipress.com> Unixware1 port
+ 41. [45]Michael Shields <shields@tembel.org> USNO clock driver
+ 42. [46]Jeff Steinman <jss@pebbles.jpl.nasa.gov> Datum PTS clock
driver
- 38. [42]Harlan Stenn <harlan@pfcs.com> GNU automake/autoconfigure
+ 43. [47]Harlan Stenn <harlan@pfcs.com> GNU automake/autoconfigure
makeover, various other bits (see the ChangeLog)
- 39. [43]Kenneth Stone <ken@sdd.hp.com> HP-UX port
- 40. [44]Ajit Thyagarajan <ajit@ee.udel.edu>IP multicast/anycast
+ 44. [48]Kenneth Stone <ken@sdd.hp.com> HP-UX port
+ 45. [49]Ajit Thyagarajan <ajit@ee.udel.edu>IP multicast/anycast
support
- 41. [45]Tomoaki TSURUOKA <tsuruoka@nc.fukuoka-u.ac.jp>TRAK clock
+ 46. [50]Tomoaki TSURUOKA <tsuruoka@nc.fukuoka-u.ac.jp>TRAK clock
driver
- 42. [46]Paul A Vixie <vixie@vix.com> TrueTime GPS driver, generic
+ 47. [51]Paul A Vixie <vixie@vix.com> TrueTime GPS driver, generic
TrueTime clock driver
- 43. [47]Ulrich Windl <Ulrich.Windl@rz.uni-regensburg.de> corrected and
+ 48. [52]Ulrich Windl <Ulrich.Windl@rz.uni-regensburg.de> corrected and
validated HTML documents according to the HTML DTD
_________________________________________________________________
- [48][LINK]
+ [53]gif
- [49]David L. Mills <mills@udel.edu>
+ [54]David L. Mills <mills@udel.edu>
References
1. mailto:marka@syd.dms.csiro.au
- 2. mailto:vbais@mailman1.intel.co
- 3. mailto:kirkwood@striderfm.intel.com
- 4. mailto:michael.barone@lmco.com
- 5. mailto:karl@owl.HQ.ileaf.com
- 6. mailto:greg.brackley@bigfoot.com
- 7. mailto:Piete.Brooks@cl.cam.ac.uk
- 8. mailto:clift@ml.csiro.au
- 9. mailto:casey@csc.co.za
- 10. mailto:Sven_Dietrich@trimble.COM
- 11. mailto:dundas@salt.jpl.nasa.gov
- 12. mailto:duwe@immd4.informatik.uni-erlangen.de
- 13. mailto:dennis@mrbill.canet.ca
- 14. mailto:glenn@herald.usask.ca
- 15. mailto:iglesias@uci.edu
- 16. mailto:jagubox.gsfc.nasa.gov
- 17. mailto:jbj@chatham.usdesign.com
- 18. mailto:jones@hermes.chpc.utexas.edu
- 19. mailto:Hans.Lambermont@nl.origin-it.com
- 20. mailto:H.Lambermont@chello.nl
- 21. http://www4.informatik.uni-erlangen.de/~kardel
- 22. mailto:Frank.Kardel@informatik.uni-erlangen.de
- 23. mailto:dkatz@cisco.com
- 24. mailto:leres@ee.lbl.gov
- 25. mailto:lindholm@ucs.ubc.ca
- 26. mailto:louie@ni.umd.edu
- 27. mailto:thorinn@diku.dk
- 28. mailto:mills@udel.edu
- 29. mailto:moeller@gwdgv1.dnet.gwdg.de
- 30. mailto:mogul@pa.dec.com
- 31. mailto:tmoore@fievel.daytonoh.ncr.com
- 32. mailto:derek@toybox.demon.co.uk
- 33. mailto:d@hd.org
- 34. mailto:Rainer.Pruy@informatik.uni-erlangen.de
- 35. mailto:dirce@zk3.dec.com
- 36. mailto:wsanchez@apple.com
- 37. mailto:mrapple@quack.kfu.com
- 38. mailto:jack@innovativeinternet.com
- 39. mailto:schnitz@unipress.com
- 40. mailto:shields@tembel.org
- 41. mailto:pebbles.jpl.nasa.gov
- 42. mailto:harlan@pfcs.com
- 43. mailto:ken@sdd.hp.com
- 44. mailto:ajit@ee.udel.edu
- 45. mailto:tsuruoka@nc.fukuoka-u.ac.jp
- 46. mailto:vixie@vix.com
- 47. mailto:Ulrich.Windl@rz.uni-regensburg.de
- 48. file://localhost/backroom/ntp4+/html/index.htm
- 49. mailto:mills@udel.edu
+ 2. mailto:altmeier@atlsoft.de
+ 3. mailto:vbais@mailman1.intel.co
+ 4. mailto:kirkwood@striderfm.intel.com
+ 5. mailto:michael.barone@lmco.com
+ 6. mailto:karl@owl.HQ.ileaf.com
+ 7. mailto:greg.brackley@bigfoot.com
+ 8. mailto:Marc.Brett@westgeo.com
+ 9. mailto:Piete.Brooks@cl.cam.ac.uk
+ 10. mailto:reg@dwf.com
+ 11. mailto:clift@ml.csiro.au
+ 12. mailto:casey@csc.co.za
+ 13. mailto:Sven_Dietrich@trimble.COM
+ 14. mailto:dundas@salt.jpl.nasa.gov
+ 15. mailto:duwe@immd4.informatik.uni-erlangen.de
+ 16. mailto:dennis@mrbill.canet.ca
+ 17. mailto:glenn@herald.usask.ca
+ 18. mailto:iglesias@uci.edu
+ 19. mailto:jagubox.gsfc.nasa.gov
+ 20. mailto:jbj@chatham.usdesign.com
+ 21. mailto:Hans.Lambermont@nl.origin-it.com
+ 22. mailto:H.Lambermont@chello.nl
+ 23. mailto:phk@FreeBSD.ORG
+ 24. http://www4.informatik.uni-erlangen.de/~kardel
+ 25. mailto:Frank.Kardel@informatik.uni-erlangen.de
+ 26. mailto:jones@hermes.chpc.utexas.edu
+ 27. mailto:dkatz@cisco.com
+ 28. mailto:leres@ee.lbl.gov
+ 29. mailto:lindholm@ucs.ubc.ca
+ 30. mailto:louie@ni.umd.edu
+ 31. mailto:thorinn@diku.dk
+ 32. mailto:mills@udel.edu
+ 33. mailto:moeller@gwdgv1.dnet.gwdg.de
+ 34. mailto:mogul@pa.dec.com
+ 35. mailto:tmoore@fievel.daytonoh.ncr.com
+ 36. mailto:kamal@whence.com
+ 37. mailto:derek@toybox.demon.co.uk
+ 38. mailto:d@hd.org
+ 39. mailto:Rainer.Pruy@informatik.uni-erlangen.de
+ 40. mailto:dirce@zk3.dec.com
+ 41. mailto:wsanchez@apple.com
+ 42. mailto:mrapple@quack.kfu.com
+ 43. mailto:jack@innovativeinternet.com
+ 44. mailto:schnitz@unipress.com
+ 45. mailto:shields@tembel.org
+ 46. mailto:pebbles.jpl.nasa.gov
+ 47. mailto:harlan@pfcs.com
+ 48. mailto:ken@sdd.hp.com
+ 49. mailto:ajit@ee.udel.edu
+ 50. mailto:tsuruoka@nc.fukuoka-u.ac.jp
+ 51. mailto:vixie@vix.com
+ 52. mailto:Ulrich.Windl@rz.uni-regensburg.de
+ 53. file://localhost/backroom/ntp4/html/index.htm
+ 54. mailto:mills@udel.edu
diff --git a/contrib/ntp/ChangeLog b/contrib/ntp/ChangeLog
index 1c498a6f014e..69b566ee0194 100644
--- a/contrib/ntp/ChangeLog
+++ b/contrib/ntp/ChangeLog
@@ -1,3 +1,2800 @@
+2001-08-01 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.1.0
+
+2001-07-27 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/refclock_oncore.c (oncore_start): Set pps_enable=1, just
+ like the atom driver does.
+ From: reg@dwf.com
+
+ * ntpd/refclock_nmea.c (nmea_ppsapi): Set pps_enable=1, just like
+ the atom driver does.
+ From: Scott Allendorf <sca@newton.physics.uiowa.edu>
+
+ * ntpd/ntp_config.c (getconfig): CONF_CLOCK_PANIC was using the
+ wrong config flag.
+ From: <justin_forrester@hp.com>
+
+2001-07-10 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99m-rc3
+
+2001-07-06 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntp_update: COPYRIGHT needs a touch.
+ From: Mike Stump <mrs@kithrup.com>
+
+2001-07-04 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * html/config.htm: Major cleanup.
+ From: Martin Janzen <janzen@pixelmetrix.com>
+
+ * configure.in (rt library check): Don't look for -lrt under
+ Linux. Under glibc-2.1.2 and -2.2.2 (at least), the POSIX-
+ compatibility real-time library does strange things with threads
+ as other processes and we're getting lots of complaints about it.
+ Reported by: Juha Sarlin <juha@c3l.com>
+
+2001-06-30 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * html/driver35.htm: Update email address.
+
+2001-06-25 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/refclock_oncore.c (oncore_msg_BaEaHa): Fix wrong offset for
+ rsm.bad_almanac
+ From: Reynir Siik <reynir@royal.net>
+
+2001-06-12 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99m-rc2
+
+2001-06-10 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_config.c:
+ * include/ntp_config.h: includefile config keyword support
+ From: Dean Gibson <timekeeper@tcp-udp.net>
+
+2001-06-08 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99m-rc1b
+
+ * ntpd/refclock_true.c (true_debug): Bump some buffer sizes to
+ reduce/eliminate chance of buffer overflow. Use snprintf()
+ instead of sprintf(). Do a better job of opening the debug file.
+ * ntpd/ntp_control.c (ctl_getitem): Count overflow packets as bad
+ and return a BADFMT.
+ * ntpd/ntp_config.c (save_resolve): call fdopen() with the correct
+ mode.
+ From: Bela Lubkin <belal@sco.com>
+
+2001-06-03 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * include/ntp.h (RES_ALLFLAGS): Add RES_DEMOBILIZE.
+ From: Dean Gibson <timekeeper@tcp-udp.net>
+
+ * configure.in: 4.0.99m-rc1a
+
+2001-06-02 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_refclock.c (refclock_open): Add O_NOCTTY to the open()
+ flags when opening a serial port.
+ Reported by: joseph lang <tcnojl1@earthlink.net>
+
+2001-05-31 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * html/notes.htm: Typo fix.
+ From: John Stone <johns@ks.uiuc.edu>
+
+ * configure.in: 4.0.99m-rc1
+
+ * html/monopt.htm: Typo fix.
+ * html/confopt.htm: Cruft removal.
+ From: John Stone <johns@ks.uiuc.edu>
+
+2001-05-30 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * README.cvs: More updates and cleanup.
+
+ * ntpd/ntp_loopfilter.c (loop_config):
+ Check against STA_NANO instead of (NTP_API > 3) to catch kernels
+ that were rolled while the spec was evolving.
+ From: John.Hay@icomtek.csir.co.za
+
+ * README.cvs: Note that we want to check out NTP into a clean
+ subdir.
+ Reported by jrd@cc.usu.edu (Joe Doupnik)
+
+2001-05-27 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99k40
+
+ * include/ntp_refclock.h: Median Filter (SAMPLE - macro) - change
+ to use most recent MAXSTAGE entries when the filter overflows (ie
+ driver poking say once per second with poll > MAXSTAGE) rather
+ than blocking after MAXSTAGE entries (turf oldest rather than turf
+ most recent).
+ From: John Woolner <vk1et@tpg.com.au>
+
+ * ntpd/refclock_true.c:
+ a. Don't cream pp->a_lastcode when we get a <cr><lf> pair
+ b. Fix up pp->leap handling to work correctly
+ c. clear CEVNT_BADTIME etc warnings when we get good clock
+ CEVNT_NOMINAL.
+ From: John Woolner <vk1et@tpg.com.au>
+
+ * kernel/sys/pcl720.h:
+ Add support for the XL clock to refclock_true.c
+ From: Paul A Vixie <vixie@mfnx.net>
+
+ * ntpd/ntp_loopfilter.c (local_clock): One more attempt at
+ "improving" the panic message.
+
+2001-05-26 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in (ac_cv_func_ctty_for_f_setown): BSDI3 needs a ctty
+ for F_SETOWN, too.
+ From: Paul A Vixie <vixie@mfnx.net>
+
+2001-05-24 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * html/ntpd.htm: Typo.
+ From: John Stone <johns@ks.uiuc.edu>
+
+2001-05-23 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99k39
+
+ * ntpd/ntp_loopfilter.c (local_clock): huffpuff cleanup/improvements.
+ (huffpuff): Cleanup/improvements.
+ (loop_config): huffpuff initialization cleanup/improvements.
+ From: Dave Mills, Terje, Mark, and John?
+
+2001-05-22 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * html/release.htm:
+ * html/ntpd.htm:
+ * html/miscopt.htm:
+ From: Dave Mills: Updates.
+
+2001-05-21 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99k38
+
+ * ntpd/ntp_proto.c (clock_filter): Huff-n-Puff and Popcorn
+ improvements.
+ * ntpd/ntp_loopfilter.c (local_clock): Debug cleanup
+ From: Dave Mills.
+
+ * include/ntp_syscall.h (ntp_gettime): Updated patch from Ulrich.
+ My original attempt was not backwards compatible.
+
+2001-05-17 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * include/ntp_syscall.h (ntp_gettime): Fill in the tai member.
+ From: Ulrich Windl <Ulrich.Windl@rz.uni-regensburg.de>
+
+ * configure.in: 4.0.99k37
+
+ * ntpd/ntp_proto.c (clock_filter): Lose "off", xtemp and ytemp,
+ and some obsoleted calculations. Set the peer->offset and
+ peer->delay from the filter stages.
+
+ * ntpd/ntp_loopfilter.c: Comment/document improvements.
+ (local_clock): correct the offset by one-half the difference
+ between the sample delay and minimum delay. Lose "mu" from the
+ debug message.
+ From: Dave Mills.
+
+2001-05-15 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99k36
+
+ * ntpd/ntp_loopfilter.c: Huff-n-puff cleanup
+ From: Dave Mills.
+
+2001-05-14 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99k35
+
+ * ntpd/refclock_atom.c (atom_ppsapi): set pps_enable=1 if
+ enb_hardpps.
+ * ntpd/ntp_timer.c: huffpuff support.
+ (init_timer): huffpuff support.
+ (timer): huffpuff support.
+ * ntpd/ntp_proto.c (init_proto): Initialize pps_enable to 0, not 1.
+ * ntpd/ntp_loopfilter.c (CLOCK_HUFFPUFF): Added.
+ Add huff-n-puff filter variables.
+ (local_clock): Lose "pps sync enabled" log noise.
+ (huffpuff): Added.
+ (loop_config): LOOP_MINPOLL and LOOP_ALLAN were missing the
+ trailing break; add LOOP_HUFFPUFF.
+ * ntpd/ntp_config.c: tinker huffpuff added.
+ (getconfig): CONF_CLOCK_HUFFPUFF support.
+ * include/ntpd.h: huffpuff() declaration.
+ * include/ntp_config.h (CONF_CLOCK_HUFFPUFF): Added.
+ * include/ntp.h (HUFFPUFF): Added.
+ (LOOP_HUFFPUFF): Added.
+ From: Dave Mills.
+
+2001-05-11 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * html/driver20.htm: Reality check.
+ * ntpd/refclock_nmea.c: Comment cleanup
+ From: John Woolner <vk1et@tpg.com.au>
+
+ * html/release.htm: Cleanup (at least).
+ * html/refclock.htm: Cleanup (at least).
+ * html/kern.htm: Cleanup (at least).
+ * html/index.htm: Cleanup (at least).
+ * html/extern.htm: Cleanup (at least).
+ * html/driver1.htm: Cleanup (at least).
+ * html/debug.htm: Cleanp (at least).
+ * html/accopt.htm: KoD documentation update.
+ From: Dave Mills.
+
+ * configure.in: 4.0.99k34
+
+ * ntpd/ntp_util.c (record_loop_stats): values are now passed in.
+ * ntpd/ntp_loopfilter.c (local_clock): pass the values to
+ record_loop_stats().
+ * include/ntpd.h: Pass the parameters in to record_loop_stats().
+ With the discipline loop opened (disable ntp) the local clock
+ updates were not being sent to loopstats. That now is.
+ From: Dave Mills.
+
+2001-05-10 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99k33
+
+ * ntpd/ntp_proto.c (receive): Validate the source port. Lose
+ NTPv1 support.
+ * ntpd/ntp_loopfilter.c (local_clock): Sanity check sys_poll
+ earlier instead of later.
+ From: Dave Mills.
+
+ * ntpd/refclock_oncore.c (oncore_msg_any): We don't always have
+ GETTIMEOFDAY().
+
+2001-05-09 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/refclock_shm.c (shm_poll): Apply JAN_1970 correction after
+ calling TVTOTS(), just like everybody else does.
+ From: David Malone <dwmalone@maths.tcd.ie>
+
+ * ntpd/refclock_ulink.c: fixed 33x quality flag, added more
+ debugging stuff, updated 33x time code explanation.
+ From: s.l.smith (via j.c.lang).
+
+2001-05-08 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99k32
+
+ * ntpd/ntp_loopfilter.c: rstclock now takes a 3rd argument, the
+ last offset.
+ (init_loopfilter): Use it.
+ (local_clock): Use it. Clean up the code.
+ (loop_config): Use it.
+ (rstclock): Implement it. Clean up the code.
+ From Dave Mills.
+
+2001-05-06 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99k31
+
+ * ntpdc/ntpdc_ops.c (sysstats): That's 'bad packet format'
+ (instead of '... length'), and 'packets rejected' (instead of
+ 'limitation rejects'.
+ * ntpd/ntp_proto.c (receive): PUBKEY fixes. Move KoD stuff to
+ process_packet().
+ (process_packet): Move KoD stuff here...
+ (peer_clear): Unspec the stratum, too.
+ (clock_filter): Don't update peer->epoch here. Fix the filter
+ test when checking the epoch.
+ (fast_xmit): Send back STRATUM_UNSPEC on a KoD packet.
+ (init_proto): Initialize sys_jitter.
+
+ * ntpd/ntp_loopfilter.c: rstclock() takes 2 parameters now.
+ (init_loopfilter): Use it...
+ (local_clock): Ditto, and change the "mu" calculation. Improve
+ the jitter test in S_SYNC. Use peer->epoch (not current_time) to
+ update the last_time. Update debug info.
+ (rstclock): 2nd arg - the epoch to use. Use it.
+ (loop_config): update call to rstclock.
+ From: Dave Mills.
+
+2001-05-01 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ports/winnt/ntpd/ntpd.dsp: Add cmd_args.c
+ From: Wink Saville <wink@saville.com>
+
+2001-04-29 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpq/ntpq.c (tstflags): 11 now.
+ From: John Cochran <jdc@fiawol.org>
+
+ * ntpd/ntp_proto.c (receive): KoD updates. Improve the comments.
+ Lose the AM_PROCPKT restrictions test.
+ (peer_xmit): Check/report on no encryption key in packet.
+ (fast_xmit): Use peer_xmit's new packet length check code.
+ From Dave Mills.
+
+2001-04-28 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99k30
+
+2001-04-27 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpdc/ntpdc_ops.c: Added "kod", lost "demobilize".
+ * ntpd/ntp_config.c: Added "kod" keyword. Lose "demobilize" keyword.
+ * html/release.htm: Updated.
+ * html/accopt.htm: Updated.
+ From: Dave Mills.
+
+ * ntpq/ntpq.c: Reorder and add some TEST flag bits.
+ * ntpd/ntp_proto.c (transmit): Also bail if access denied.
+ (receive): Lose RES_DEMOBILIZE and (some?) RES_DONTSERVE and
+ RES_LIMITIED stuff. Update Kiss-Of-Death (KoD) docs.
+ Call fast_xmit with new 3rd parameter (restrict_mask).
+ Before checking for an authentic packet, check the restrict_mask
+ for RES_{DONTSERVE,LIMITED,NOPEER}.
+ Check restrictions in AM_PROCPKT case.
+ (peer_clear): Don't lose the stratum if the peer->flags don't
+ indicate FLAG_REFCLOCK.
+ (fast_xmit): Take restrict mask as a new argument, and handle
+ KoD. Reorder some code.
+ From: Dave Mills.
+
+2001-04-26 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpdc/ntpdc_ops.c: restrict/unrestrict support for version and
+ demobilize. Implement demobilze.
+ * ntpd/ntp_proto.c (receive): Improve version testing, including
+ RES_DEMOBILIZE support.
+ (fast_xmit): Patches to kiss-of-death packet.
+ * ntpd/ntp_loopfilter.c (local_clock): S_SYNC case now also checks
+ abs(clock_offset) against CLOCK_PGATE*sys_jitter.
+ * ntpd/ntp_config.c: CONF_RES_DEMOBILIZE/demobilize support.
+ * include/ntp_config.h (CONF_RES_DEMOBILIZE): Added.
+ * include/ntp.h (RES_DEMOBILIZE): Added.
+ From Dave Mills.
+
+2001-04-25 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * html/accopt.htm: Document the "version" parameter
+ From Dave Mills.
+
+ * ntpd/ntp_proto.c (fast_xmit): Implement DENY mode.
+ From Dave Mills.
+
+ * ntpd/ntp_config.c: Add the "allan" tinker variable.
+ From: Juha Sarlin <juha@c3l.tyreso.se>
+
+ * ntpd/refclock_hopfpci.c (hopfpci_start): Lose the "correct_any"
+ stuff - it's both obsolete and wrong.
+
+ * ntpd/ntp_proto.c (receive): Keep track of packet versions.
+ Implement RES_LIMITED.
+ * include/ntp_config.h (CONF_RES_LIMITED):
+ * include/ntp.h (RES_LIMITED): Leave the bits in the original
+ order.
+ From Dave Mills.
+
+ * util/timetrim.c:
+ * util/Makefile.am:
+ * ntpdc/ntpdc_ops.c:
+ * ntpd/refclock_nmea.c:
+ * libntp/snprintf.c:
+ * configure.in:
+ * configure:
+ * config.h.in:
+ * aclocal.m4:
+ * acconfig.h:
+ Lint cleanup from: Marc Brett <mbrett@rgs0.london.waii.com>
+
+ * ntpd/ntp_config.c: Add "version" support.
+ (getconfig): version support.
+ * include/ntp_config.h (CONF_RES_VERSION): Added.
+ * include/ntp.h (RES_VERSION): Added.
+ From: Dave Mills.
+
+ * include/ntp_machine.h (ifreq): WinNT cleanup
+
+2001-04-23 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99k29
+
+ * html/miscopt.htm: Document the "allan" tinker variable.
+ * ntpd/ntp_proto.c (clock_filter): Update comments. Lose etemp;
+ we now use allan_xpt for this.
+ * ntpd/ntp_loopfilter.c: Added allan_xpt as a tinker variable.
+ Reorganize variables and improve comments.
+ (local_clock): Improve comments, use (new) allan_xpt instead of
+ CLOCK_ALLAN. Fix test in S_SYNC state. Update debug info.
+ (rstclock): No longer force allan_xpt to CVLOCK_ALLAN in S_FREQ,
+ S_SYNC, or default case.
+ (loop_config): Document dangerous tinker variables, and add
+ LOOP_ALLAN to the list.
+ * include/ntp_config.h (CONF_CLOCK_ALLAN): Added.
+ * include/ntp.h (LOOP_ALLAN): Added.
+ Allan intercept fixes from Dave Mills.
+
+ * scripts/mkver.in: Use the C locale so the dates come out in a
+ consistent format.
+ From: ASANO Naoyuki <n_asano@imjp.co.jp>
+
+ * build: Run "config.status" before the "make" because it probably
+ saves time and trouble. Probably...
+
+ * flock-build: Try building sequentially.
+
+2001-04-22 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in (ac_cv_make_tickadj): Fix it right...
+
+ * util/ntp-genkeys.c: extern config_netinfo, too.
+
+ * util/hist.c:
+ * ntptrace/ntptrace.c:
+ * ntpq/ntpq.c:
+ * ntpdc/ntpdc.c:
+ * ntpdate/ntptimeset.c:
+ * ntpdate/ntpdate.c:
+ * ntpd/refclock_parse.c:
+ * ntpd/refclock_msfees.c:
+ * ntpd/refclock_jupiter.c:
+ * ntpd/ntp_refclock.c:
+ * ntpd/ntp_io.c:
+ * libparse/clk_wharton.c:
+ * libparse/clk_varitext.c:
+ * libparse/clk_trimtaip.c:
+ * libparse/clk_schmid.c:
+ * libparse/clk_rcc8000.c:
+ * libparse/clk_rawdcf.c:
+ * libparse/clk_meinberg.c:
+ * libparse/clk_hopf6021.c:
+ * libparse/clk_dcf7000.c:
+ * libparse/clk_computime.c:
+ Lint. From: Simon Burge <simonb@wasabisystems.com>
+
+2001-04-21 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/refclock_nmea.c (nmea_receive): Fixes.
+ From: John Woolner <vk1et@tpg.com.au>
+
+ * util/ntp-genkeys.c: Declare check_netinfo, don't define it.
+ From: Jack Bryans <jbryans@csulb.edu>
+
+ * configure.in (RSASRCS): rsaref2 needs digit.h (I thought I fixed
+ this already).
+
+ * configure.in (CFLAGS): Disable -Wconversion, enable
+ -Wmissing-prototypes, and allow for -Werror.
+ From: Simon Burge <simonb@wasabisystems.com>
+
+ * util/ntp-genkeys.c (main): Reset the standard mask so the
+ symlinks are created with the standard mask.
+
+ * configure.in: 4.0.99k28
+
+ * ntpd/ntpd.c (ntpdmain): Use mode_t for umask value.
+
+ * util/ntp-genkeys.c: Create files with the right umask.
+
+ * util/ntp-genkeys.c: config_file should be declared, not defined.
+ * ntpd/refclock_mx4200.c (mx4200_pps): debug cleanup.
+ * ntpd/refclock_hopfser.c: If we're not using it, provide the _bs.
+ * ntpd/refclock_heath.c (heath_receive): Add missing "break"
+ statements.
+ * ntpd/ntp_proto.c: Lose extra definition of mode_ntpdate.
+ * librsaref/Makefile.am (nodist_librsaref_a_SOURCES): Put RSASRCS
+ on the same line as rsaref.h to improve portability.
+ * libntp/msyslog.c: Lint cleanup.
+ From: Marc.Brett@westerngeco.com
+
+ * util/ntp-genkeys.c:
+ * ntpdate/ntpdate.c:
+ * ntpd/ntp_config.c: Netinfo header reorder.
+ From: Jack Bryans <jbryans@csulb.edu>
+
+ * configure.in: timespec can be found by looking in goofy places
+ under SunOS.
+
+2001-04-20 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/refclock_nmea.c: PPSAPI cleanup, default to RMC sentences,
+ handle milliseconds, multiple sentences, other good stuff.
+ From: John Woolner <vk1et@tpg.com.au>, Marc.Brett@westerngeco.com,
+ John.Hay@icomtek.csir.co.za
+
+ * ntpd/ntp_proto.c (receive): In the AM_NEWBCL case, return in all
+ cases at the end.
+ * ntpd/ntp_peer.c (newpeer): Check cast_flags against MDF_BCLNT,
+ not against MDF_BCAST.
+ * ntpd/ntp_loopfilter.c (local_clock): Lose debug info.
+ * ntpd/ntp_crypto.c (crypto_recv): Bugfix.
+ From: Dave Mills.
+
+ * configure.in: 4.0.99k27
+
+ * ntpd/ntp_loopfilter.c (local_clock): Check clock_panic > 0.
+ Check clock_max > 0.
+ * html/ntpd.htm: Cleanup.
+ * html/miscopt.htm: Cleanup.
+ * html/confopt.htm: Cleanup minpoll documentation.
+ From: Dave Mills.
+
+2001-04-19 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/cmd_args.c (getstartup): check_netinfo needs an extern
+ declaration.
+ Reported by: Jack Bryans <jbryans@csulb.edu>
+
+ * configure.in (ac_cv_make_timetrim): Added.
+ * util/Makefile.am (bin_PROGRAMS): MAKE_TIMETRIM
+ Requested by: Jack Bryans <jbryans@csulb.edu>
+
+ * configure.in: 4.0.99k26
+
+ * util/ntp-genkeys.c:
+ * ntpd/refclock_oncore.c:
+ * ntpd/ntp_peer.c:
+ * libntp/msyslog.c:
+ * libntp/audio.c:
+ Lint cleanup.
+ From: Simon Burge <simonb@wasabisystems.com>
+
+ * ntpd/ntp_loopfilter.c (local_clock): debug message improvements
+ from Dave Mills.
+
+ * libntp/emalloc.c (emalloc): Tell people we are exiting if we log
+ an out-of-memory condition.
+
+ * util/ntp-genkeys.c (main): Don't allow '#' in a generated MD5
+ key. Reported by: Dave Tyson <Dave.Tyson@liverpool.ac.uk>
+
+2001-04-18 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_proto.c (clock_update): minpoll cleanup.
+ (clock_select): minpoll cleanup.
+ (clock_filter): Bugfixes from Mark Martinec <Mark.Martinec@ijs.si>
+ * ntpd/ntp_loopfilter.c (rstclock): minpoll cleanup. Debug cleanup.
+ * ntpd/ntp_config.c (getconfig): Initialize/bounds check minpoll
+ using NTP_MINDPOLL insted of sys_minpoll.
+ From: Dave Mills.
+
+2001-04-17 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * libntp/msyslog.c:
+ * ElectricFence/page.c (stringErrorReport): Follow Rainer's lead
+ and use strerror().
+
+ * ntpd/refclock_shm.c (shm_start): Always use strerror.
+ * libntp/msyslog.c (msyslog): Use strerror if present.
+ From: Rainer Orth <ro@TechFak.Uni-Bielefeld.
+
+ * ntpd/ntp_config.c (getconfig): Read stratum fudge value into
+ long variable.
+ From: Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
+
+ * libparse/parsesolaris.c (rdchar): Cast ~0 to unsigned long.
+ * libntp/buftvtots.c (buftvtots): Allow for 8-byte tv_sec, tv_usec
+ in struct timeval.
+ From: Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
+
+2001-04-16 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_config.c (getconfig): move "tinker" so it's generally
+ available.
+
+2001-04-15 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: Look for getclock().
+
+ * ntpd/ntp_config.c (getconfig): Squawk if provided minpoll or
+ maxpoll values are out of range.
+
+ * ntpd/ntp_proto.c (poll_update): Some operations can only be done
+ if we're compiling with some REFCLOCKs.
+ From Dave Mills.
+
+ * configure.in (RSASRCS): Added.
+ * librsaref/Makefile.am (nodist_librsaref_a_SOURCES): Use RSASRCS.
+
+ * configure.in: Limit the DECL_HSTRERROR_0 to aix4.3.*. RSN, we
+ could also limit it to xlc...
+
+ * configure.in: 4.0.99k25
+
+ * html/leap.htm: Added.
+ * html/index.htm: Update.
+ * html/driver7.htm: Update.
+ * html/driver6.htm: Update.
+ * html/driver36.htm: Update.
+ * html/audio.htm: Update.
+ * html/y2k.htm: Removed.
+ From Dave Mills.
+
+2001-04-14 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * acconfig.h: Lose extra declarations of PACKAGE and VERSION.
+
+ * acconfig.h:
+ * configure.in:
+ * include/l_stdlib.h: DECL_HSTRERROR_0 needed for xlc under AIX 4.3.2.
+ Reported by: Harald Barth <haba@pdc.kth.se>
+
+ * ntpd/ntp_proto.c (proto_config): cal_enable (PROTO_CAL) is
+ invalid if no refclocks are present.
+ From: Frodo Looijaard <frodol@dds.nl>
+
+ * README.cvs: On some systems, the -C option fails.
+
+ * ntpd/refclock_nmea.c:
+ * ntpd/ntp_refclock.c:
+ * html/driver20.htm:
+ PPSAPI patches for NMEA driver.
+ From: John.Hay@icomtek.csir.co.za
+
+ * README.rsa: Describe RSAEuro support, provide alternate rsa.c
+ patch.
+ * configure.in: Check for rsaeuro1, RSAOBJS, RSADIR respectively.
+ * html/build.htm: Hint at rsaeuro1 directory.
+ * include/global.h (BYTE): Define.
+ * librsaref/Makefile.am (nodist_librsaref_a_SOURCES): Removed rsaref2
+ specific sources.
+ (librsaref_a_LIBADD): Add appropriate objects.
+ (librsaref_a_DEPENDENCIES): Work around automake limitation.
+ (stamp-rsaref): Use RSADIR.
+ * scripts/README: Document ntp-close.
+ * scripts/Makefile.am (EXTRA_DIST): Distribute it.
+ * Makefile.am (DISTCLEANFILES): Remove .warning.
+ * librsaref/Makefile.am (DISTCLEANFILES): Remove copied/touched
+ librsaref sources, stamp-rsaref.
+ * ntpdate/Makefile.am (DISTCLEANFILES): Remove version.c.
+ * ntpq/Makefile.am (DISTCLEANFILES): Likewise.
+ * parseutil/Makefile.am (DISTCLEANFILES): Remove $(EXTRA_PROGRAMS).
+ Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
+
+ * ntpd/ntp_control.c: Header cleanup
+
+2001-04-13 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: Properly align --help output.
+ Explain ElectricFence.
+ From: Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
+
+ * ntpd/ntp_loopfilter.c (local_clock): Lose debugging statements.
+ * ntpd/ntp_proto.c (clock_filter): Rewrite.
+ From: Dave Mills
+
+ * ntpd/ntp_control.c (ctl_getitem): msyslog() possible buffer
+ overflow exploit.
+
+ * configure.in: 4.0.99k24
+
+ * html/pic/radio2.jpg:
+ * html/release.htm:
+ * html/refclock.htm:
+ * html/pps.htm:
+ * html/ntpd.htm:
+ * html/miscopt.htm:
+ * html/driver22.htm:
+ * html/confopt.htm:
+ Updated documentation from Dave Mills.
+
+ * util/ntp-genkeys.c: sys_minpoll.
+ * ntpd/refclock_atom.c: Comment additions.
+ * ntpd/ntp_proto.c: mode_ntpdate and peer_ntpdate added.
+ (transmit): We want 3, not 2, consecutive polls. hpoll logic
+ cleanup. mode_ntpdate changes.
+ (receive): When setting up a newpeer, use our sys_minpoll, not the
+ peer->ppoll.
+ (clock_update): sys_minpoll changes. Reorder some case 1 code.
+ Don't exit in case 2.
+ (poll_update): hpoll cleanup.
+ (peer_clear): u_rand. Use u_rand to randomize the initial poll.
+ * ntpd/ntp_peer.c (newpeer): Bump peer_ntpdate if we're in
+ mode_ntpdate.
+ * ntpd/ntp_loopfilter.c: Initialize sys_poll and sys_minpoll to
+ NTP_MINDPOLL.
+ (local_clock): Clean up some debug/info messages.
+ (rstclock): Use sys_minpoll.
+ (loop_config): KERNEL_PLL sanity checks. LOOP_MINPOLL support.
+ * ntpd/ntp_crypto.c (crypto_recv): Turn off FLAG_AUTOKEY when we
+ turn off TEST10.
+ * ntpd/ntp_control.c (ctl_getitem): Buffer overflow check. Clean
+ up some loop logic.
+ * ntpd/ntp_config.c: Added "tinker" and "minpoll". Use
+ sys_minpoll now, instead of old manifest constant.
+ (save_resolve): Print keyid using decimal, not hex. From Lars-Owe
+ Ivarsson <larsowe@paradisaea.its.uu.se>
+ * include/ntpd.h: Added peer_ntpdate and sys_minpoll.
+ * include/ntp_config.h (CONF_CLOCK_MINPOLL): Added.
+ * include/ntp.h: keyid cleanup. LOOP_* cleanup.
+ From Dave Mills.
+
+2001-04-03 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_proto.c (clock_filter): Swell stuff.
+ From: Mark Martinec <Mark.Martinec@ijs.si>
+
+ * ports/winnt/ntpd/ntpd.dsp:
+ * ports/winnt/ntpd/hopf_PCI_io.c:
+ * ports/winnt/include/hopf_PCI_io.h:
+ * ports/winnt/include/config.h:
+ * ntpd/refclock_hopfser.c:
+ * ntpd/refclock_hopfpci.c:
+ * ntpd/refclock_conf.c:
+ * ntpd/ntp_control.c:
+ * ntpd/Makefile.am:
+ * libntp/clocktypes.c:
+ * include/ntp.h:
+ * include/hopf6039.h:
+ * include/Makefile.in:
+ * include/Makefile.am:
+ * html/pic/fg6039.jpg:
+ * html/refclock.htm:
+ * html/driver39.htm:
+ * html/driver38.htm:
+ * html/copyright.htm:
+ Updated Oncore dudes.
+
+ * configure.in:
+ HOPF drivers and documentation.
+ From: Bernd Altmeier <altmeier@atlsoft.de> (with some light
+ hacking from Harlan to clean up indentation and lose the // comments)
+
+ * ntpd/refclock_oncore.c:
+ * ntpd/refclock_conf.c: Make it go.
+ From: Reg Clemens <reg@dwf.com>
+
+ * configure.in (openssl): Publish and default to RSAREF; hide
+ openssl, and only use it if explicitly requested (at least until
+ we work with it).
+
+2001-04-02 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * html/y2k.htm:
+ * html/tickadj.htm:
+ * html/release.htm:
+ * html/refclock.htm:
+ * html/quick.htm:
+ * html/pps.htm:
+ * html/ntptrace.htm:
+ * html/ntptime.htm:
+ * html/ntpq.htm:
+ * html/ntpdc.htm:
+ * html/ntpdate.htm:
+ * html/ntpd.htm:
+ * html/miscopt.htm:
+ * html/index.htm:
+ * html/genkeys.htm:
+ * html/exec.htm:
+ * html/driver7.htm:
+ * html/driver22.htm:
+ * html/copyright.htm:
+ * html/confopt.htm:
+ * html/build.htm:
+ * html/authopt.htm:
+ * html/assoc.htm:
+ Updates from Dave Mills.
+
+2001-04-01 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in (OPENSSL): Just use -lcrypto.
+ Reported by Dave Mills.
+
+2001-03-31 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99k20
+
+ * ntpd/refclock_heath.c: Add support for GC-1000 II.
+ From Dave Mills.
+
+ * ntpd/ntp_proto.c (transmit): Check peer->unreach.
+ (peer_clear): peer->outdate is a f(BURST_INTERVAL1), not
+ NTP_MINPOLL.
+ * ntpd/ntp_loopfilter.c (local_clock): mode_ntpdate stuff.
+ * ntpd/ntp_crypto.c: OpenSSL/RSAREF support.
+ * ntpd/cmd_args.c: Use -q, not -z, for mode_ntpdate.
+ (getstartup): nofork on mode_ntpdate. Usage update.
+ * include/ntp_crypto.h: OpenSSL/RSAREF support.
+ From: Dave Mills.
+
+ * configure.in (rsaref): Buglet.
+
+2001-03-30 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_proto.c (clock_update): mode_ntpdate support.
+ * ntpd/ntp_loopfilter.c (local_clock): mode_ntpdate support.
+ * ntpd/cmd_args.c: Added -z (mode_ntpdate).
+ * include/ntpd.h: mode_ntpdate added.
+ * include/ntp_crypto.h: RSAREF/OPENSSL cleanup.
+ From: Dave Mills.
+
+2001-03-29 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * config.h.in:
+ * aclocal.m4:
+ * configure.in: Prepare for OpenSSL support
+
+2001-03-28 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * README.rsa: Note that RSAEURO will not work.
+ Reported by: pieter.delacourt@banksys.be
+
+2001-03-25 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * include/ntp_if.h:
+ * include/ntp_machine.h:
+ * include/ntp_unixtime.h:
+ * libntp/humandate.c:
+ * libntp/iosignal.c:
+ * libntp/mktime.c:
+ * libntp/prettydate.c:
+ * libntp/systime.c:
+ * libntp/tvtoa.c:
+ * libntp/uglydate.c:
+ * libntp/utvtoa.c:
+ * libparse/clk_computime.c:
+ * libparse/clk_dcf7000.c:
+ * libparse/clk_hopf6021.c:
+ * libparse/clk_meinberg.c:
+ * libparse/clk_rawdcf.c:
+ * libparse/clk_rcc8000.c:
+ * libparse/clk_schmid.c:
+ * libparse/clk_trimtaip.c:
+ * libparse/clk_trimtsip.c:
+ * libparse/clk_varitext.c:
+ * libparse/parse.c:
+ * libparse/parse_conf.c:
+ * ntpd/check_y2k.c:
+ * ntpd/ntp_config.c:
+ * ntpd/ntp_control.c:
+ * ntpd/ntp_intres.c:
+ * ntpd/ntp_io.c:
+ * ntpd/ntp_loopfilter.c:
+ * ntpd/ntp_monitor.c:
+ * ntpd/ntp_proto.c:
+ * ntpd/ntp_refclock.c:
+ * ntpd/ntp_request.c:
+ * ntpd/ntp_resolver.c:
+ * ntpd/ntp_timer.c:
+ * ntpd/ntp_util.c:
+ * ntpd/ntpd.c:
+ * ntpd/refclock_acts.c:
+ * ntpd/refclock_arbiter.c:
+ * ntpd/refclock_arc.c:
+ * ntpd/refclock_as2201.c:
+ * ntpd/refclock_atom.c:
+ * ntpd/refclock_bancomm.c:
+ * ntpd/refclock_chronolog.c:
+ * ntpd/refclock_chu.c:
+ * ntpd/refclock_datum.c:
+ * ntpd/refclock_dumbclock.c:
+ * ntpd/refclock_fg.c:
+ * ntpd/refclock_gpsvme.c:
+ * ntpd/refclock_heath.c:
+ * ntpd/refclock_hpgps.c:
+ * ntpd/refclock_irig.c:
+ * ntpd/refclock_jupiter.c:
+ * ntpd/refclock_leitch.c:
+ * ntpd/refclock_local.c:
+ * ntpd/refclock_msfees.c:
+ * ntpd/refclock_mx4200.c:
+ * ntpd/refclock_nmea.c:
+ * ntpd/refclock_oncore.c:
+ * ntpd/refclock_pcf.c:
+ * ntpd/refclock_pst.c:
+ * ntpd/refclock_shm.c:
+ * ntpd/refclock_tpro.c:
+ * ntpd/refclock_trak.c:
+ * ntpd/refclock_true.c:
+ * ntpd/refclock_ulink.c:
+ * ntpd/refclock_usno.c:
+ * ntpd/refclock_wwv.c:
+ * ntpd/refclock_wwvb.c:
+ * ntpdate/ntpdate.c:
+ * ntpdate/ntptime_config.c:
+ * ntpdate/ntptimeset.c:
+ * ntpdc/ntpdc.c:
+ * ntpdc/ntpdc_ops.c:
+ * ntpq/ntpq.c:
+ * ntpq/ntpq_ops.c:
+ * ntptrace/ntptrace.c:
+ * parseutil/testdcf.c:
+ * util/hist.c:
+ * util/ntp-genkeys.c:
+ * util/ntptime.c:
+ * util/precision.c:
+ * util/tickadj.c:
+ time.h and sys/time.h cleanup.
+
+2001-03-24 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: '99k19
+
+ * ntpd/refclock_atom.c (atom_ppsapi): PPS API RFC alignment patches.
+ From: Ulrich Windl <Ulrich.Windl@rz.uni-regensburg.de>
+
+ * util/ntptime.c: MNT options
+ From: Ulrich Windl <Ulrich.Windl@rz.uni-regensburg.de>
+
+ * ntpd/ntp_refclock.c (refclock_newpeer): Lose "extra" free().
+ From: Ulrich Windl <Ulrich.Windl@rz.uni-regensburg.de>
+
+ * configure.in: 4.0.99k18 and auto* upgrade
+
+2001-03-14 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpdc/ntpdc_ops.c (printpeer): No more "valid".
+ * ntpd/ntp_request.c (peer_info): No more "valid".
+ * ntpd/ntp_refclock.c (refclock_transmit): valid/hpoll cleanup.
+ * ntpd/ntp_proto.c (transmit): valid/hpoll and peer->ttl cleanup.
+ peer->valid/oreach cleanup.
+ (receive): Call newpeer() with the pkt->ppoll, not
+ NTP_MINDPOLL (in several places).
+ In AM_NEWPASS, if we have a NULL peer, return.
+ (poll_update): Added xpoll definition, fixed oldpoll definition.
+ Algorithmic improvements.
+ * ntpd/ntp_peer.c (newpeer): Better minpoll/maxpoll
+ initialization.
+ (resetmanycast): That's a poll_update() on an MDF_ACAST, not a
+ poll_clear().
+ * ntpd/ntp_crypto.c: include <fcntl.h>.
+ (crypto_recv): Leave the crypto_flags alone when wiggling the
+ peer-> stuff.
+ (crypto_cert): Make room for daddy. Do a real open() on the cert
+ file. Read the cert. Initial hack and slash. Better debug info.
+ * ntpd/ntp_control.c: CP_VALID now does "unreach".
+ (ctl_putpeer): Ditto.
+ * include/ntp_request.h: info_peer gets a placeholder for "valid".
+ * include/ntp_crypto.h (CRYPTO_FLAG_CERT): Comment update.
+ * include/ntp.h: Lose "valid" from struct peer.
+ From: Dave Mills.
+
+2001-03-05 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_proto.c (transmit): hpoll calc logic cleanup.
+ (receive): New cert stuff.
+ (poll_update): Improvements.
+ (peer_clear): New cert stuff.
+ (peer_xmit): New cert stuff.
+ * ntpd/ntp_crypto.c: New cert stuff, documentation cleanup. Lose
+ extraneous poll_uopdate()s.
+ * ntpd/ntp_control.c: Deal with new cert stuff.
+ * ntpd/ntp_config.c (getconfig): Handle CONF_CRYPTO_CERT.
+ * include/ntp_crypto.h (CRYPTO_FLAG_CERT): Added.
+ (CRYPTO_CERT): Added.
+ (CRYPTO_CONF_CERT): Added.
+ Add declaration for struct value certif.
+ * include/ntp_control.h (CS_CERTIF): Added.
+ (CP_CERTIF): Added.
+ * include/ntp_config.h (CONF_CRYPTO_CERT): Added.
+ * include/ntp.h (TEST10,TEST11): New meaning. Add certif to
+ struct peer.
+ (FLAG_PROVEN): Added.
+ (MAX_EXT_LEN): Removed.
+ exten grew from 672/4 to 5000/4 for PUBKEY.
+ From: Dave Mills.
+
+2001-03-03 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_proto.c (transmit): Documentation cleanup.
+ (receive): Watch for NULL peer->pubkey.ptr (TEST11).
+ (poll_update): peer->nextdate, not ->outdate. More cleanup around
+ the disabled PUBKEY chunk.
+ * ntpd/ntp_crypto.c (make_keylist): ltemp might be smaller than
+ sys_automax - check peer->kpoll, too. Other ltemp cleanup.
+ (crypto_recv): fstamp is a PUBKEY-only variable.
+ * include/ntp.h (NTP_AUTOMAX): 13, not 12.
+ From: Dave Mills.
+
+2001-03-01 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_proto.c (transmit): hpoll cleanup. Call clock_select()
+ after calling poll_update, not before.
+ (receive): Call poll_update after crypto_recv if FLAG_SKEY.
+ (process_packet): Set peer->ppoll Later.
+ (poll_update): peer->hpoll sanity checking. Set peer->outdate,
+ not ->nextate, when burst > 0. MDF_ACAST cleanup.
+ (clock_select): Fix hpoll typo in call to poll_update().
+ * ntpd/ntp_crypto.c (crypto_xmit): tstamp's value is a function of
+ PUBKEY.
+ * include/ntp.h (clear_to_zero): #define value is a function of
+ AUTOKEY.
+ From: Dave Mills.
+
+2001-02-28 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_proto.c (transmit): Documentation/code update.
+ (poll_update): Sanity check peer->hpoll. Improve debug info.
+ (peer_clear): Improve debug info. Turn off FLAG_ASSOC in addition
+ to FLAG_AUTOKEY.
+ (clock_select): peer->status is CTL_PST_SEL_DISTSYSPEER, and don't
+ call poll_update(). Make each entry in the peer_list a
+ CTL_PST_SEL_SELCAND sooner, too. Rework similar logic later on.
+ Change debug level on some info.
+ (peer_xmit): Check peer->flags using FLAG_ASSOC, not
+ CRYPTO_FLAG_AUTO in a couple places. Don't call poll_update() if
+ sendlen > LEN_PKT_NOMAC.
+ * ntpd/ntp_loopfilter.c (local_clock): Improve debug info.
+ Sanity-check sys_poll sooner.
+ * ntpd/ntp_crypto.c: New artwork.
+ (COOKIE_LEN,AUTOKEY_LEN,VALUE_LEN): New.
+ (make_keylist): More debug info. Use FLAG_ASSOC, not
+ CRYPTO_FLAG_ASSOC.
+ (crypto_recv): More debug info. Clean up/improve sanity checks on
+ CRYPTO_ASSOC and CRYPTO_RESP packets, and in other places.
+ (crypto_xmit): Clean up/improve sanity checks on CRYPTO_ASSOC and
+ CRYPTO_RESP packets. Use FLAG_ASSOC, not CRYPTO_FLAG_ASSOC. More
+ debug info.
+ * include/ntp.h (NTP_CANLOCK): Lose it.
+ (clear_to_zero): is now "assoc".
+ (FLAG_ASSOC): Added.
+ From: Dave Mills
+
+2001-02-23 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpdate/ntpdate.h (NTP_MAXAGE): Added.
+ * ntpd/ntp_refclock.c (refclock_receive): Cleanup.
+ * ntpd/ntp_proto.c (transmit): Don't reset peer->ppoll in one case.
+ Update peer->hpoll based on CTL_PST_SEL_CORRECT, not FLAG_SYSPEER.
+ Don't update peer->ppoll based on MDF_[BM]CAST.
+ (peer_clear): ppoll is initialized to maxpoll.
+ (clock_select): call poll_update(peer->hpoll) earlier.
+ (peer_xmit): Call poll_update later.
+ * ntpd/ntp_peer.c (peer_config): Rework initial values of [hkp]poll.
+ * ntpd/ntp_loopfilter.c (CLOCK_PHI): Added. Deal with other
+ (allow_*) stuff. Treat Windows/NT the same as others regarding
+ panic steps. Deal with tinker stuff.
+ * ntpd/ntp_config.c: Tinker stuff.
+ * ntpd/cmd_args.c (getCmdOpts): -g now wiggles "allow_panic"
+ (renamed from "correct_any"). -x now wiggles "allow_step"
+ (renamed from "allow_step_backward").
+ * include/ntpd.h: Add tinker variables. Rename/rework variables
+ associated with "permission to step" and "permission to make a
+ panic correction"
+ * include/ntp_config.h (CONFIG_TINKER): Added.
+ (CONF_CLOCK_MAX): Tinker keyword
+ (CONF_CLOCK_PANIC): Tinker keyword
+ (CONF_CLOCK_PHI): Tinker keyword
+ (CONF_CLOCK_MINSTEP): Tinker keyword
+ * include/ntp.h (NTP_MINCLOCK): Tinker and other cleanup.
+ From: Dave Mills
+
+2001-02-19 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_proto.c (transmit): Don't peer_clear() and reset
+ minpoll unconditionally; make sure the peer is configured.
+ (poll_update): When updating peer->ppoll, check on BCAST and
+ MCAST, not ACAST
+ (peer_clear): PUBKEY cleanup. Zero out the peer structure
+ earlier. Initialization cleanup/fixes.
+ (peer_xmit): CRYPTO_FLAG_AUTO is in peer->flags now.
+ (key_expire): Debug output.
+ * ntpd/ntp_peer.c (unpeer): PUBKEY cleanup.
+ (newpeer): peer variable setup cleanup.
+ * ntpd/ntp_crypto.c (make_keylist): Keep CRYPTO_FLAG_AUTO in
+ peer->flags, not crypto_flags.
+ (crypto_xmit): Ditto.
+ (crypto_recv): Fix up RV_TSP logic (several places).
+ * include/ntp.h (clear_to_zero): Moved...
+ From: Dave Mills.
+
+2001-02-14 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_proto.c (peer_xmit): Crypto-related fixes
+ From Dave Mills.
+
+ * ntpd/ntp_crypto.c (crypto_recv): Allocate space for the trailing
+ NUL on the keystr.
+
+2001-01-28 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99k17
+
+ * ntpd/refclock_local.c (STRATUM): 3 -> 5
+ * ntpd/ntp_proto.c: sys_maxd -> sys_selerr, sys_epsil ->
+ sys_syserr. various cleanups and improvements.
+ From: Dave Mills.
+
+2001-01-19 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99k16
+
+ * config.h.in: Regenerated - became empty somehow.
+ Reported by John.Hay@icomtek.csir.co.za
+
+ * ntpd/ntp_proto.c (clock_select): Fix sdisp calculation.
+ From Dave Mills.
+
+ * util/ntp-genkeys.c:
+ * ntpd/refclock_chu.c:
+ * ntpd/refclock_atom.c:
+ * ntpd/ntpd.c:
+ * ntpd/ntp_loopfilter.c:
+ * ntpd/ntp_io.c:
+ * ntpd/cmd_args.c:
+ * libntp/audio.c:
+ * include/l_stdlib.h:
+ * html/copyright.htm:
+ Lint fixes (Thanks bunches!)
+ From: Marc.Brett@westerngeco.com
+
+2001-01-18 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99k15
+
+ * ntpd/ntp_proto.c (clock_select): Track error[] items sooner.
+ Typo grabbing the dtemp value and in the sdisp calculation.
+ From Dave Mills.
+
+2001-01-17 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99k14
+
+ * ntpd/ntp_proto.c: Change description of sys_rootdelay and
+ sys_rootdispersion.
+ (process_packet): Fix p_del test (bad distance).
+ (process_packet): Fix bad synch distance test.
+ (process_packet): Fix call to clock_filter (p_disp)
+ (clock_update): Fix sys_rootdelay calculation.
+ (clock_filter): Initialize jit to f(sys_precision)
+ (clock_filter): Update jit using distance[i] instead of
+ SQUARE(). peer->jitter uses dtemp instead of SQUARE().
+ (clock_filter): Updated CLOCK_SGATE checks. When printing debug
+ info, show jitter along with popcorn spike.
+ (clock_select): New sdisp calc.
+ (root_distance): New return value calc.
+ (peer_xmit): xpkt.rootdispersion value change.
+ * include/ntp.h (CLOCK_SGATE): Popcorn spike gate (Whoa, Molly!)
+ From Dave Mills.
+
+2001-01-13 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * config.sub (Repository): Updated.
+ * config.guess (Repository): Updated.
+
+ * ntpd/ntp_loopfilter.c (local_clock): Just use sys_jitter in the
+ calculation for rootdispersion.
+ From Dave Mills.
+
+2001-01-02 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_proto.c (transmit): Fix documentation. Set
+ peer->outdate and call poll_update in a new place. Sanity checks
+ in the MODE_BROADCAST case.
+ (clock_select): Track the old peer. Use the old peer in
+ subsequent checks, where appropriate. Clean up unpeer() logic.
+ From Dave Mills.
+
+2001-01-01 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/refclock_chu.c: Start using HAVE_AUDIO.
+ * ntpd/ntp_proto.c (clock_select): If about to discard an
+ ephemeral association, do it only if not the system peer.
+ From Dave Mills.
+
+ * html/pic/wingdorothy.gif:
+ * html/pic/bustardfly.gif:
+ * html/pic/boom3a.gif:
+ * html/pic/tonea.gif:
+ * html/pic/stack1a.jpg:
+ * html/pic/pogoa.gif:
+ * html/pic/pogo8.gif:
+ * html/pic/pogo6.gif:
+ * html/pic/pogo5.gif:
+ * html/pic/pogo4.gif:
+ * html/pic/pogo3.gif:
+ * html/pic/pogo1.gif:
+ * html/pic/oz2.gif:
+ * html/pic/flatheads.gif:
+ * html/pic/boom4.gif:
+ * html/pic/boom3.gif:
+ * html/pic/appletree.gif:
+ * html/pic/alice51.gif:
+ * html/pic/alice44.gif:
+ * html/pic/alice35.gif:
+ * html/pic/alice31.gif:
+ * html/pic/alice15b.gif:
+ * html/pic/alice13.gif:
+ * html/pic/alice11.gif:
+ * html/release.htm:
+ * html/rdebug.htm:
+ * html/prefer.htm:
+ * html/porting.htm:
+ * html/ntptrace.htm:
+ * html/ntpq.htm:
+ * html/ntpdate.htm:
+ * html/monopt.htm:
+ * html/kernpps.htm:
+ * html/index.htm:
+ * html/hints.htm:
+ * html/gadget.htm:
+ * html/driver7.htm:
+ * html/copyright.htm:
+ * html/config.htm:
+ * html/build.htm:
+ * html/authopt.htm:
+ * html/assoc.htm:
+ * html/accopt.htm:
+ Cleanup from Dave Mills.
+
+2000-12-30 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99k13
+
+ * ntpd/refclock_wwv.c (wwv_start): Call audio_init with DEVICE_AUDIO.
+ * ntpd/refclock_irig.c (irig_start): Call audio_init with DEVICE_AUDIO.
+ * ntpd/refclock_chu.c: Documentation cleanup.
+ (DEVICE_AUDIO): Added.
+ (fd_audio): Added.
+ (chu_start): Separate audio from serial device.
+ (chu_receive): Rewrite - get data from serial or audio device as
+ appropriate.
+ (chu_audio_receive): Renamed (from chu_receive) to allow both
+ audio and serial capability.
+ (chu_serial_receive): Ditto.
+ (chu_decode): Do the Right Thing based on audio/serial data.
+ * ntpd/ntp_refclock.c (refclock_open): Check for failure using <0
+ instead of ==-1.
+ * libntp/audio.c: Header cleanup, and remove
+ HAVE_STRUCT_AUDIO_INFO_* related fields.
+ (audio_init): Func arg is device to attempt to open.
+ * include/audio.h (audio_init): Now takes a char * argument.
+ From Dave Mills.
+
+ * configure.in (ntp_refclock): HAVE_AUDIO added. Remove
+ HAVE_STRUCT_AUDIO_INFO_* stuff; Dave rewrote the audio stuff.
+
+2000-12-28 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99k12
+
+2000-12-27 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * html/release.htm:
+ * html/patches.htm:
+ * html/measure.htm:
+ * html/confopt.htm:
+ * html/clockopt.htm:
+ * html/biblio.htm:
+ * html/authopt.htm:
+ * html/assoc.htm:
+ Updates from Dave Mills.
+
+ * include/ntp_crypto.h: Make sure crypto_flags is visible.
+ From Dave Mills.
+
+2000-12-14 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_proto.c (process_packet): pleap/pstratum.
+ (peer_xmit): Use CRYPTO_FLAG_AUTO.
+ * ntpd/ntp_crypto.c (make_keylist): Use CRYPTO_FLAG_AUTO. Only
+ sign host name and timestamps if the clock is synched.
+ * include/ntp_crypto.h (CRYPTO_FLAG_AUTO): Added.
+ From: Dave Mills
+
+2000-12-11 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_proto.c (transmit): Call clock_select in a few new
+ places. BURST/IBURST cleanup. Don't turn off FLAG_BURST at the
+ EOburst.
+ (receive): Set peer->unreach = 0 before we call process_packet().
+ (process_packet): ditto, before calling poll_update(). Lose some
+ debugging, MODE_BCLIENT/CLIENT cleanup.
+ (poll_update): Bump nextupdate on FLAG_REFCLOCK, not _REFCLOCK or
+ _IBURST.
+ (peer_clear): Don't set IBURST on MDF_BCLNT.
+ From: Dave Mills.
+
+ * ntpdate/ntpdate.c (alarming): Appease ansi2knr.
+
+2000-12-10 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_control.c (ctl_putpeer): CP_TTL and CP_TTLMAX
+ MDF_ACAST and MDF_MCAST cleanup.
+
+ * ntpd/refclock_wwv.c (wwv_start): ttlmax/ttl cleanup.
+ * ntpd/refclock_usno.c (usno_timeout): ttlmax/ttl cleanup.
+ * ntpd/refclock_parse.c (CLK_REALTYPE): ttlmax/ttl cleanup.
+ * ntpd/refclock_chu.c (chu_start): ttlmax/ttl cleanup.
+ * ntpd/refclock_acts.c (acts_timeout): ttlmax/ttl cleanup.
+ * ntpd/ntp_refclock.c (refclock_newpeer): Don't do the
+ any_interface -> loopback_interface trick.
+ * ntpd/ntp_proto.c (transmit): Broadcast/manycast cleanup.
+ * ntpd/ntp_peer.c: Cleanup.
+ * ntpd/ntp_io.c: Cleanup.
+ * ntpd/ntp_crypto.c (crypto_recv): AUTOKEY based on BCLNT, not MCAST2.
+ * include/ntpd.h: Declare findbcastinter().
+ * include/ntp.h: struct peer's ttlmax is now max ttl/refclock
+ mode. ttl is now ttl for manycast mode.
+ (FLAG_MCAST): Reworked several FLAG_ bits.
+ From Dave Mills.
+
+2000-12-05 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpq/ntpq.c: CP_TTLMAX support.
+ * ntpd/ntp_proto.c (transmit): MDF_ACAST ttl fixes.
+ * ntpd/ntp_peer.c (resetmanycast): Reset ttl if MDF_ACAST.
+ (peer_config): Save max ttl in ttlmax.
+ * ntpd/ntp_control.c: ttlmax support.
+ * include/ntp_control.h (CP_TTLMAX): Added.
+ * include/ntp.h: Added ttlmax to struct peer.
+ Dave Mills.
+
+2000-12-03 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_proto.c (receive): That any_interface is now an
+ rbufp->dstadr.
+ Various other doc and code cleanup.
+ * ntpd/ntp_peer.c (findmanycastpeer): Fixes
+ From Dave Mills
+
+2000-12-02 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_request.c (do_conf): call peer_config with
+ any_interface, not 0.
+ * ntpd/ntp_proto.c (transmit): Manycast cleanup
+ * ntpd/ntp_peer.c (findmanycastpeer): manycast cleanup
+ * ntpd/ntp_io.c (sendpkt): Only check ttl if we have a ttl
+ (findinterface): Cleanup
+ * ntpd/ntp_control.c: cleanup
+ * include/ntpd.h: Added resetmanycast.
+ * include/ntp_control.h (CP_TTL): disp -> ttl
+ * ntpq/ntpq.c: disp -> ttl
+ From Dave Mills
+
+2000-11-26 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99k11
+
+ * ntpd/ntp_proto.c (transmit):
+ * ntpd/ntp_peer.c:
+ * ntpd/ntp_io.c:
+ * ntpd/ntp_control.c (ctl_putpeer):
+ * ntpd/ntp_config.c (getconfig):
+ * include/ntpd.h: mcast/ucast interface cleanup.
+ From: Dave Mills
+
+ * include/ntp_request.h: Put data[] as MAXFILENAME+16. This will
+ fix the conf_peer requests again, but re-break compatibility with
+ old versions of the daemon. Sigh.
+
+ * util/ntp-genkeys.c (cleanlinks): Don't do it if nosymlinks.
+
+2000-11-19 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/refclock_parse.c (rawdcf_init_1): make Linux happier with
+ some modem control stuff.
+ From: Wolfram Pienkoss <wp@bszh.de> (via Frank Kardel)
+
+ * ntpd/refclock_pcf.c (pcf_poll): isdst fix
+ From: Andreas Voegele <andreas.voegele@gmx.de>
+
+2000-10-28 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99k10
+
+ * ntpd/refclock_wwvb.c (wwvb_start): Cosmetic reorder.
+ * ntpd/refclock_atom.c (RANGEGATE): Cleanup. Add ASTAGE.
+ Add ppsparams to struct ppsunit.
+ (atom_start): Init peer->burst to ASTAGE.
+ (atom_shutdown): Multi-handle
+ (atom_pps): Multi-handle
+ (atom_pps): RANGEGATE cleanup
+ (atom_poll): Poll count cleanup. Error check cleanup. Burst cleanup.
+ * ntpd/ntp_refclock.c (refclock_transmit): Lose the pre-burst
+ check poll_update().
+ (refclock_sample): Fix the jitter calc.
+ (refclock_receive): Pass the jitter to the clock_filter().
+
+ * ntpd/ntp_proto.c (clock_update): If we lose sync, reset the poll
+ to NTP_MINDPOLL.
+ (poll_update): Poll wiggles. Make sure peer->nextdate is timely.
+ (clock_select): If we lose sync, reset the poll to NTP_MINDPOLL.
+ * ntpd/ntp_loopfilter.c (local_clock): Show the asocid in debug
+ output. popcorn debug message changes. Clamp the poll interval
+ if the system peer has changed. PPS wiggle changes.
+ From Dave Mills.
+
+2000-10-16 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/refclock_pcf.c (pcf_start):
+ * html/driver35.htm:
+ The radio clock transmits 69 bits with a period of 2.5
+ milliseconds per bit. Thus the driver now sets the default
+ calibration offset to 0.1725 (69 * 2.5 = 172.5).
+ Its now possible to disable the check of the radio clock's
+ synchronisation status bit. Several users requested this option.
+ From: Andreas Voegele <andreas.voegele@gmx.de>
+
+ * html/refclock.htm:
+ * html/rdebug.htm:
+ * html/prefer.htm:
+ * html/pps.htm:
+ * html/ntpdc.htm:
+ * html/miscopt.htm:
+ * html/ldisc.htm:
+ * html/kern.htm:
+ * html/index.htm:
+ * html/exec.htm:
+ * html/driver22.htm:
+ * html/clockopt.htm:
+ Updates from Dave Mills
+
+ * ntpd/ntp_intres.c (request): Sanity check the size of the response
+
+2000-10-15 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpq/ntpq_ops.c (dopeers): Dave didn't like the patch to show
+ the units on the times...
+ * ntpdc/ntpdc_ops.c (doset): SYS_FLAG_PPS cleanup
+ * ntpd/refclock_wwv.c (wwv_newchan): Update the peer refid if
+ we're talking to a stratum 0 source
+ * ntpd/refclock_trak.c: Needs PPS
+ * ntpd/refclock_oncore.c: Disable for now
+ * ntpd/refclock_mx4200.c: Needs PPSAPI, not PPS
+ Header cleanup. PPS interface cleanup.
+ Process sentences with a switch
+ Cleanup and sanity checks
+ * ntpd/refclock_datum.c: header cleanup, light body cleanup
+ * ntpd/refclock_conf.c: CLOCK_TRAK needs PPS
+ MX4200 needs PPSAPI, not PPS
+ Disable ONCORE for now
+ * ntpd/refclock_bancomm.c: Surgery
+ * ntpd/refclock_atom.c: Cleanup
+ (atom_control): added
+ (atom_ppsapi): added
+ * ntpd/ntp_request.c (setclr_flags): SYS_FLAG_PPS cleanup
+ * ntpd/ntp_refclock.c: stropts.h back in in TTYCLK and
+ HAVE_SYS_CLKDEFS_H
+ Get ntp_syscall if KERNEL_PLL
+ Define cal_enable
+ (refclock_receive): Cleanup
+ (refclock_control): sanity check procptr
+ * ntpd/ntp_proto.c (init_proto): pps_enable
+ (proto_config): Turn on/off PPS discipline
+ * ntpd/ntp_loopfilter.c: pps_enable
+ (local_clock): record_loop_stats() if !ntp_enable
+ (local_clock): Turn off PPS if it's not enabled
+ Other cleanup/fixes
+ * ntpd/ntp_config.c: pps and calibrate keywords. Initialize
+ pps_assert to 0, not 1 (swap assert/clear?)
+ * include/ntpd.h: We have pll_status if KERNEL_PLL
+ Added pps_enable and cal_enable
+ * include/ntp_request.h (SYS_FLAG_PPS): Renamed from
+ SYS_FLAG_AUTHENTICATE
+ * include/ntp.h (PROTO_PPS): Added
+ (PROTO_CAL): Added
+ From: Dave Mills
+
+2000-09-23 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * include/ntp_refclock.h (stropts.h, sys/clkdefs.h): Harmful and
+ useless file include's turned off.
+ * libntp/iosignal.c (netinet/in.h, sys/sockio.h): Duplicate file
+ include's turned off.
+ * ntpd/ntp_refclock.c (ntp_tty.h): File included.
+ (refclock_open, refclock_ioctl): Use `TTY' from ntp_tty.h.
+ * ntpd/refclock_atom.c: Grab a few headers regardless; if we don't
+ CLOCK_ATOM we provide a stub pps_sample() routine so the WHARTON
+ can be compiled/used.
+ * ntpq/ntpq_ops.c (dopeers, doopeers): Print the units for
+ each column header.
+ Tue Sep 12 16:25:51 2000 Philippe De Muyter <phdm@macqel.be>
+
+ * ntpd/refclock_atom.c (atom_start): Lose "temp", because we now
+ initially either CAPTUREASSERT or CAPTURECLEAR.
+ (atom_pps): pps_info_t is our friend. Update comments to reflect
+ reality. DTRT with pps_info. Do some overflow checks.
+ From: Dave Mills.
+
+2000-09-21 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: Much improved Solaris patch-level check for the
+ FLL bug test.
+ From: Marc.Brett@westgeo.com
+
+2000-09-19 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * include/Makefile.am (noinst_HEADERS): Added ntp_tty.h
+ Reported by Dave Mills
+
+2000-09-16 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntptrace/ntptrace.c:
+ * ntpdate/ntptimeset.c (receive):
+ * ntpdate/ntpdate.c (receive):
+ STRATUM cleanup
+ * ntpd/refclock_atom.c (atom_poll): Autostratum. Lose the leap.
+ * ntpd/ntp_proto.c: sys_prefer
+ (process_packet): stratum cleanup
+ (clock_select): Autostratum the ATOM
+ * ntpd/ntp_loopfilter.c: pps_update/pps_stratum wiggle.
+ * include/ntpd.h: Lose pps_update, gain sys_prefer
+ * include/ntp.h: STRATUM variable cleanup
+ From Dave Mills
+
+2000-09-13 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/refclock_oncore.c (oncore_get_timestamp): Print debug
+ messages being aware of HAVE_STRUCT_TIMESPEC.
+
+ * ntpd/refclock_atom.c: Have pps_params tag along in the ppsunit
+ structure, where it really belongs.
+ (atom_pps): Use PPS_CAPTURE{ASSERT,CLEAR}
+ From: Dave Mills.
+
+2000-09-12 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in (ac_cv_var_atom_ok): Cleanup ATOM/PPSAPI stuff...
+
+ * scripts/ntp-close: Find "close" ntp servers.
+ From: Neal McBurnett <neal@bcn.boulder.co.us>
+
+ * ntpd/refclock_conf.c:
+ * ntpd/refclock_oncore.c: Re-enabled oncore driver for HAVE_PPSAPI
+ case only.
+
+2000-09-12 Philippe De Muyter <phdm@macqel.be>
+
+ * ntpd/refclock_parse.c (we400a_pollinfo): Useless variable removed.
+ [WHARTON slot]: Set NO_POLL, NO_INIT and NO_DATA; fix `fixed format'
+ and `offset' fields.
+
+ * include/ntp_tty.h: New file
+ * libntp/icom.c: Use it.
+
+ * ntp_update (UPDATE_OPTIONS): Use -d, too. Fix Pass 1 comment.
+
+2000-09-12 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/refclock_oncore.c: shmem_fname added. oncore_init_shmem()
+ updated.
+ (oncore_start): Comment cleanup
+ (oncore_read_config): Move call to oncore_shmem_init()
+ (oncore_init_shmem): Prototype change
+ (oncore_init_shmem): Don't exit on errors
+ (oncore_msg_any): timespec/timeval cleanup
+ (oncore_msg_Cj_id): shmem_fname changes
+ (oncore_msg_BaEaHa): saw_At bugfix
+ (oncore_get_timestamp): Added current_mode/current_params. Commented.
+ Added time_pps_getcap() calls.
+ From: Reg Clemens <reg@dwf.com>
+
+ * ntpd/ntp_io.c (input_handler): Better recvfrom() error message
+ From: Dean Gibson <timekeeper@tcp-udp.net>
+
+ * ntpdc/ntpdc.c (passwd): Get them working again.
+ From: Benjamin Greenwald <beng@lcs.mit.edu>
+
+2000-09-11 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/refclock_atom.c:
+ (atom_start):
+ * ntpd/ntp_refclock.c: Comment cleanup. PPS/PPSAPI cleanup
+ (refclock_open): PPS/PPSAPI cleanup
+ From: Dave Mills
+
+ * ntpd/refclock_oncore.c:
+ * ntpd/refclock_mx4200.c:
+ HAVE_TIMESPEC -> HAVE_STRUCT_TIMESPEC
+
+ * configure.in: ATOM requires struct timespec, not PPSAPI. Clean
+ up dependencies accordingly.
+
+2000-09-09 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in (ac_cv_var_atom_ok): Improve ATOM configure message
+ PARSE requires ATOM.
+
+ * ntpd/ntpd.c (set_process_priority): Clean up debug messages.
+
+2000-09-07 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: ac_cv_atom_ok, depends on HAVE_PPSAPI.
+ I notice the PARSE clocks require ATOM. Could be interesting...
+
+2000-09-06 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * Makefile.in (distdir): Seems to be a bug in an automake library
+ somewhere...
+
+2000-09-05 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_loopfilter.c (loop_config): V3 API needs MOD_BITS when
+ initializing ntv.modes. Initialize ntv.{maxerror,esterror,status}
+ earlier. Clean up KERNEL_PLL code.
+
+2000-09-04 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpq/ntpq.c: report offset as "offset", not "phase". Lose
+ compliance.
+ * ntpd/refclock_local.c (local_poll): variance -> jitter
+ * ntpd/refclock_chu.c (chu_major): Lose variance.
+ * ntpd/ntp_util.c (hourly_stats): sys_error -> sys_jitter
+ (record_loop_stats): ditto
+ * ntpd/ntp_request.c (peer_info): variance -> jitter
+ * ntpd/ntp_refclock.c (refclock_sample): variance -> jitter
+ (refclock_receive): variance -> jitter
+ * ntpd/ntp_proto.c (process_packet): variance -> jitter
+ (clock_filter): variance -> jitter
+ (clock_select): variance -> jitter
+ (root_distance): variance -> jitter
+ * ntpd/ntp_peer.c (newpeer): variance -> jitter
+ * ntpd/ntp_loopfilter.c: Cleanup pll_nano selection bogon.
+ Centralize the kernel API data.
+ (local_clock): Lose sys_error.
+ (loop_config): Code cleanup.
+ * ntpd/ntp_control.c: Call offset "offset" and not "phase". Lose
+ CS_COMPLIANCE. Deal with variance/jitter rename.
+ * include/ntp_refclock.h: Rename variance to jitter in struct
+ refclockproc.
+ * include/ntp_control.h (CS_COMPLIANCE): Lose it.
+ * include/ntp.h: Rename variance to jitter in struct peer.
+ From: Dave Mills
+
+2000-09-01 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/refclock_atom.c: Use the new ppsunit. Cleanup and improve
+ documentation.
+ * ntpd/ntp_refclock.c (refclock_sample): Don't accumulate
+ variance.
+ From Dave Mills
+
+2000-08-31 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * html/driver22.htm: Update the docs.
+ * ntpd/refclock_atom.c (atom_start): Open the device if it hasn't
+ been opened already.
+ (pps_sample): Make it more visible.
+ From Dave Mills.
+
+ * configure.in: 4.0.99k8
+
+ Revert to the older automake.
+
+ * configure.in: The PPSAPI headers use "inline", so require a STDC
+ compiler.
+
+ * ntpd/refclock_atom.c (atom_shutdown): Typo
+ From Dave Mills
+
+ * configure.in: Convert to autoconf-2.49
+
+ * ntpd/refclock_atom.c: Header cleanup Comment cleanup. Lose the
+ TTYCLK stuff. Convert to PPSAPI.
+ * ntpd/ntp_refclock.c (refclock_newpeer): Move refclock_unpeer().
+ From: Dave Mills
+
+2000-08-29 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure: Fix the autoconf problem...
+
+2000-08-20 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 99k7
+
+ * util/ntptime.c (main): Report TAI stuff
+ * ntpq/ntpq.c: CS_COMPLIANCE/CS_JITTER cleanup
+ * ntpd/ntp_loopfilter.c (local_clock): sys_error/sys_jitter cleanup.
+ kernel PPL cleanup.
+ * ntpd/ntp_crypto.c: Check NTP_API if we're doing KERNEL_PLL so we
+ can get the TAI stuff.
+ * ntpd/ntp_control.c: CS_COMPLIANCE now reports "error" instead of
+ "jitter". CS_JITTER now reports jitter.
+ * include/ntpd.h: Added sys_jitter
+ * include/ntp_control.h (CS_JITTER): Added
+ From: Dave Mills
+
+ * ntpd/cmd_args.c (getCmdOpts): Crack -N at pre-scan, as we do the
+ priority wiggle before the final scan.
+ From: Tom Smith <smith@cag.lkg.dec.com>
+ We might do better to move the priority wiggle to after the final
+ scan. Especially if we want to permit command-line options to
+ have decent control over the priority. When we rewrite the config
+ file stuff we might go to a multi-scan to solve some of these
+ problems.
+
+2000-08-19 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: '99k6, and manually fix configure.
+
+ * include/ntp_request.h (NTP_MAXHOSTNAME): 144 -> 32
+
+2000-08-18 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * util/ntp-genkeys.c (main): Don't call fclose if stream is NULL.
+
+2000-08-17 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * html/driver35.htm:
+ * ntpd/refclock_pcf.c: Updates and improvements
+ From: Andreas Voegele <andreas.voegele@gmx.de>
+
+ * configure.in (ac_cv_struct_ntptimeval): Lose the TAI check - we
+ don't need it since we can check NTP_API. Re-hack the generated
+ configure script.
+
+ * configure: Manual hack to the ntptimeval.time.tv_nsec stuff
+ because we're running an old autoconf.
+
+2000-08-16 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * util/ntptime.c: Use: HAVE_STRUCT_NTPTIMEVAL_TIME_TV_NSEC, it's
+ the standard name.
+
+ * configure.in: Look for struct ntptimeval.tai in sys/timex.h
+ Cleanup struct tptimeval member tests.
+
+ * util/ntp-genkeys.c: New command-line arguments
+
+2000-08-14 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * util/ntp-genkeys.c (main): More small steps...
+
+2000-08-13 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_crypto.c (crypto_rsa): Now that we're using
+ NTP_KEYSDIR, make sure there is a '/ between the dir and the file.
+
+ * util/ntp-genkeys.c (main): More small steps...
+
+2000-08-12 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * util/ntp-genkeys.c (main): Another small step...
+
+ * configure.in: 99k5
+
+ * include/ntp_request.h: Make data[] member of req_pkt 32 again.
+ Bump the version number...
+
+ * ntpd/ntp_loopfilter.c (local_clock): Change 0. to 0 in a couple
+ of places.
+ From Dave Mills
+
+2000-08-11 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * util/ntp-genkeys.c (main): Minimal progress...
+
+2000-08-06 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/check_y2k.c: Make debug definition match ntpd.h's declaration
+
+ * ntpd/Makefile.am (check-local): Use test in favor of [
+
+2000-08-05 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in (NTP_KEYSDIR): Typo
+
+2000-08-04 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ElectricFence/Makefile.am (check-local): use test instead of [
+
+ * configure.in: AC_REPLACE_FUNCS(strdup)
+ * libntp/strdup.c (strdup): Added.
+ * libntp/Makefile.am (EXTRA_libntp_a_SOURCES): Added strdup.c
+
+ * util/Makefile.am (ntp_genkeys_DEPENDENCIES): Use $U on .o files
+ (ntp_genkeys_LDADD): ditto.
+
+ * ntpd/ntp_crypto.c: Use NTP_KEYSDIR
+
+ * util/ntp-genkeys.c (snifflink): Ignore ENOENT, too.
+
+ * ntpd/ntp_proto.c (peer_xmit): Crypto cleanup
+ * ntpd/ntp_crypto.c: Cleanup
+ * ntpd/ntp_control.c: Join the club
+ * ntpd/ntp_config.c: Call crypto_config() instead; we got rid of
+ crypto_flags.
+ * include/ntp_crypto.h (CRYPTO_FLAG_ENAB): New crypto flags, rework
+ * include/ntp_control.h (CS_FLAGS): Wiggle in.
+ * include/ntp.h: Added crypto peer status to struct peer
+ From Dave Mills
+
+2000-08-03 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * util/ntp-genkeys.c: Initialize path_keysdir to NTP_KEYSDIR.
+
+ * configure.in (NTP_KEYSDIR): Added
+ * acinclude.m4: Added AC_DEFINE_DIR macro
+
+ * util/ntp-genkeys.c (main): Sanity checks on the file paths.
+
+2000-08-02 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * util/ntp-genkeys.c (crypto_config): Only #ifdef PUBKEY
+ (PATH_MAX): Try harder...
+
+2000-08-01 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * util/ntp-genkeys.c (main): Use snifflink()
+ (snifflink): Implement...
+
+ * configure.in: Check for readlink()
+
+2000-07-31 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * util/ntp-genkeys.c (main): Use strdup on the tokens returned
+ from ntp_config...
+ (crypto_config): Fix a typo...
+ (crypto_config): Even more...
+ (usage): Flesh it out.
+
+ * include/ntp_config.h:
+ * ntpd/ntp_config.c: Move a whack of #defines to ntp_config.h so
+ ntp-genkeys.c can see them, too.
+
+ * util/ntp-genkeys.c: Add stubs to work with ../ntpd/ntp_config.o,
+ start hooking things up.
+ (main): debugging
+ (crypto_config): better implementation
+
+
+ * ntpd/ntp_config.c (getconfig):
+ * ntpd/ntpd.c: Initialize "debug" here, not in ntp_config.c
+
+ * util/Makefile.am (ntp_genkeys_LDADD): Added ../ntpd/ntp_config.o
+ * util/Makefile.am (ntp_genkeys_DEPENDENCIES): Added.
+
+2000-07-30 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99k4
+ * util/ntp-genkeys.c: Start hacking for new functionality.
+ * include/Makefile.am (noinst_HEADERS): Added ntp_cmdargs.h and
+ ntp_config.h .
+ * ntpd/ntp_config.c: Grab ntp_cmdargs.h. Make some new globals
+ (ugh), move ntpd-specific variables and code to cmd_args.c .
+ * ntpd/cmd_args.c: Move command argument processing functions from
+ ntp_config.c to this file.
+ * ntpd/Makefile.am (ntpd_SOURCES): Added cmd_args.c
+ * include/ntpd.h: Move getstartup() to ntp_cmdargs.h
+ * include/ntp_cmdargs.h: New file
+ Begin the hacking fest to make it easier for ntp-genkeys to use
+ ntpd's config processing code. I really hope this is the lesser
+ of the evils...
+
+2000-07-28 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * util/ntp-genkeys.c (usage): Added.
+
+ * ntpd/ntp_crypto.c: Cleanup
+ * ntpd/ntp_proto.c (transmit): Add some parens.
+ (peer_xmit): Add ntohl when grabbing sndauto.seq for broadcast.
+ * ntpd/ntp_peer.c (findpeer): Cleanup
+ * ntpd/ntp_loopfilter.c (local_clock): Typo
+ From Dave Mills
+
+ * include/ntp_config.h: Created
+
+ * util/ntp-genkeys.c: Always build, but realize we may not have
+ RSAREF. Compile parts appropriately.
+
+ * util/Makefile.am (bin_PROGRAMS): Always make ntp-genkeys
+ (ntp-genkeys_LDADD): Use $LIBRSAREF instead of the "real path"
+ * configure.in: Lose MAKE_NTP_GENKEYS
+
+ * configure.in:
+ * util/ntp-genkeys.c:
+ * util/Makefile.am:
+ Renamed ntp_genkeys to ntp-genkeys.
+
+2000-07-27 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpdate/ntpdate.c (ntpdatemain): Cleanup error message.
+
+ * ntpdate/ntpdate.c (ntpdatemain): Add missing authtrust() call
+ From: Jason Heiss <jheiss@cruzeiro.ugcs.caltech.edu>
+
+ * ntpd/refclock_ulink.c (ulink_receive):
+ * ntpd/ntp_crypto.c:
+ * libntp/authparity.c:
+ Lint/noise cleanup
+ From: Marc Brett <mbrett@rgs0.london.waii.com>
+
+ * ntpd/ntp_proto.c: Specifically track manycastserver and
+ survivors
+ From: Dave Mills
+
+2000-07-26 Sven Dietrich <sven_dietrich@trimble.com>
+
+ * ntpd/ntpd.c: remove WINNT priority adjustment to the ports/winnt area
+ where it does not clutter up the main distribution.
+
+2000-07-24 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_proto.c (receive): dstadr_sin needs higher visibility
+ From: Dave Mills
+
+ * flock-build: Added baldwin
+
+ * ntpd/ntp_request.c:
+ * ntpd/ntp_proto.c:
+ * ntpd/ntp_peer.c:
+ * ntpd/ntp_io.c:
+ * ntpd/ntp_intres.c:
+ * ntpd/ntp_crypto.c (make_keylist):
+ * ntpd/ntp_control.c:
+ * ntpd/ntp_config.c (CONF_MOD_IBURST, save_resolve):
+ * include/ntpd.h (findpeerbyassoc, newpeer, peer_config, *_interface):
+ * include/ntp_request.h (CONF_FLAG_IBURST):
+ * include/ntp_crypto.h (crypto_xmit, make_keylist):
+ * include/ntp.h (FLAG_IBURST):
+ * html/release.htm:
+ * html/confopt.htm:
+ * html/assoc.htm:
+ Add iburst option, fix broadcast/multicast and some types.
+ From: Dave Mills
+
+2000-07-20 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * scripts/Makefile.am (bin_SCRIPTS): Install ntp-wait
+
+ * configure.in: 4.0.99k
+
+2000-07-19 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_proto.c (peer_xmit): PUBKEY cleanup
+
+2000-07-18 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99j5
+
+ * html/ntpd.htm (HREF): Document other missing command-line options
+
+ * html/ntpd.htm (HREF): Document
+ * html/confopt.htm (href): Undocument
+ * ntpd/ntp_config.c (getconfig): -N high for high-priority.
+ Lose the ntp.conf way of setting priority.
+
+ * ntpd/ntp_crypto.c: PUBKEY/AUTOKEY cleanup
+ From Dave Mills
+
+2000-07-17 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * html/confopt.htm (href): Document it.
+ * ntpd/ntp_config.c (getconfig): CONFIG_PRIORITY support
+ * ntpd/ntpd.c (set_process_priority): Use it.
+
+ * ntpd/ntp_crypto.c: Crypto key stuff
+ * ntpd/ntp_proto.c: pubkey -> pubkey.ptr
+ * ntpd/ntp_control.c (ctl_putpeer): fstamp -> pubkey.fstamp
+ * ntpd/ntp_peer.c:
+ * include/ntpd.h:
+ * include/ntp_types.h:
+ * include/ntp_request.h:
+ * include/ntp_crypto.h:
+ * include/ntp_control.h:
+ * include/ntp.h: Type cleanup
+ From: Dave Mills
+
+2000-07-14 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ElectricFence/Makefile.am (check-local): Don't run the tests if
+ we didn't build the programs...
+ (check-local): Same, but watch the return codes...
+
+ * ElectricFence/page.c: #include config.h if it's there.
+ Properly handle the sys_errlist declaration.
+
+ * html/ntpq.htm:
+ * html/index.htm:
+ * html/debug.htm:
+ * html/authopt.htm:
+ Reality check.
+ From Dave Mills
+
+2000-07-13 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * Makefile.am (SUBDIRS): Added ElectricFence
+ * configure.in (AC_CONFIG_FILES): Added ElectricFence support
+ * ElectricFence: Imporpted.
+
+2000-07-12 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * util/ntp_genkeys.c (main): Cleanup
+ * ntpd/refclock_wwv.c (wwv_qrz): sqrt -> SQRT
+ * ntpd/refclock_chu.c (chu_rf): sqrt -> SQRT
+ * ntpd/ntpd.c (set_process_priority): Disable high-priority for now.
+ PUBKEY cleanup.
+ * ntpd/ntp_timer.c: sys_revoketime cleanup.
+ * ntpd/ntp_proto.c (receive): PUBKEY cleanup. Comment and code
+ cleanup.
+ (process_packet): Comment and code (PUBKEY) cleanup.
+ (peer_xmit): Comment and code cleanup.
+ (fast_xmit): Comment and code cleanup.
+ * ntpd/ntp_peer.c (expire_all): revoketime cleanup. PUBKEY cleanup.
+ * ntpd/ntp_crypto.c: Comment reorg. DH parameters are now
+ file-static instead of local to subroutines.
+ (make_keylist): peer->pcookie.key cleanup/fix
+ (crypto_recv): Subroutine documentation cleanup, other cleanup
+ (crypto_xmit): Cleanup/document.
+ (crypto_setup): Cleanup/document.
+ (crypto_agree): Cleanup/document.
+ (crypto_rsa): now static
+ (crypto_dh): now static. Comment cleanup. Code cleanup.
+ (crypto_tai): now static. Code and comment cleanup.
+ (crypto_config): Deal with CRYPTO_CONF_LEAP.
+ * ntpd/ntp_control.c (CS_DHPARAMS): Rename corresponding token to
+ "params". Remove CS_TAI from def_sys_var[].
+ (ctl_putsys): CS_HOST, CS_DHPARAMSm CS_REVTIME, and CS_LEAPTIME
+ bugfix. CS_TAI cleanup.
+ * ntpd/ntp_config.c (CONF_CRYPTO_LEAP): Added
+ (getconfig): Added CONF_CRYPTO_LEAP support.
+ * include/ntp_syslog.h: Lose GIZMO stuff.
+ * include/ntp_crypto.h (CRYPTO_CONF_LEAP): Added
+ * include/ntp.h: struct autokey, cookie,value, and pkt changes for
+ signature field. Update the inline docs on pkt's exten field.
+ From: Dave Mills
+
+
+2000-07-08 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_util.c (stats_config): If we read a bogus old_drift,
+ use 0 instead of failing.
+
+2000-07-03 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * README.cvs: Cleanup.
+
+ * ntpd/refclock_datum.c (datum_pts_poll): index -> unit_index
+ * ntpd/ntp_resolver.c (findhostaddr): const cleanup
+ * libntp/recvbuff.c:
+ * libntp/msyslog.c:
+ * libntp/emalloc.c:
+ * libntp/authreadkeys.c:
+ Fix header order.
+ From: Simon Burge <simonb@netbsd.org>
+
+ * ntpd/ntp_util.c (stats_config): Use HAVE_FINITE and HAVE_ISFINITE
+ * configure.in (ac_cv_struct_ntptimeval_timespec): isfinite()
+ checks for HP-UX11.
+ From: Albert Chin-A-Young <china@thewrittenword.com>
+
+2000-07-02 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * flock-build (LIST): Lose malarky, update some machine/OS descriptions
+
+ * configure.in: 4.0.99j4
+
+ * ntpq/ntpq.c: Lose PUBKEY stuff - older ntpq's will complain when
+ they see the info in a packet.
+ * ntpd/ntp_proto.c (peer_xmit): TAI changes.
+ * ntpd/ntp_crypto.c: Fix host/network byteorder stuff. Follow
+ global->struct changes. TAI changes. Bugfixes.
+ * ntpd/ntp_control.c: Follow field reorder/rename.
+ * include/ntp_crypto.h: Move crypto stuff from separate globals
+ into structs.
+ * include/ntp_control.h (CS_HOST): Reorder/rename some fields
+ From: Dave Mills
+
+2000-06-30 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_peer.c (unpeer): Moved keystr cleanup inside ifdef PUBKEY
+
+ * configure.in: 4.0.99j3
+
+ * html/release.htm:
+ * html/ntpq.htm:
+ * html/authopt.htm:
+ Updates from Dave Mills
+
+ * ntpd/ntp_request.c (dns_a): Don't call crypto_public for now...
+ * ntpd/ntp_proto.c (receive): Follow the TEST wiggles
+ (peer_xmit): TAI support
+ * ntpd/ntp_crypto.c: TAI support
+ * ntpd/ntp_control.c: CS_VERSION and CS_TAI support
+ * include/ntp_crypto.h (CRYPTO_FLAG_TAI): Added.
+ * include/ntp_control.h (CS_VERSION): Added.
+ * include/ntp.h (TEST4,TEST5,TEST8,TEST9): Wiggle.
+ From: Dave Mills
+
+ * ntpd/Makefile.am (ntpd_SOURCES): Lose refclock_ulink331.c
+ because the new refclock_ulink.c handles it.
+
+2000-06-28 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_config.c (getconfig): Sanity check the right variable
+ From: Dave Mills.
+
+2000-06-25 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99j2
+
+ * ntpd/ntp_proto.c:
+ * ntpd/ntp_peer.c:
+ * ntpd/ntp_crypto.c:
+ * include/ntp_crypto.h:
+ * include/ntp.h:
+ AUTOKEY/PUBKEY/DH/crypto changes
+ From: Dave Mills
+
+2000-06-23 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * html/driver34.htm:
+ * ntpd/refclock_ulink.c:
+ * ntpd/refclock_ulink331.c: (removed)
+ Updated for 320/330 series refclocks
+ From: joseph lang <tcnojl1@earthlink.net>
+
+ * ntpd/refclock_oncore.c: Patches/improvements
+ * html/driver30.htm: New release
+ From: Reg Clemens <reg@orion.dwf.com>
+
+2000-06-17 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99j1
+
+ * ntpdc/ntpdc.c (getcmds):
+ * configure.in:
+ Readline support.
+ From: Aaron Sherman <ajs@narn.ajs.com>
+
+ * ntpd/refclock_ulink331.c: Added.
+ Sent in by Doug Grosso <dgrosso@mint.net>
+ * ntpd/Makefile.am (ntpd_SOURCES): Added refclock_ulink331.c
+
+ * libntp/snprintf.c: Added stdio.h
+ From: Marc Brett <mbrett@rgs0.london.waii.com>
+
+ * include/ntp.h: struct autokey's siglen is u_int32. So is the
+ siglen in struct cookie. So is siglen and value length in struct
+ value. Add fstamp to struct peer. Resize the exten AUTOKEY field
+ in struct pkt.
+ * include/ntp_crypto.h: crypto_enable -> crypto_flags and a
+ variety of other cleanups.
+ * ntpd/ntp_config.c: crypto_enable -> crypto_flags, and some
+ key/fudge cleanup.
+ * ntpd/ntp_control.c: Much cleanup.
+ * ntpd/ntp_crypto.c: Many changes that Harlan is too tired to
+ properly document.
+ * ntpd/ntp_peer.c: crypto_enable -> crypto_flags
+ (peer_config): Hold off on crypto_public() until some resolver
+ issue is fixed.
+ * ntpd/ntp_proto.c (receive): Disable the reverse DNS lookup for now.
+ (process_packet): Don't record_raw_stats() for now.
+ crypto_enable was renamed to crypto_flags.
+ (peer_xmit): In MODE_ACTIVE or MODE_PASSIVE, only call
+ crypto_xmit() if the peer->cmmd is not CRYPTO_AUTO. Reset
+ peer->cmmd to 0 when we're thru.
+ Don't reset peer->cmmd to 0 until the end of MODE_CLIENT.
+ * ntpd/ntpd.c: Lose the call to crypto_init(). Instead, call
+ crypto_setup() later on if we have crypto_flags.
+ * util/ntp_genkeys.c: Lose GENLEN; use PRIMELEN/2 .
+ From Dave Mills.
+
+ * ntpd/ntp_crypto.c (crypto_rsa):
+ (crypto_dh):
+ Do some debug logging if readlink() fails with something other
+ than EINVAL (file isn't a symlink).
+
+2000-06-04 James R. Van Zandt <jrv@vanzandt.mv.com>
+
+ * html/miscopt.htm (trap): punctuation
+
+ * html/ntpd.htm (-g): typo
+
+ * html/miscopt.htm (logconfig): List the "clock" event class.
+ "allprefix" should be two words.
+
+2000-05-31 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_timer.c: Protect <unistd.h>
+
+2000-05-30 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/Makefile.am: Document what we expect from -lm
+
+2000-05-29 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99j
+
+2000-05-22 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * html/ntptime.htm: More fixes
+ From: Kazu TAKAMUNE <takamune@avrl.mei.co.jp>
+
+2000-05-16 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * build (KEYSUF):
+ * flock-build:
+ * configure.in: Lose the "md5" options from the --with-crypto
+ check; Dave hates it.
+
+ * ntpd/ntp_util.c (stats_config):
+ * ntpd/ntp_loopfilter.c (loop_config):
+ * libntp/systime.c (adj_systime):
+ * include/ntp_proto.h (NTP_MAXFREQ):
+ Renamed MAX_FREQ to NTP_MAXFREQ
+
+ * ntpd/ntpd.c (ntpdmain):
+ * ntpd/ntp_proto.c (receive):
+ (poll_update):
+ * ntpd/ntp_intres.c (addentry):
+ * ntpd/ntp_config.c (getconfig):
+ Lint cleanup
+ From: Marc Brett <mbrett@rgs0.london.waii.com>
+
+ * include/ntp_stdlib.h:
+ * libntp/systime.c (adj_systime):
+ * ntpd/ntp_loopfilter.c (loop_config):
+ * ntpd/ntp_util.c (stats_config):
+ * ports/winnt/ntpd/nt_clockstuff.c (adj_systime):
+ MAXFREQ -> MAX_FREQ
+ * include/ntp_proto.h: Define MAX_FREQ
+
+2000-05-15 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * include/ntp_stdlib.h:
+ * libntp/systime.c (adj_systime):
+ * ntpd/ntp_loopfilter.c (loop_config):
+ * ntpd/ntp_util.c (stats_config):
+ * ports/winnt/ntpd/nt_clockstuff.c (adj_systime):
+ sys_maxfreq -> MAXFREQ
+ Per Dave Mills.
+
+2000-05-14 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * acinclude.m4: Typo...
+
+2000-05-13 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * libntp/gpstolfp.c (GPSORIGIN): Try new ULONG_CONST macro
+
+ * ntpdate/ntptimeset.c:
+ * ntpdate/ntpdate.h:
+ * ntpd/refclock_oncore.c (oncore_msg_En):
+ * ntpd/ntp_util.c (stats_config):
+ * ntpd/ntp_request.c:
+ * ntpd/ntp_intres.c (findhostaddr):
+ * ntpd/ntp_config.c (getconfig):
+ * libntp/systime.c (adj_systime):
+ * libntp/lib_strbuf.c:
+ * libntp/authparity.c:
+ * libntp/audio.c:
+ Header/lint cleanup
+ From/reported by: Simon Burge <simonb@netbsd.org>
+
+ * ntpd/ntp_resolver.c (findhostaddr): Compiler noise cleanup
+
+ * ntpd/ntp_intres.c: Compiler noise cleanup
+
+ * html/ntptime.htm: Document reality check
+ From: Kazu TAKAMUNE <takamune@avrl.mei.co.jp>
+
+2000-05-12 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_intres.c (ntp_intres): Quiet some debug messages
+ Reported by: Brian Bergstrand <brianb@mac.com>
+
+2000-05-11 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * scripts/mkver.in (ConfStr): Use -r if we're using RSAREF,
+ otherwise use -a if we're using autokey, otherwise use no extra
+ suffix.
+
+2000-05-11 Sven Dietrich <sven_dietrich@trimble.com>
+
+ * ports/winnt/include/config.h: New defines to support AUTOKEY
+ * ports/winnt/include/unistd.h: Added another dummy placeholder.h
+ * ports/winnt/ntpd/ntpd.dsp: Added ntp_crypt.c to makefile
+ * ports/winnt/ntpd/ntpd.c: service_main needs a local hostname[]
+ * html/hints/winnt.htm: Add remark about 4.0.99i not compiling.
+ These changes got WINNT running again. No idea if the keys stuff
+ works however.
+
+2000-05-10 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99i9
+
+ * ntpd/ntp_crypto.c: tstamp and autokey cleanup
+ From: Dave Mills
+
+ * ntpd/ntp_proto.c (clock_update): Only call expire_all() if
+ AUTOKEY
+ From many folks, including Reg Clemens <reg@dwf.com>
+
+2000-05-07 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99i8
+
+ * flock-build: Use new --with-crypto choices
+ * build (KEYSUF): Deal with new --with-crypto
+ * configure.in: --with-crypto={md5,autokey,rsaref};
+ lose --enable-autokey
+
+2000-05-06 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * build (KEYSUF): Catch --disable-autokey first.
+
+2000-05-05 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * flock-build: If we don't use autokey, don't use rsaref either.
+
+ * configure.in: 4.0.99i7
+
+ * build (KEYSUF):
+ * flock-build:
+ It's --disable-autokey now
+
+ * configure.in: MD5 is not optional (but AUTOKEY is)
+ * include/ntp_stdlib.h:
+ * libntp/a_md5encrypt.c:
+ * libntp/authkeys.c:
+ (authhavekey):
+ (MD5auth_setkey):
+ (auth_delkeys):
+ (authencrypt):
+ (authdecrypt):
+ * libntp/authreadkeys.c:
+ (authreadkeys):
+ * ntpd/ntp_proto.c (init_proto):
+ * libntp/authusekey.c:
+ MD5 is required.
+
+2000-05-04 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99i6
+
+ * ntpd/ntp_proto.c (transmit): Fix up the UNREACH code.
+ (receive): Lose some debug code.
+ (clock_update): expire_all() if LEAP_NOTINSYNC
+ crypto_xmit() a CRYPTO_AUTO if !FLAG_AUTOKEY instead of recauto.tstamp
+ crypto_xmit() a CRYPTO_PRIV (not CRYPTO_AUTO) based on pcookie.tstamp
+ crypto_xmit() a CRYPTO_AUTO (not CRYPTO_PRIV) based on FLAG_MCAST2
+ and !FLAG_AUTOKEY
+ * ntpd/ntp_crypto.c (crypto_recv): Clean up debug output.
+ Don't AUTOKEY if FLAG_MCAST2
+ From: Dave Mills
+
+ * flock-build: Also make obe withouyt md5 (no AUTOKEY)
+ * build (BDIR): Handle -noautokey build directory suffix
+ * configure.in: Prepare for AUTOKEY in mkver.in
+ * scripts/mkver.in (ConfStr): Indicate in the version string if
+ we're not using AUTOKEY.
+
+2000-05-03 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * scripts/ntp-wait.in: Fun things with backspaces
+
+ * configure.in: 4.0.99i5
+
+ * ntptrace/ntptrace.c: Protect sys/ioctl.h; grab config.h
+
+ * ntpd/ntp_proto.c (transmit): AUTOKEY and tstamp fixes.
+ (clock_update): Check oleap against LEAP_NOTINSYNC
+ (peer_clear): Free pubkey when we're done
+ Check peer's keynumber against the seq in MODE_BROADCAST.
+ Reorder tstamp changes.
+ * ntpd/ntp_crypto.c (crypto_recv): Check the packet if we get a
+ CRYPTO_RESP and reorder the update of tstamp.
+ (crypto_recv): Don't expire the peer until we're thru with it.
+ * include/ntp.h: AUTOKEY and pkeyid changes
+ From Dave Mills
+
+ * ntpdate/ntpdate.c: Protect sys/ioctl.h
+
+2000-05-01 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99i4
+
+ * include/ntp.h:
+ * include/ntp_crypto.h:
+ * include/ntpd.h:
+ * ntpd/ntp_crypto.c:
+ * ntpd/ntp_proto.c:
+ * ntpd/ntpd.c:
+ * util/ntp_genkeys.c:
+ Dave Mills closed some potential vulnerabilities in the key protocol.
+
+2000-04-28 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99i3
+
+ * ntpd/ntp_proto.c: Just check tstamp, forget about sndauto.seq
+ * ntpd/ntp_crypto.c (crypto_recv): Lose inappropriate ntohl()
+ conversion on tstamp.
+ AUTOKEY if tstamp>0, not !=
+ Stash tstamp before we check pcookie.key (several places)
+ * ntpd/ntp_control.c (ctl_putpeer): In CP_INITSEQ, check
+ recauto.key, not keylist.
+ From: Dave Mills
+
+2000-04-27 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99i2
+
+ * ntpq/ntpq.c: PUBKEY stuff
+ * ntpd/ntp_proto.c (clock_select): nreach, and better survivor pick.
+ * ntpd/ntp_peer.c (newpeer): Better nextdate choice.
+ * ntpd/ntp_control.c (ctl_putsys): Buglet in CS_HOSTNAM code.
+ From Dave Mills.
+
+2000-04-24 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * build (IAM): Show hostname if we trip a buildkey check.
+
+2000-04-23 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * build: deal with optional 1st argument (SIG), which must match
+ the contents of .buildkey
+
+ * flock-build: Generalize, implement SIG and .buildkey, and drive
+ list from LIST, which the user can override.
+
+2000-04-21 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99i1
+ Dave updated some docs, implemented the kpoll variable, and
+ wiggled a host/network byte order thing in the crypto key code.
+
+2000-04-16 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/refclock_wwvb.c (wwvb_receive): Grab any character (instead
+ of just a space) before the DSTchar.
+ From: Dave Mills
+
+2000-04-11 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99i
+
+ Dave made some documentation updates.
+
+2000-04-08 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * flock-build: Add malarky. By default, --enable-parse-clocks.
+ Start 2 builds, one with and the other without rsaref.
+
+ * configure.in: 4.0.99h6
+ Dave improved the crypto stuff some more.
+
+2000-04-05 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/refclock_acts.c (acts_receive): Do a better job with year
+ conversions and leap-year checks. The PTB stuff caught this.
+ Reported by: Daniel.Aeby@eam.admin.ch
+
+2000-04-02 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/refclock_atom.c (atom_pps): Bugfix
+ From: Philippe Charnier <charnier@xp11.frmug.org>
+
+2000-03-30 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * libparse/clk_wharton.c (cvt_wharton_400a): Do not return
+ CVT_NONE when receiving the early warning bit set.
+ From: Philippe De Muyter <phdm@macqel.be>
+
+ * configure.in: 4.0.99h5
+ Dave made more changes to the auth key stuff.
+
+2000-03-29 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99h4
+ Dave made a bunch of changes/fixes to the auth key stuff.
+
+2000-03-22 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_resolver.c: Typos.
+
+2000-03-21 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99h3
+
+ * ntpd/ntp_intres.c: Use LOG_INFO instead of LOG_DEBUG.
+ * ntpd/ntp_resolver.c: Ditto.
+
+2000-03-20 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * util/Makefile.am (ntp_genkeys_LDADD): Might need snprintf (-lntp)
+
+ * librsaref/Makefile.am (stamp-rsaref): nodist_HEADERS are not
+ supoprted yet. Hack around it.
+
+ * ntpd/ntp_resolver.c (findhostaddr): hstrerror isn't always available.
+
+ * configure.in: Look for hstrerror.
+
+ * util/ntp_genkeys.c (main): Use snprintf, not sprintf.
+
+ * ntpd/ntp_crypto.c: Use gethostname, not uname
+ * util/ntp_genkeys.c: Ditto
+ From: Dave Mills
+
+2000-03-19 Harlan Stenn <harlan@pfcs.com>
+
+ * ntpd/ntp_proto.c (receive): Rename ntp_res_send() to
+ ntp_res_name() and adjust the number of arguments.
+ * ntpd/ntp_resolver.c (ntp_res_name): Ditto
+ * include/ntpd.h: Ditto
+
+ * ntpd/ntp_resolver.c: Add de_done to the dns_entry structure.
+
+2000-03-18 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99h2
+
+ * libparse/Makefile.am (info_trimble.c): Use $(srcdir)/foo.sed
+ instead of foo.sed .
+
+ * librsaref/Makefile.am (stamp-rsaref): Copy each file to the build
+ directory, not to the source directory. This sucks; it wastes
+ space (but it's more portable).
+
+ * configure.in (ac_busted_vpath_in_make): Add FreeBSD. I bet all
+ systems that use pmake will need this.
+ (ac_busted_vpath_in_make): Remove FreeBSD - I found a workaround.
+
+ * Makefile.am: General cleanup
+
+ * configure.in: 4.0.99h1
+
+ * ntpd/ntp_resolver.c: Lose unneeded header.
+
+2000-03-17 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * libntp/snprintf.c: #include <config.h>
+
+ * libntp/Makefile.am (EXTRA_libntp_a_SOURCES): Use it correctly...
+
+2000-03-16 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * libntp/Makefile.am (EXTRA_DIST): Added snprintf.c
+
+ * configure.in: Look for (and provide if it's missing) snprintf()
+
+ * ntpd/ntp_request.c (dns_a): Call crypto_public with the resolved
+ name and the peer pointer.
+ (dns_a): crypto_public() is only available if PUBKEY is #defined.
+
+ * ntpd/ntp_crypto.c (crypto_public): sprintf is Evil. Use snprintf.
+ (crypto_setup): Ditto
+ (crypto_read): Ditto
+
+ * ntpd/ntp_resolver.c (ntp_res_send): Lose some debugging noise.
+
+ * ntpd/ntp_config.c (getconfig): Lose testing code.
+
+ * ntpd/ntp_request.c (dns_a): Fix buglet in hostname length check.
+
+2000-03-16 Harlan Stenn <harlan@pfcs.com>
+
+ * ntpd/ntp_request.c (dns_a): Start cracking the returned information.
+
+2000-03-15 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_resolver.c (ntp_res): Authenticate the keyid.
+
+ * ntpd/ntp_crypto.c (crypto_line): Fix definition
+ (crypto_read): Ditto.
+
+ * ntpd/ntp_config.c (getconfig): Move req_keyid generation here.
+
+ * librsaref/Makefile.am (BUILT_SOURCES): Cleanup more nodist_ stuff.
+
+2000-03-14 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * build (RSASUF): If we have rsaref2/ and are building
+ --without-rsaref, note it as a build-directory suffix.
+
+ * configure.in: 4.0.99h
+ Crypto merge
+
+ * librsaref/Makefile.am (nodist_librsaref_a_SOURCES): Added nodist_
+
+2000-02-28 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: Lose the changequote calls and fix the quoting.
+ Reported by: Akim Demaille <akim@epita.fr>
+
+ * ntpd/ntp_request.c: Log various error conditions.
+
+2000-02-27 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99g
+
+ * ntpd/ntpd.c: Only log EINTR if debug > 2.
+
+2000-02-25 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * scripts/mkver.in (ConfStr): Use `-r' when configured with crypto.
+
+ * ntpd/refclock_wwvb.c (wwvb_receive): Undo the previous chagne.
+
+2000-02-24 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/refclock_wwvb.c (wwvb_receive): LENWWVB0 can return 6 or 7
+ fields.
+ From: Michael Sinatra <msinatra@uclink4.berkeley.edu>
+ with a cleanup from Ulrich.
+
+ * scripts/mkver.in (ConfStr): Make RSAREF appear as part of the
+ version.
+
+2000-02-21 Sven Dietrich <sven_dietrich@trimble.com>
+
+ * ports/winnt/include/config.h: Enable MD5 and RANDOM by default
+ * ports/winnt/libntp/SetSystemTime.c: Fix warning and const declaration
+ From: Carl Byington <carl@five-ten-sg.com>
+
+2000-02-21 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * Makefile.am (SUBDIRS): Make librsaref right after includes so we
+ can copy any needed header files over.
+
+ * libntp/Makefile.am (INCLUDES): Also look in librsaref for des.h
+ * ntpd/Makefile.am (INCLUDES): Ditto
+ * util/Makefile.am (INCLUDES): Ditto
+
+ * librsaref/Makefile.am (librsaref_a_SOURCES): Use the des.h from
+ the rsaref2 distribution.
+
+ * include/Makefile.am (noinst_HEADERS): No, we don't want des.h
+
+2000-02-20 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * include/Makefile.am (noinst_HEADERS): Add des.h
+
+2000-02-19 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/ntp_config.c (do_resolve_internal): Try Real Hard to
+ generate a full random key.
+ From: Carl Byington <carl@five-ten-sg.com>
+
+ * include/ntp.h: Now we know we have either mrand48() or random().
+ * configure.in: If we have mrand48, use it. Otherwise, use (and
+ provide if necessary) random().
+ * libntp/Makefile.am (EXTRA_DIST): random.c
+ * libntp/random.c: Added.
+
+2000-02-18 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * librsaref/Makefile.am (stamp-rsaref): Typo
+
+ * configure.in (ac_cv_func_ctty_for_f_setown): Yes for OpenBSD
+ (ac_cv_var_ntp_syscalls): Fix quoting of description
+ From: Jonathan Rozes <jrozes@vinton.com>
+
+ * librsaref/Makefile.am: Fix stamp-rsaref dependency order.
+
+ * configure.in: 4.0.99f
+
+2000-02-17 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/refclock_mx4200.c: Remove the DOP-weighted position
+ averaging code and revert to a simple mean average. The weighted
+ average consistently produced a *worse* result. Go figure.
+ * html/mx4200data.htm: Cleanup, reflect current reality.
+ * html/driver9.htm: Cleanup, reflect current reality.
+ * html/copyright.htm: Cleanup, and credit where credit is due.
+ From: Marc.Brett@westgeo.com
+
+ * ntpd/refclock_oncore.c: Cleanup/fixes
+ * html/driver30.htm: Cleanup
+ * html/Oncore-SHMEM.htm: Cleanup
+ From: Reg Clemens <reg@dwf.com>
+
+2000-02-16 Sven Dietrich <sven_dietrich@trimble.com>
+
+ * winnt/scripts/mkver.bat: Frederick Czajka [w2k@austin.rr.com]
+ winnt/ntpq/ntpq.dsp: modified mkver.bat to eliminate the
+ winnt/ntpd/ntpd.dsp: need to have Perl installed and the
+ winnt/ntpdc/ntpdc.dsp: PERL environment variable to be set.
+ winnt/ntpdate/ntpdate.dsp:
+ winnt/ntptrace/ntptrace.dsp: Thanks, Frederick!
+
+ * ntpd/refclock_nmea.c: Correctly interpret the quality indicator.
+
+2000-02-15 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/refclock_nmea.c: Correctly interpret the quality indicator.
+ Deal with the time supplied in centiseconds. GPGCA/GPGGA cleanup.
+ From: Andrew Hood <ajhood@fl.net.au>
+
+ * libparse/Makefile.am (K_CFLAGS): Use instead. Add NEED_NTP_BOPS.
+
+2000-02-10 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * scripts/ntp-wait.in: Intensify, including some suggestions from
+ Ulrich.
+
+ * configure.in: 4.0.99e
+
+ * scripts/ntp-wait.in: Lose cruft, sleep after each try.
+
+ * scripts/ntp-restart: It's ntpd now. Also, call ntp-wait.
+
+ * configure.in (AC_CONFIG_*): New scripts that use PATH_PERL
+
+ * scripts/Makefile.am (noinst_SCRIPTS): Added ntp-wait
+ (noinst_SCRIPTS): Added all of the scripts that now use PATH_PERL
+
+ * configure.in: Get the path to perl
+ (AC_CONFIG_*): Added scripts/ntp-wait
+
+ * ntptrace/ntptrace.c (DoTrace): If the server's srcadr is 0.0.0.0
+ then we haven't synced yet. Note and punt.
+ Reported by: Bdale Garbee <bdale@gag.com>,http://bugs.debian.org/56551
+
+2000-02-09 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ports/winnt/include/config.h: Typo (CLOCK_PALISADE comment)
+ From: Carl Byington <carl@five-ten-sg.com>
+
+ * configure.in: Disable kernel_fll_bug for Generic_105181-17 under
+ Solaris-2.6
+ From: Juergen Georgi <georgi@belwue.de>
+
+2000-02-07 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99d
+
+ * html/Oncore-SHMEM.htm: New document
+ * html/driver30.htm: Cleanup and improvements
+ From: Reg Clemens <reg@dwf.com>
+
+2000-01-30 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/refclock_oncore.c: Patches/improvements
+ From: Reg Clemens <reg@dwf.com>
+
+2000-01-29 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: 4.0.99c
+
+2000-01-28 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: Autoconf update...
+
+ * ntpdate/ntpdate.c (ntpdatemain): Typo
+ From: Jack Bryans <jbryans@csulb.edu>
+
+ * Makefile.am (EXTRA_DIST): Add flock-build. Probably UDel specific...
+
+2000-01-23 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * ntpd/check_y2k.c (main): Reformat for ansi2knr
+
+ * configure.in (AC_OUTPUT): Revert to obsolete form until automake
+ catches up.
+
+2000-01-22 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * configure.in: Use AC_CHECK_TYPES((s_char)) instead of
+ AC_CHECK_TYPE.
+ (ac_cv_var_kernel_fll_bug): Generic_106541-08 is apparently OK, too.
+
+ * scripts/Makefile.am (EXTRA_DIST): Need to explicitly distribute
+ mkver.in and ntpver.in now, apparently.
+ * configure.in: Search for the various audio_info members so the
+ printing in audio_show is less of a circus. This required an
+ autoconf upgrade. Major sigh.
+
+ * libntp/audio.c (audio_show): Clean up (more) properly.
+
+2000-01-21 Sven Dietrich <sven_dietrich@trimble.com>
+
+ * Add pointer to html/hints/winnt.htm to INSTALL file
+ * Fix NT makefiles to accomodate at least one weird
+ version of Visual C that can't handle the LFs without
+ the DOS CR also.
+
+2000-01-20 Sven Dietrich <sven_dietrich@trimble.com>
+
+ * Update Copyright in Palisade driver to 2000
+ * Fix Palisade MIN & MAX POLL to optimal values
+
+2000-01-19 Harlan Stenn <stenn@whimsy.udel.edu>
+
+ * html/driver7.htm: Patches from Dave Mills
+ * html/driver36.htm: Patches from Dave Mills
+
+ * html/copyright.htm: Added Kamal Mostafa
+
2000-01-19 Harlan Stenn <stenn@whimsy.udel.edu>
* configure.in: 4.0.99b
@@ -6,7 +2803,7 @@
* ntpd/refclock_chu.c: NCHAN is used with generic ICOM.
- * ntpd/refclock_wwv.c: Use new auido stuff
+ * ntpd/refclock_wwv.c: Use new audio stuff
* ntpd/refclock_irig.c: Use new audio stuff
* ntpd/refclock_chu.c: Use new audio stuff
* ntpd/ntp_proto.c: Clean up
@@ -46,7 +2843,7 @@
2000-01-13 Harlan Stenn <stenn@whimsy.udel.edu>
* scripts/ntpsweep: New version
- From: Hans Lambermont <Hans.Lambermont@nl.origin-it.com>
+ From: Hans Lambermont <Hans.Lambermont@nl.origin-it.com>
* ntpd/refclock_fg.c: New version
* html/driver37.htm: New version
@@ -63,7 +2860,7 @@
* html/driver36.htm: Cleanup
* html/monopt.htm: Ditto
From: Dave Mills <mills@udel.edu>
-
+
* ntpd/ntp_intres.c (ntp_intres): Put "NTP_INTRES running" at a
higher debug level
@@ -82,23 +2879,23 @@
2000-01-08 Harlan Stenn <stenn@whimsy.udel.edu>
- * configure.in: <netinet/ip.h> cannot be detected...
- * ntpd/ntp_io.h: ...but every OS has it
- * ntpd/refclock_oncore.c: Lint removal
- * ntpq/ntpq_ops.c: Lint removal
- * ntpq/refclock_chu.c: chu_major() is not an audio routine (?), lint
- * libntp/icom.c: AIX doesn't have <sys/termios.h>
+ * configure.in: <netinet/ip.h> cannot be detected...
+ * ntpd/ntp_io.h: ...but every OS has it
+ * ntpd/refclock_oncore.c: Lint removal
+ * ntpq/ntpq_ops.c: Lint removal
+ * ntpq/refclock_chu.c: chu_major() is not an audio routine (?), lint
+ * libntp/icom.c: AIX doesn't have <sys/termios.h>
From: Marc.Brett@westgeo.com
* ntpd/refclock_chu.c: NetBSD needs sys/ioctl.h
- (chu_debug): NetBSED-specific debug output.
+ (chu_debug): NetBSD-specific debug output.
From: Frederick Bruckman <fb@enteract.com>
2000-01-06 Harlan Stenn <stenn@whimsy.udel.edu>
* configure.in: 4.0.98m
I skipped `l' - it looks like a `1'.
-
+
* html/driver7.htm: Doc update
* html/driver36.htm: Ditto
* html/audio.htm: Ditto
@@ -163,13 +2960,13 @@
* ntpd/refclock_oncore.c (MAP_FAILED): Some systems do not #define
this.
- * ntpd/refclock_wwv.c:
- * ntpd/refclock_chu.c:
- * libntp/icom.c:
- * libntp/Makefile.am:
- * include/icom.h:
- * html/driver7.htm:
- * html/driver36.htm:
+ * ntpd/refclock_wwv.c:
+ * ntpd/refclock_chu.c:
+ * libntp/icom.c:
+ * libntp/Makefile.am:
+ * include/icom.h:
+ * html/driver7.htm:
+ * html/driver36.htm:
Support for ICOM. The WWV/H driver, by the way, is getting truly
awesome. The CHU autotune function works okay as it is. I'd like
to find somebody else to test the audio drivers just to make sure
@@ -205,7 +3002,7 @@
(oncore_read_config): Add the isascii() checks; older versions of
Unix don't guarantee correct behavior of is*() without it.
- * ntpd/refclock_oncore.c: Add proof-of-concept support for
+ * ntpd/refclock_oncore.c: Add proof-of-concept support for
delivering receiver data stream to other processes through
a memory-mapped file.
From: Poul-Henning Kamp <phk@FreeBSD.org>
@@ -241,41 +3038,41 @@
* scripts/ntpsweep: Nifty utility
From: Hans.Lambermont@nl.origin-it.com
- * ntpd/refclock_fg.c:
- * ntpd/refclock_conf.c:
- * ntpd/ntp_control.c:
- * ntpd/Makefile.am:
- * libntp/clocktypes.c:
- * include/ntp.h:
- * html/refclock.htm:
- * html/driver37.htm:
- * configure.in:
- * acconfig.h:
+ * ntpd/refclock_fg.c:
+ * ntpd/refclock_conf.c:
+ * ntpd/ntp_control.c:
+ * ntpd/Makefile.am:
+ * libntp/clocktypes.c:
+ * include/ntp.h:
+ * html/refclock.htm:
+ * html/driver37.htm:
+ * configure.in:
+ * acconfig.h:
Forum Graphic GPS clock support
From: Dmitry Smirnov <das@online.nsk.su>
-
+
* configure.in: Default to compile the IRIG, CHU and WWV/H
drivers and compile the CHU driver for audio, not modem.
Requested by Dave Mills.
- * html/audio.htm:
- * html/driver36.htm:
- * html/qth.htm:
+ * html/audio.htm:
+ * html/driver36.htm:
+ * html/qth.htm:
Dave wrote these to go along with the changes I checked in yesterday.
-
+
1999-12-28 Harlan Stenn <stenn@whimsy.udel.edu>
- * ntpd/refclock_wwv.c:
- * ntpd/refclock_conf.c:
- * ntpd/refclock_chu.c:
- * ntpd/ntp_refclock.c:
- * ntpd/ntp_loopfilter.c:
- * html/refclock.htm:
- * html/pps.htm:
- * html/index.htm:
- * html/driver7.htm:
- * html/driver6.htm:
- * html/copyright.htm:
+ * ntpd/refclock_wwv.c:
+ * ntpd/refclock_conf.c:
+ * ntpd/refclock_chu.c:
+ * ntpd/ntp_refclock.c:
+ * ntpd/ntp_loopfilter.c:
+ * html/refclock.htm:
+ * html/pps.htm:
+ * html/index.htm:
+ * html/driver7.htm:
+ * html/driver6.htm:
+ * html/copyright.htm:
I indulged an old agenda to polish up some programs originally
written for a DSP evaluation board. The result is a really hot
@@ -324,7 +3121,7 @@
* libntp/syssignal.c: Small cleanup to Marc's patch.
- * ntpd/ntp_refclock.c:
+ * ntpd/ntp_refclock.c:
* ntpd/refclock_atom.c: Header cleanup
* html/driver30.htm: Cleanup and improvements.
From: Reg Clemens <reg@dwf.com>
@@ -345,7 +3142,7 @@
AFFECT OTHER SYSTEMS!
* scripts/ntp-status: Added.
From: Marc.Brett@westgeo.com
-
+
* ntpdate/ntpdate.c: Deal with multiple addresses.
From: Jeffrey C Honig <jch@bsdi.com>
@@ -391,7 +3188,7 @@
* ntpd/refclock_wwv.c: Cleanup and fixes
* ntpd/refclock_conf.c: WWV declaration cleanup.
From: Dave Mills <mills@udel.edu>
-
+
1999-12-07 Harlan Stenn <stenn@whimsy.udel.edu>
* libparse/clk_rawdcf.c (cvt_rawdcf): Buglet.
@@ -401,10 +3198,10 @@
* ntpd/Makefile.am (ntpd_SOURCES): Added refclock_wwv.c
- * ntpd/refclock_wwvb.c:
- * ntpd/refclock_wwv.c:
- * ntpd/refclock_conf.c:
- * ntpd/refclock_chu.c:
+ * ntpd/refclock_wwvb.c:
+ * ntpd/refclock_wwv.c:
+ * ntpd/refclock_conf.c:
+ * ntpd/refclock_chu.c:
* libntp/clocktypes.c:
* include/ntp.h: Dave cleaned some things up
Dave cleaned some things up (WWVB -> SPECTRACOM, CHU -> CHU_AUDIO,
@@ -422,7 +3219,7 @@
* ntpq/ntpq_ops.c:
Make `ntpq -pn' independent of DNS, ad advertised.
From: Kamal A Mostafa <kamal@whence.com>
-
+
* ntpd/refclock_mx4200.c (mx4200_start): make missing 3rd
parameter a 0.
@@ -430,7 +3227,7 @@
* ntpd/ntp_refclock.c (refclock_open): "flags" processing cleanup
(refclock_open): PPS device initialization cleanup
- * include/ntp_refclock.h (LDISC_CHU):
+ * include/ntp_refclock.h (LDISC_CHU):
(LDISC_PPS): Clean up comments
From: Dave Mills <mills@udel.edu>
@@ -447,7 +3244,7 @@
1999-12-03 Sven Dietrich <sven_dietrich@trimble.com>
* libntp/systime.c: Removed adjtime hack for WINNT
- * ports/winnt/ntpd/nt_clockstuff.c: Winnt double precision adjtime
+ * ports/winnt/ntpd/nt_clockstuff.c: Winnt double precision adjtime
* ports/winnt/inlcude/clockstuff.h: Remove no longer needed externs
1999-12-02 Harlan Stenn <stenn@whimsy.udel.edu>
@@ -467,7 +3264,7 @@
Update. Should be rewritten to take advantage of the new -g
switch and perhaps a loop to wait until ntpd hits a reasonable
"state".
-
+
* html/hints/solaris-dosynctodr.html: New information
From: "John W. Sopko Jr." <sopko@cs.unc.edu>
@@ -499,48 +3296,48 @@
``--input-directory'') defaults to ``/var/log/ntp''.
From: Ulrich Windl <Ulrich.Windl@rz.uni-regensburg.de>
- * html/driver8.htm:
- * libparse/clk_computime.c:
- * libparse/clk_dcf7000.c:
- * libparse/clk_hopf6021.c:
- * libparse/clk_meinberg.c:
- * libparse/clk_rawdcf.c:
- * libparse/clk_rcc8000.c:
- * libparse/clk_schmid.c:
- * libparse/clk_trimtaip.c:
- * libparse/clk_trimtsip.c:
- * libparse/data_mbg.c:
- * libparse/kclk_computime.c:
- * libparse/kclk_dcf7000.c:
- * libparse/kclk_hopf6021.c:
- * libparse/kclk_meinberg.c:
- * libparse/kclk_rawdcf.c:
- * libparse/kclk_rcc8000.c:
- * libparse/kclk_schmid.c:
- * libparse/kclk_trimtaip.c:
- * libparse/kclk_trimtsip.c:
- * libparse/kparse.c:
- * libparse/kparse_conf.c:
- * libparse/parse.c:
- * libparse/parse_conf.c:
- * libparse/parsesolaris.c:
- * libparse/parsestreams.c:
- * ntpd/refclock_parse.c:
+ * html/driver8.htm:
+ * libparse/clk_computime.c:
+ * libparse/clk_dcf7000.c:
+ * libparse/clk_hopf6021.c:
+ * libparse/clk_meinberg.c:
+ * libparse/clk_rawdcf.c:
+ * libparse/clk_rcc8000.c:
+ * libparse/clk_schmid.c:
+ * libparse/clk_trimtaip.c:
+ * libparse/clk_trimtsip.c:
+ * libparse/data_mbg.c:
+ * libparse/kclk_computime.c:
+ * libparse/kclk_dcf7000.c:
+ * libparse/kclk_hopf6021.c:
+ * libparse/kclk_meinberg.c:
+ * libparse/kclk_rawdcf.c:
+ * libparse/kclk_rcc8000.c:
+ * libparse/kclk_schmid.c:
+ * libparse/kclk_trimtaip.c:
+ * libparse/kclk_trimtsip.c:
+ * libparse/kparse.c:
+ * libparse/kparse_conf.c:
+ * libparse/parse.c:
+ * libparse/parse_conf.c:
+ * libparse/parsesolaris.c:
+ * libparse/parsestreams.c:
+ * ntpd/refclock_parse.c:
Mods and updates
From: Frank Kardel <kardel@acm.org>
-
+
* acconfig.h: PCF refclock
- * configure.in:
- * html/driver35.htm:
- * html/refclock.htm:
- * include/ntp.h:
- * libntp/clocktypes.c:
- * ntpd/Makefile.am:
- * ntpd/ntp_control.c:
- * ntpd/refclock_conf.c:
- * ntpd/refclock_pcf.c:
+ * configure.in:
+ * html/driver35.htm:
+ * html/refclock.htm:
+ * include/ntp.h:
+ * libntp/clocktypes.c:
+ * ntpd/Makefile.am:
+ * ntpd/ntp_control.c:
+ * ntpd/refclock_conf.c:
+ * ntpd/refclock_pcf.c:
From: Andreas Voegele <andreas.voegele@gmx.de>
-
+
* acconfig.h: DECL_STIME_1
* configure.in (iCFLAGS): Use -std1 for alpha*-dec-osf* if we are
@@ -557,7 +3354,7 @@
* ntptrace/ntptrace.c: Ditto
* ntpd/ntp_proto.c: Ditto
* ntpd/refclock_palisade.c: Ditto
- From: Jonathan Stone <jonathan@dsg.stanford.edu>
+ From: Jonathan Stone <jonathan@dsg.stanford.edu>
1999-11-18 Sven Dietrich <sven_dietrich@trimble.com>
* Win NT port updates
@@ -606,16 +3403,16 @@
are both defined.
From: Jeffrey C Honig <jch@bsdi.com>
-
+
* ntpd/ntp_refclock.c: sys/sio.h and SCO5_CLOCK cleanup
- From: Kamal A Mostafa <kamal@whence.com>
+ From: Kamal A Mostafa <kamal@whence.com>
* ntpd/ntp_loopfilter.c: Let -g do a "correct any" for the first
time adjustment.
From: Dave Mills <mills@udel.edu>
* configure.in: sys/sio.h needs to be checked independently.
- Reported by: Kamal A Mostafa <kamal@whence.com>
+ Reported by: Kamal A Mostafa <kamal@whence.com>
1999-11-11 Harlan Stenn <stenn@whimsy.udel.edu>
@@ -623,11 +3420,11 @@
* configure.in: DECL_PLOCK_0 and DECL_STIME_0 are for dec-osf5*, too
* ntpd/ntpd.c: DEC OSF cleanup (editorial comments by HMS)
- From: Tom Smith <smith@cag.lkg.dec.com>
-
+ From: Tom Smith <smith@cag.lkg.dec.com>
+
* ntpd/ntp_refclock.c: MAXUNIT bugfix
From: Marc.Brett@westgeo.com
-
+
* ntpd/ntp_refclock.c:
* ntpd/ntpd.c:
* ntpd/refclock_arc.c:
@@ -641,10 +3438,10 @@
* include/ntp_stdlib.h:
* libntp/systime.c:
* ntpd/ntp_proto.c:
- Replaced the 'sco5_oldclock' variable with 'systime_10ms_ticks'.
+ Replaced the 'sco5_oldclock' variable with 'systime_10ms_ticks'.
Cleared libntp/systime.c and include/ntp_stdlib.h of references
- to SCO5_CLOCK and RELIANTUNIX_CLOCK (moved to ntpd/ntp_proto.c).
- From: Kamal A Mostafa <kamal@whence.com>
+ to SCO5_CLOCK and RELIANTUNIX_CLOCK (moved to ntpd/ntp_proto.c).
+ From: Kamal A Mostafa <kamal@whence.com>
* configure.in: alpha-dec-osf4* -> alpha*-dec-osf4*|alpha*-dec-osf5*
From: Tom Smith <smith@cag.lkg.dec.com>
@@ -677,7 +3474,7 @@
* ntpd/refclock_atom.c: fdpps is only there for PPS or PPSAPI.
AIOCTIMESTAMP is gone now.
From: Kamal A Mostafa <kamal@whence.com>
-
+
* configure.in (HAVE_MLOCKALL): Deal with dec-osf5 realities
* ntpd/refclock_ulink.c (ulink_poll): Fix cast.
* libntp/machines.c (ntp_set_tod): Use a long* for the argument to
@@ -721,7 +3518,7 @@
* ntpd/ntp_intres.c: Lose #include "ntp_select.h"
* libntp/iosignal.c: Lose #include "ntp_select.h"
* include/ntpd.h: #include "ntp_select.h" for declaration of activefds
- Reported by: Christian Krackowizer <kra1@technodat.co.at>
+ Reported by: Christian Krackowizer <kra1@technodat.co.at>
1999-11-01 Harlan Stenn <stenn@whimsy.udel.edu>
@@ -731,10 +3528,10 @@
* libntp/recvbuff.c: Fix free buffer count
From: Jeffrey C Honig <jch@bsdi.com>
- * html/pps.htm:
- * html/howto.htm:
- * html/confopt.htm:
- * html/clockopt.htm:
+ * html/pps.htm:
+ * html/howto.htm:
+ * html/confopt.htm:
+ * html/clockopt.htm:
* html/uthopt.htm:
Updates.
From: Dave Mills <mills@udel.edu>
@@ -755,7 +3552,7 @@
* ntpd/ntp_loopfilter.c: Cleanup and fixes
* libntp/gpstolfp.c: Lose the UL qualifiers - old compilers hate them
From: Dave Mills <mills@udel.edu>
-
+
1999-10-31 Harlan Stenn <stenn@whimsy.udel.edu>
* configure.in: TIOCSPPS cleanup
@@ -775,7 +3572,7 @@
* include/ntp.h: noselect patch
From: Kamal A Mostafa <kamal@whence.com>
- * configure.in:
+ * configure.in:
* acconfig.h: TTYCLK_AIOCTIMESTAMP
Stuff for Kamal
@@ -789,14 +3586,14 @@
* ntpd/refclock_oncore.c: Rename instance.state to instance.o_state
- * refclock_oncore.c:
- * refclock_mx4200.c:
- * refclock_chu.c:
- * refclock_atom.c:
- * ntp_refclock.c:
- * ntp_peer.c:
- * ntp_loopfilter.c:
- * include/ntp_refclock.h:
+ * refclock_oncore.c:
+ * refclock_mx4200.c:
+ * refclock_chu.c:
+ * refclock_atom.c:
+ * ntp_refclock.c:
+ * ntp_peer.c:
+ * ntp_loopfilter.c:
+ * include/ntp_refclock.h:
Various cleanup and fixes
From: Dave Mills <mills@udel.edu>
@@ -815,85 +3612,85 @@
From: John Hay <jhay@mikom.csir.co.za>
- * libntp/msyslog.c:
- * libntp/gpstolfp.c:
+ * libntp/msyslog.c:
+ * libntp/gpstolfp.c:
Lint cleanup
From: Jonathan Stone <jonathan@dsg.stanford.edu>
* parseutil/dcfd.c: abs() -> l_abs(), time.h (AIX 4.3.2 patches)
From: Dana Kaempen <decay@flash.net>
- * ntpd/refclock_oncore.c:
- * ntpd/refclock_atom.c:
- * ntpd/ntp_refclock.c:
+ * ntpd/refclock_oncore.c:
+ * ntpd/refclock_atom.c:
+ * ntpd/ntp_refclock.c:
PPS cleanup
From: John.Hay@mikom.csir.co.za
-
- * util/ntptime.c:
- * ntpdate/ntptimeset.c:
- * ntpdate/ntpdate.c:
- * ntpd/refclock_trak.c:
- * ntpd/refclock_oncore.c:
- * ntpd/refclock_mx4200.c:
- * ntpd/refclock_msfees.c:
- * ntpd/refclock_atom.c:
- * ntpd/ntp_control.c:
- * ntpd/ntp_config.c:
- * configure.in:
- * configure:
+
+ * util/ntptime.c:
+ * ntpdate/ntptimeset.c:
+ * ntpdate/ntpdate.c:
+ * ntpd/refclock_trak.c:
+ * ntpd/refclock_oncore.c:
+ * ntpd/refclock_mx4200.c:
+ * ntpd/refclock_msfees.c:
+ * ntpd/refclock_atom.c:
+ * ntpd/ntp_control.c:
+ * ntpd/ntp_config.c:
+ * configure.in:
+ * configure:
PPS, Solaris 7, cleanup patches
From: Marc.Brett@westgeo.com
- * ports/winnt/ntptrace/ntptrace.dsp:
- * ports/winnt/ntpq/ntpq.dsp:
- * ports/winnt/ntpdc/ntpdc.dsp:
- * ports/winnt/ntpdate/ntpdate.dsp:
- * ports/winnt/ntpd/refclock_trimbledc.c:
- * ports/winnt/ntpd/ntpd.dsp:
- * ports/winnt/ntpd/ntp_iocompletionport.c:
- * ports/winnt/ntpd/nt_clockstuff.c:
- * ports/winnt/libntp/util_clockstuff.c:
- * ports/winnt/libntp/libntp.dsp:
- * ports/winnt/libntp/SetSystemTime.c:
- * ports/winnt/instsrv/instsrv.c:
- * ports/winnt/include/sys/ioctl.h:
- * ports/winnt/include/termios.h:
- * ports/winnt/include/config.h:
- * ports/winnt/include/clockstuff.h:
- * ports/winnt/ntp.dsw:
- * ntpd/refclock_shm.c:
- * ntpd/refclock_palisade.c:
- * ntpd/ntpd.c:
- * ntpd/ntp_timer.c:
- * ntpd/ntp_refclock.c:
- * libntp/systime.c:
- * libntp/machines.c:
+ * ports/winnt/ntptrace/ntptrace.dsp:
+ * ports/winnt/ntpq/ntpq.dsp:
+ * ports/winnt/ntpdc/ntpdc.dsp:
+ * ports/winnt/ntpdate/ntpdate.dsp:
+ * ports/winnt/ntpd/refclock_trimbledc.c:
+ * ports/winnt/ntpd/ntpd.dsp:
+ * ports/winnt/ntpd/ntp_iocompletionport.c:
+ * ports/winnt/ntpd/nt_clockstuff.c:
+ * ports/winnt/libntp/util_clockstuff.c:
+ * ports/winnt/libntp/libntp.dsp:
+ * ports/winnt/libntp/SetSystemTime.c:
+ * ports/winnt/instsrv/instsrv.c:
+ * ports/winnt/include/sys/ioctl.h:
+ * ports/winnt/include/termios.h:
+ * ports/winnt/include/config.h:
+ * ports/winnt/include/clockstuff.h:
+ * ports/winnt/ntp.dsw:
+ * ntpd/refclock_shm.c:
+ * ntpd/refclock_palisade.c:
+ * ntpd/ntpd.c:
+ * ntpd/ntp_timer.c:
+ * ntpd/ntp_refclock.c:
+ * libntp/systime.c:
+ * libntp/machines.c:
NT patches
From: Sven Dietrich <Sven_Dietrich@trimble.com>
1999-10-15 Harlan Stenn <stenn@whimsy.udel.edu>
- * ntpd/refclock_wwvb.c:
- * ntpd/refclock_usno.c:
- * ntpd/refclock_ulink.c:
- * ntpd/refclock_tpro.c:
- * ntpd/refclock_pst.c:
- * ntpd/refclock_parse.c:
- * ntpd/refclock_palisade.c:
- * ntpd/refclock_oncore.c:
- * ntpd/refclock_mx4200.c:
- * ntpd/refclock_msfees.c:
- * ntpd/refclock_jupiter.c:
- * ntpd/refclock_irig.c:
- * ntpd/refclock_heath.c:
- * ntpd/refclock_chu.c:
- * ntpd/refclock_atom.c:
- * ntpd/refclock_as2201.c:
- * ntpd/refclock_arc.c:
- * ntpd/refclock_arbiter.c:
- * ntpd/refclock_acts.c:
- * ntpd/ntp_refclock.c:
- * include/ntp_refclock.h:
+ * ntpd/refclock_wwvb.c:
+ * ntpd/refclock_usno.c:
+ * ntpd/refclock_ulink.c:
+ * ntpd/refclock_tpro.c:
+ * ntpd/refclock_pst.c:
+ * ntpd/refclock_parse.c:
+ * ntpd/refclock_palisade.c:
+ * ntpd/refclock_oncore.c:
+ * ntpd/refclock_mx4200.c:
+ * ntpd/refclock_msfees.c:
+ * ntpd/refclock_jupiter.c:
+ * ntpd/refclock_irig.c:
+ * ntpd/refclock_heath.c:
+ * ntpd/refclock_chu.c:
+ * ntpd/refclock_atom.c:
+ * ntpd/refclock_as2201.c:
+ * ntpd/refclock_arc.c:
+ * ntpd/refclock_arbiter.c:
+ * ntpd/refclock_acts.c:
+ * ntpd/ntp_refclock.c:
+ * include/ntp_refclock.h:
Bunches of fixes.
From: Dave Mills <mills@udel.edu>
@@ -901,7 +3698,7 @@
* html/driver16.htm: New version
* ntpd/refclock_bancomm.c: New version
- From: "Cliff, Gary" <gary.cliff@cdott.com>
+ From: "Cliff, Gary" <gary.cliff@cdott.com>
"Ramasivan, Ganesh" <ganesh.ramasivan@cdott.com>
* ntpd/refclock_ulink.c (ulink_receive): Cleanup
@@ -928,9 +3725,9 @@
1999-10-09 Harlan Stenn <stenn@whimsy.udel.edu>
- * ntpd/refclock_oncore.c:
- * ntpd/refclock_atom.c:
- * ntpd/ntp_refclock.c:
+ * ntpd/refclock_oncore.c:
+ * ntpd/refclock_atom.c:
+ * ntpd/ntp_refclock.c:
PPS API code updated to the current spec
From: Dave Mills
@@ -945,12 +3742,12 @@
1999-09-19 Harlan Stenn <stenn@whimsy.udel.edu>
* ntpd/refclock_ulink.c: Typos in C++ comment
- Reported by: Thomas.Tornblom@Sun.SE
+ Reported by: Thomas.Tornblom@Sun.SE
* configure.in: 4.0.98a
* ntpd/ntp_config.c (getconfig): Fix typo.
- From: "David E. Myers" <dem@skyline.rtp.nc.us>
+ From: "David E. Myers" <dem@skyline.rtp.nc.us>
From: David Godfrey <dave@delta.demon.co.uk>
From: Geoffrey Sisson <geoff@nominet.org.uk>
@@ -984,7 +3781,7 @@
* util/tickadj.c
Use HAVE_KVM_OPEN conditional around kvm.h include.
-
+
From: Wilfredo Sanchez <wsanchez@apple.com>
1999-09-15 Harlan Stenn <stenn@whimsy.udel.edu>
@@ -1001,12 +3798,12 @@
* ntpd/refclock_conf.c:
* ntpd/refclock_ulink.c:
Ultralink driver
- From: Dave Strout <dstrout@linuxfoundary.com>
+ From: Dave Strout <dstrout@linuxfoundary.com>
1999-09-14 Harlan Stenn <stenn@whimsy.udel.edu>
* configure.in: ReliantUNIX patches
- From: Andrej Borsenkow <Andrej.Borsenkow@mow.siemens.ru>
+ From: Andrej Borsenkow <Andrej.Borsenkow@mow.siemens.ru>
* ntpd/refclock_atom.c: PPS cleanup
* ntpd/ntp_refclock.c (refclock_ioctl): PPS cleanup
@@ -1105,7 +3902,7 @@
* ntpd/refclock_parse.c: Permit RTS to power a DCF77.
From: Carsten Paeth <calle@calle.in-berlin.de>
- * ntpd/refclock_oncore.c (oncore_start): This makes the Oncore run
+ * ntpd/refclock_oncore.c (oncore_start): This makes the Oncore run
on systems without hardpps().
From: Poul-Henning Kamp <phk@freebsd.org>
@@ -1139,8 +3936,8 @@
1999-08-23 Harlan Stenn <stenn@whimsy.udel.edu>
* ntpd/refclock_nmea.c: Patches for:
- Trimble OEM Ace-II receiver. Low cost PCB with single
- voltage input, external active antenna and two serial
+ Trimble OEM Ace-II receiver. Low cost PCB with single
+ voltage input, external active antenna and two serial
ports with either NMEA and ITAPs output. Programmable
to be tuned for 'time' accuracy in fixed station config.
From: Nick Hibma <nick.hibma@jrc.it>
@@ -1167,10 +3964,10 @@
* ntpd/ntpd.c:
* ports/winnt/libntp/nt_clockstuff.c:
From: Sven Dietrich <Sven_Dietrich@trimble.com>
-
+
* README.cvs: Updated.
- * configure.in:
+ * configure.in:
* include/ntp_machine.h:
* libntp/mexit.c:
* ntpd/ntp_config.c:
@@ -1195,7 +3992,7 @@
* ntpdate/ntptimeset.c:
ntptimeset patches.
From: Jeffrey Hutzelman <jhutz@cmu.edu>
-
+
* ntpd/refclock_parse.c (local_input): ts.l_ui -> ts.fp.l_ui
1999-08-11 Harlan Stenn <stenn@whimsy.udel.edu>
@@ -1213,8 +4010,8 @@
* ntpdate/ntpdate.c (sys/resource.h) : Include that file only #if
HAVE_RESOURCE_H.
From: Philippe De Muyter <phdm@macqel.be>
-
- * ntptrace/ntptrace.c (input_handler): Make it a "normal" function
+
+ * ntptrace/ntptrace.c (input_handler): Make it a "normal" function
definition.
Reported by: GIANNI_CATANIA@hp-italy-om6.om.hp.com
@@ -1227,7 +4024,7 @@
* configure.in: 4.0.96
* parseutil/dcfd.c (main): Replace SA_ONSTACK and SV_ONSTACK with
- HAVE_SIGACTION and HAVE_SIGVEC, respectively. HP-UX provides both
+ HAVE_SIGACTION and HAVE_SIGVEC, respectively. HP-UX provides both
of the former but only one of the latter...
1999-08-08 Harlan Stenn <stenn@whimsy.udel.edu>
@@ -1281,9 +4078,9 @@
1999-07-27 Harlan Stenn <stenn@whimsy.udel.edu>
* configure.in: 4.0.95
-
+
* ports/winnt: New release
- From: Sven Dietrich <Sven_Dietrich@trimble.com>
+ From: Sven Dietrich <Sven_Dietrich@trimble.com>
1999-07-26 Harlan Stenn <stenn@whimsy.udel.edu>
@@ -1337,11 +4134,11 @@
* ntpd/ntp_timer.c:
* ntpd/ntpd.c: Compile/lint cleanup
From: Allen Smith <easmith@beatrice.rutgers.edu>
-
+
1999-07-21 Harlan Stenn <stenn@whimsy.udel.edu>
* configure.in: 4.0.94a
-
+
* configure.in (ac_cv_make_ntptime): Add tv_nsec check.
* include/Makefile.am (noinst_HEADERS): Forgot ntp_syscall.h
@@ -1358,7 +4155,7 @@
1999-07-20 Harlan Stenn <stenn@whimsy.udel.edu>
- * acconfig.h:
+ * acconfig.h:
* util/ntptime.c: FreeBSD nano patches
From: Per Hedeland <per@erix.ericsson.se> and
Allen Smith <easmith@beatrice.rutgers.edu>
@@ -1508,7 +4305,7 @@ Mon May 31 18:49:49 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* ntpd/refclock_parse.c (gps16x_poll): Likewise.
* ntpd/ntp_filegen.c (filegen_open): Use long format, cast arg to
- match.
+ match.
* ntpd/refclock_parse.c (list_err): Use long format to match arg.
(parse_statistics): Likewise.
@@ -1581,7 +4378,7 @@ Tue May 25 18:00:49 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
From: Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
Patch:
-
+
* include/l_stdlib.h: Fixed syscall() declaration.
* configure.in: Updated test to match.
@@ -1611,7 +4408,7 @@ Tue May 25 18:00:49 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* include/ntp_refclock.h: Protect it from multiple inclusion.
* include/ntp_fp.h: Likewise.
* include/ntp.h: Likewise.
-
+
* include/ntpd.h: Include ntp_refclock.h for MAXDIAL declaration.
* libntp/authkeys.c: Include ntpd.h for current_time declaration.
@@ -1620,7 +4417,7 @@ Tue May 25 18:00:49 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* include/ntp_stdlib.h: Declare variables exported by libntp.
* include/ntpd.h: Likewise for ntpd.
-
+
* libntp/authkeys.c (key_hash, authnokey, authfreekeys,
cache_flags): Made static.
* libntp/systime.c (tvu_maxslew, tsf_maxslew, sys_clock_offset,
@@ -1629,12 +4426,12 @@ Tue May 25 18:00:49 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* ntpd/ntp_loopfilter.c (clock_offset, clock_panic): Likewise.
(pll_nano): Likewise. Removed duplicate definition.
* ntpd/ntp_peer.c (peer_free, current_association_ID,
- assocpeer_calls, init_peer_starttime): Likewise.
+ assocpeer_calls, init_peer_starttime): Likewise.
* ntpd/ntp_proto.c (sys_offset, sys_authdly): Likewise.
* ntpd/ntp_request.c (numrequests, numresppkts, errorcounter):
- Likewise.
+ Likewise.
* ntpd/ntp_restrict.c (res_calls, res_found, res_not_found,
- res_timereset, res_limited_refcnt): Likewise.
+ res_timereset, res_limited_refcnt): Likewise.
* ntpd/ntpd.c (was_alarmed, worker_thread): Likewise.
* ntpq/ntpq_ops.c: Moved declaration of external variable from
@@ -1753,7 +4550,7 @@ Sat May 15 18:53:47 1999 Harlan Stenn <stenn@whimsy.udel.edu>
Fri May 14 23:58:35 1999 Harlan Stenn <stenn@whimsy.udel.edu>
* configure.in: 4.0.92h2
-
+
* configure.in (ac_cv_make_ntptime): Not under Linux. Yes, it
works for some people. We're tired of the complaints from the
others.
@@ -1769,11 +4566,11 @@ Wed May 12 23:02:22 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* libntp/authkeys.c (auth_delkeys): Don't remove autokey keys,
leave info on KEY_TRUSTED flag alone.
Include ntp.h for NTP_MAXKEY definition.
-
+
Thu May 13 02:19:02 1999 Harlan Stenn <stenn@whimsy.udel.edu>
* configure.in: 4.0.92h1
-
+
* configure.in: patch for ReliantUNIX
From: Andrej Borsenkow <borsenkow.msk@sni.de>
@@ -1877,7 +4674,7 @@ Sat Apr 24 01:00:53 1999 Harlan Stenn <stenn@whimsy.udel.edu>
* html/accopt.htm, html/assoc.htm, html/authopt.htm,
html/biblio.htm, html/build.htm, html/clockopt.htm,
- html/confopt.htm, html/copyright.htm, html/debug.htm,
+ html/confopt.htm, html/copyright.htm, html/debug.htm,
html/exec.htm, html/extern.htm, html/hints.htm, html/index.htm,
html/kern.htm, html/miscopt.htm, html/monopt.htm, html/notes.htm,
html/ntpd.htm, html/ntpdate.htm, html/ntpdc.htm, html/ntpq.htm,
@@ -1907,7 +4704,7 @@ Sat Apr 24 01:00:53 1999 Harlan Stenn <stenn@whimsy.udel.edu>
* ntpdc/ntpdc_ops.c: (kerninfo) Report in seconds regardless of
kernel precision. Report kernel flags as text.
From: Poul-Henning Kamp <phk@critter.freebsd.dk>
-
+
Sun Apr 18 14:26:51 1999 Harlan Stenn <stenn@whimsy.udel.edu>
* configure.in: 4.0.92g
diff --git a/contrib/ntp/INSTALL b/contrib/ntp/INSTALL
index 0c73fefed39b..7483e00007b7 100644
--- a/contrib/ntp/INSTALL
+++ b/contrib/ntp/INSTALL
@@ -3,7 +3,7 @@ Basic Installation
These are generic *nix installation instructions.
- For Windows/NT, please see ports/winnt.
+ For Windows/NT, please see ports/winnt and html/hints/winnt.htm.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
diff --git a/contrib/ntp/Makefile.am b/contrib/ntp/Makefile.am
index 53a77603c54c..ddf9956e6ba5 100644
--- a/contrib/ntp/Makefile.am
+++ b/contrib/ntp/Makefile.am
@@ -1,13 +1,13 @@
-#AUTOMAKE_OPTIONS = foreign dist-tarZ #distdir=$(PACKAGE)$(VERSION)
#AUTOMAKE_OPTIONS = util/ansi2knr foreign dist-tarZ no-dependencies
-AUTOMAKE_OPTIONS = util/ansi2knr foreign dist-tarZ
+AUTOMAKE_OPTIONS = util/ansi2knr foreign
SUBDIRS = \
scripts \
include \
+ ElectricFence \
+ librsaref \
libntp \
libparse \
- librsaref \
ntpd \
ntpdate \
ntpdc \
@@ -19,39 +19,48 @@ SUBDIRS = \
kernel \
util
-EXTRA_DIST = ChangeLog COPYRIGHT NEWS README.cvs README.des README.hackers TODO WHERE-TO-START acconfig.h config.guess config.h.in config.sub excludes install-sh dot.emacs build NOTES.y2kfixes readme.y2kfixes results.y2kfixes
+EXTRA_DIST = \
+ COPYRIGHT \
+ ChangeLog \
+ NEWS \
+ NOTES.y2kfixes \
+ README.cvs \
+ README.des \
+ README.hackers \
+ README.rsa \
+ TODO \
+ WHERE-TO-START \
+ acconfig.h \
+ build \
+ config.guess \
+ config.h.in \
+ config.sub \
+ dot.emacs \
+ excludes \
+ flock-build \
+ install-sh \
+ ntp_update \
+ readme.y2kfixes \
+ results.y2kfixes \
+ conf \
+ html \
+ ports
+
+DISTCLEANFILES = .warning
+
#ETAGS_ARGS = $(srcdir)/Makefile.am $(srcdir)/configure.in
ETAGS_ARGS = Makefile.am configure.in acconfig.h
-# DIST_CPDIRS = conf html scripts
-# DIST_MKDIRS = adjtime clockstuff kernel libparse ppsclock
-#DIST_HOOK_DIRS = conf html patches ports scripts
# HMS: make ports be the last directory...
-DIST_HOOK_DIRS = conf html scripts ports
+# DIST_HOOK_DIRS = conf html scripts ports
BUILT_SOURCES = $(srcdir)/COPYRIGHT
$(srcdir)/COPYRIGHT: html/copyright.htm
( echo "This file is automatically generated from html/copyright.htm" ; lynx -dump $(srcdir)/html/copyright.htm ) > $(srcdir)/COPYRIGHT.new && mv $(srcdir)/COPYRIGHT.new $(srcdir)/COPYRIGHT
-# local-dist: dist-tarZ
-
dist-hook:
- -for i in $(DIST_HOOK_DIRS); do \
- mkdir $(distdir)/$$i ; \
- cp -rp $(srcdir)/$$i $(distdir) ; \
- done ; \
- find $(distdir) -type d -name CVS -exec rm -rf '{}' \; ; \
- # find $(distdir)/html -name '*.htm' -exec dos2unix {} {} \; ; \
- # cp -rp $(srcdir)/include/winnt $(distdir)/include
-
-dist-export: distdir
- rm $(distdir)/libntp/authdes.c
- cp $(distdir)/libntp/authdes.c.export $(distdir)/libntp/authdes.c
- chmod -R a+r $(distdir)
- mv $(distdir) $(distdir)-export
- $(TAR) chozf $(distdir)-export.tar.gz $(distdir)-export
- rm -rf $(distdir)-export
+ @find $(distdir) -type d -name CVS -print | xargs rm -rf
Makefile: .warning
diff --git a/contrib/ntp/Makefile.in b/contrib/ntp/Makefile.in
index fbb8f2fe9382..2a7f9389aaa9 100644
--- a/contrib/ntp/Makefile.in
+++ b/contrib/ntp/Makefile.in
@@ -1,6 +1,7 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -31,8 +32,6 @@ mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
-DESTDIR =
-
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
@@ -48,7 +47,7 @@ INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
NORMAL_INSTALL = :
@@ -57,24 +56,30 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+
build_alias = @build_alias@
build_triplet = @build@
host_alias = @host_alias@
host_triplet = @host@
target_alias = @target_alias@
target_triplet = @target@
+
+@SET_MAKE@
AMDEP = @AMDEP@
AMTAR = @AMTAR@
+AUTOKEY = @AUTOKEY@
AWK = @AWK@
CC = @CC@
CFLAGS = @CFLAGS@
CHUTEST = @CHUTEST@
CLKTEST = @CLKTEST@
CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
DCFD = @DCFD@
DEPDIR = @DEPDIR@
+EF_LIBS = @EF_LIBS@
+EF_PROGS = @EF_PROGS@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
LDFLAGS = @LDFLAGS@
LIBPARSE = @LIBPARSE@
LIBRSAREF = @LIBRSAREF@
@@ -86,30 +91,41 @@ MAKE_LIBPARSE = @MAKE_LIBPARSE@
MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@
MAKE_LIBRSAREF = @MAKE_LIBRSAREF@
MAKE_NTPTIME = @MAKE_NTPTIME@
+MAKE_NTP_GENKEYS = @MAKE_NTP_GENKEYS@
MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
MAKE_TICKADJ = @MAKE_TICKADJ@
+MAKE_TIMETRIM = @MAKE_TIMETRIM@
+OPENSSL = @OPENSSL@
+OPENSSL_INC = @OPENSSL_INC@
+OPENSSL_LIB = @OPENSSL_LIB@
PACKAGE = @PACKAGE@
+PATH_PERL = @PATH_PERL@
PATH_SH = @PATH_SH@
PROPDELAY = @PROPDELAY@
RANLIB = @RANLIB@
+RSADIR = @RSADIR@
+RSAOBJS = @RSAOBJS@
RSAREF = @RSAREF@
+RSASRCS = @RSASRCS@
+STRIP = @STRIP@
TESTDCF = @TESTDCF@
U = @U@
VERSION = @VERSION@
+_am_include = @_am_include@
install_sh = @install_sh@
-#AUTOMAKE_OPTIONS = foreign dist-tarZ #distdir=$(PACKAGE)$(VERSION)
#AUTOMAKE_OPTIONS = util/ansi2knr foreign dist-tarZ no-dependencies
-AUTOMAKE_OPTIONS = util/ansi2knr foreign dist-tarZ
+AUTOMAKE_OPTIONS = util/ansi2knr foreign
SUBDIRS = \
scripts \
include \
+ ElectricFence \
+ librsaref \
libntp \
libparse \
- librsaref \
ntpd \
ntpdate \
ntpdc \
@@ -122,46 +138,70 @@ SUBDIRS = \
util
-EXTRA_DIST = ChangeLog COPYRIGHT NEWS README.cvs README.des README.hackers TODO WHERE-TO-START acconfig.h config.guess config.h.in config.sub excludes install-sh dot.emacs build NOTES.y2kfixes readme.y2kfixes results.y2kfixes
+EXTRA_DIST = \
+ COPYRIGHT \
+ ChangeLog \
+ NEWS \
+ NOTES.y2kfixes \
+ README.cvs \
+ README.des \
+ README.hackers \
+ README.rsa \
+ TODO \
+ WHERE-TO-START \
+ acconfig.h \
+ build \
+ config.guess \
+ config.h.in \
+ config.sub \
+ dot.emacs \
+ excludes \
+ flock-build \
+ install-sh \
+ ntp_update \
+ readme.y2kfixes \
+ results.y2kfixes \
+ conf \
+ html \
+ ports
+
+
+DISTCLEANFILES = .warning
+
#ETAGS_ARGS = $(srcdir)/Makefile.am $(srcdir)/configure.in
ETAGS_ARGS = Makefile.am configure.in acconfig.h
-# DIST_CPDIRS = conf html scripts
-# DIST_MKDIRS = adjtime clockstuff kernel libparse ppsclock
-#DIST_HOOK_DIRS = conf html patches ports scripts
# HMS: make ports be the last directory...
-DIST_HOOK_DIRS = conf html scripts ports
+# DIST_HOOK_DIRS = conf html scripts ports
BUILT_SOURCES = $(srcdir)/COPYRIGHT
CVO = `$(srcdir)/config.guess`
BHOST = `(hostname || uname -n)`
+EXEEXT =
+OBJEXT = o
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = README ./stamp-h.in ChangeLog INSTALL Makefile.am \
-Makefile.in NEWS TODO acconfig.h aclocal.m4 config.guess config.h.in \
-config.sub configure configure.in depcomp install-sh missing \
-mkinstalldirs
-
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = README ./stamp-h.in ChangeLog INSTALL Makefile.am \
+Makefile.in NEWS TODO acconfig.h acinclude.m4 aclocal.m4 config.guess \
+config.h.in config.sub configure configure.in depcomp install-sh \
+missing mkinstalldirs
+
+DIST_SUBDIRS = $(SUBDIRS)
+all: $(BUILT_SOURCES) config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
-GZIP_ENV = --best
-all: all-redirect
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
- cd $(top_builddir) \
- && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-$(ACLOCAL_M4): configure.in
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --foreign Makefile
+$(ACLOCAL_M4): configure.in acinclude.m4
cd $(srcdir) && $(ACLOCAL)
config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -192,26 +232,18 @@ $(srcdir)/./stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
cd $(top_srcdir) && $(AUTOHEADER)
@mv $(srcdir)/./stamp-h.inT $(srcdir)/./stamp-h.in
-mostlyclean-hdr:
-
-clean-hdr:
-
distclean-hdr:
-rm -f config.h
-maintainer-clean-hdr:
-
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
# (1) if the variable is set in `config.status', edit `config.status'
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive \
+installdirs-recursive install-recursive uninstall-recursive \
+install-info-recursive uninstall-info-recursive \
check-recursive installcheck-recursive info-recursive dvi-recursive:
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
@@ -235,11 +267,16 @@ mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
- rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
- rev="$$subdir $$rev"; \
- if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
done; \
- test "$$dot_seen" = "no" && rev=". $$rev"; \
+ rev="$$rev ."; \
target=`echo $@ | sed s/-recursive//`; \
for subdir in $$rev; do \
echo "Making $$target in $$subdir"; \
@@ -265,7 +302,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- mkid -f$$here/ID $$unique $(LISP)
+ mkid -fID $$unique $(LISP)
TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -285,19 +322,60 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
|| etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)
-mostlyclean-tags:
-
-clean-tags:
+GTAGS:
+ here=`CDPATH=: && cd $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $$here
distclean-tags:
-rm -f TAGS ID
-maintainer-clean-tags:
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
+top_distdir = .
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+GZIP_ENV = --best
+distdir: $(DISTFILES)
+ -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
+ mkdir $(distdir)
+ $(mkinstalldirs) $(distdir)/scripts
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+ cp -pR $$d/$$file $(distdir) \
+ || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+ for subdir in $(SUBDIRS); do \
+ if test "$$subdir" = .; then :; else \
+ test -d $(distdir)/$$subdir \
+ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$(top_distdir)" \
+ distdir=../$(distdir)/$$subdir \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="${top_distdir}" distdir="$(distdir)" \
+ dist-hook
+ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+ || chmod -R a+r $(distdir)
+dist: distdir
+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
# This target untars the dist file and tries a VPATH configuration. Then
# it guarantees that the distribution is self-contained by making another
# tarfile.
@@ -321,90 +399,32 @@ distcheck: dist
&& $(MAKE) $(AM_MAKEFLAGS) dist \
&& $(MAKE) $(AM_MAKEFLAGS) distclean \
&& rm -f $(distdir).tar.gz \
- && test `find . -type f -print | wc -l` -eq 0
- -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
- @banner="$(distdir).tar.gz is ready for distribution"; \
- dashes=`echo "$$banner" | sed s/./=/g`; \
- echo "$$dashes"; \
- echo "$$banner"; \
- echo "$$dashes"
-dist: distdir
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r $(distdir)
- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz
- -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
-dist-tarZ: distdir
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r $(distdir)
- $(AMTAR) chof - $(distdir) | compress -c > $(distdir).tar.Z
- -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
-dist-all: distdir
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r $(distdir)
- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz
- $(AMTAR) chof - $(distdir) | compress -c > $(distdir).tar.Z
+ && (test `find . -type f -print | wc -l` -eq 0 \
+ || (echo "Error: files left after distclean" 1>&2; \
+ exit 1) )
-chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
-distdir: $(DISTFILES)
- -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
- mkdir $(distdir)
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
- if test -d $$d/$$file; then \
- cp -pR $$d/$$file $(distdir); \
- else \
- test -f $(distdir)/$$file \
- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- || cp -p $$d/$$file $(distdir)/$$file || :; \
- fi; \
- done
- for subdir in $(SUBDIRS); do \
- if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
- || exit 1; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
- || exit 1; \
- fi; \
- done
- $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
+ @echo "$(distdir).tar.gz is ready for distribution" | \
+ sed 'h;s/./=/g;p;x;p;x'
check-am: all-am
check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-all-recursive-am: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
+all-am: Makefile config.h
-install-exec-am:
-install-exec: install-exec-recursive
+installdirs: installdirs-recursive
+installdirs-am:
-install-data-am:
+install: install-recursive
+install-exec: install-exec-recursive
install-data: install-data-recursive
+uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile config.h
-all-redirect: all-recursive-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-installdirs: installdirs-recursive
-installdirs-am:
+installcheck: installcheck-recursive
+
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
mostlyclean-generic:
@@ -413,68 +433,72 @@ clean-generic:
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
-rm -f Makefile.in
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am: clean-hdr clean-tags clean-generic mostlyclean-am
-
clean: clean-recursive
-distclean-am: distclean-hdr distclean-tags distclean-generic clean-am
+clean-am: clean-generic mostlyclean-am
+
+dist-all: dist
distclean: distclean-recursive
-rm -f config.status
-maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \
- maintainer-clean-generic distclean-am
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
+
+dvi:
+
+dvi-am:
+
+info:
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info:
+
+install-man:
+
+installcheck-am:
maintainer-clean: maintainer-clean-recursive
-rm -f config.status
-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-install-recursive uninstall-recursive install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all install-strip \
-installdirs-am installdirs mostlyclean-generic distclean-generic \
-clean-generic maintainer-clean-generic clean mostlyclean distclean \
-maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+.PHONY: all all-am all-recursive check check-am check-recursive clean \
+ clean-generic clean-recursive dist dist-all distcheck distclean \
+ distclean-generic distclean-hdr distclean-recursive \
+ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
+ info-recursive install install-am install-data install-data-am \
+ install-data-recursive install-exec install-exec-am \
+ install-exec-recursive install-info install-info-recursive \
+ install-man install-recursive install-strip installcheck \
+ installcheck-am installcheck-recursive installdirs \
+ installdirs-am installdirs-recursive maintainer-clean \
+ maintainer-clean-generic maintainer-clean-recursive mostlyclean \
+ mostlyclean-generic mostlyclean-recursive tags tags-recursive \
+ uninstall uninstall-am uninstall-info-recursive \
+ uninstall-recursive
$(srcdir)/COPYRIGHT: html/copyright.htm
( echo "This file is automatically generated from html/copyright.htm" ; lynx -dump $(srcdir)/html/copyright.htm ) > $(srcdir)/COPYRIGHT.new && mv $(srcdir)/COPYRIGHT.new $(srcdir)/COPYRIGHT
-# local-dist: dist-tarZ
-
dist-hook:
- -for i in $(DIST_HOOK_DIRS); do \
- mkdir $(distdir)/$$i ; \
- cp -rp $(srcdir)/$$i $(distdir) ; \
- done ; \
- find $(distdir) -type d -name CVS -exec rm -rf '{}' \; ; \
- # find $(distdir)/html -name '*.htm' -exec dos2unix {} {} \; ; \
- # cp -rp $(srcdir)/include/winnt $(distdir)/include
-
-dist-export: distdir
- rm $(distdir)/libntp/authdes.c
- cp $(distdir)/libntp/authdes.c.export $(distdir)/libntp/authdes.c
- chmod -R a+r $(distdir)
- mv $(distdir) $(distdir)-export
- $(TAR) chozf $(distdir)-export.tar.gz $(distdir)-export
- rm -rf $(distdir)-export
+ @find $(distdir) -type d -name CVS -print | xargs rm -rf
Makefile: .warning
diff --git a/contrib/ntp/NEWS b/contrib/ntp/NEWS
index 4cafb97ea9f3..e8bfb7607938 100644
--- a/contrib/ntp/NEWS
+++ b/contrib/ntp/NEWS
@@ -1,8 +1,23 @@
+* Huff-n-Puff filter
+* Preparation for OpenSSL support
+* Resolver changes/improvements are not backward compatible with mode 7
+ requests (which are implementation-specific anyway)
+* leap second stuff
+* manycast should work now
+* ntp-genkeys does new good things.
+* scripts/ntp-close
+* PPS cleanup and improvements
+* readline support for ntpdc
+* Crypto/authentication rewrite
+* WINNT builds with MD5 by default
+* WINNT no longer requires Perl for building with Visual C++ 6.0
* algorithmic improvements, bugfixes
* Solaris dosynctodr info update
* html/pic/* is *lots* smaller
-* New drivers: Forum Graphic GPS, WWV/H
+* New/updated drivers: Forum Graphic GPS, WWV/H, Heath GC-100 II, HOPF
+ serial and PCI, ONCORE, ulink331
* Rewrite of the audio drivers
+(4.0.99)
* Driver updates: CHU, DCF, GPS/VME, Oncore, PCF, Ulink, WWVB, burst
If you use the ONCORE driver with a HARDPPS kernel module,
you *must* have a properly specified:
diff --git a/contrib/ntp/README b/contrib/ntp/README
index a5916d856a40..ce516056b0a2 100644
--- a/contrib/ntp/README
+++ b/contrib/ntp/README
@@ -1,4 +1,7 @@
-The ntp Distribution Base Directory
+
+Send patches and bug reports to <bugs@ntp.org> .
+
+ The ntp Distribution Base Directory
This directory and its subdirectories contain the Network Time Protocol
Version 4 (NTP) distribution for Unix and Windows/NT systems. This release
diff --git a/contrib/ntp/README.cvs b/contrib/ntp/README.cvs
index b9f352a7179b..041b84ad2d29 100644
--- a/contrib/ntp/README.cvs
+++ b/contrib/ntp/README.cvs
@@ -1,24 +1,52 @@
To get the NTP distribution via anonymous CVS:
- cvs -d :pserver:anoncvs@www.ntp.org:/cvs/ntp login
+ % cvs -d :pserver:anoncvs@www.ntp.org:/cvs/ntp login
the password is: anoncvs
- cvs -d :pserver:anoncvs@www.ntp.org:/cvs/ntp co ntp
+ % rm -rf ntp
+ % cvs -d :pserver:anoncvs@www.ntp.org:/cvs/ntp co ntp
after which the "ntp_update" script in the top-level of the tree should
keep things in synch and properly timestamped.
+PLEASE NOTE:
+
+ When obtaining the NTP distribution directly via CVS instead of
+ using "ntp_update", the files are installed in an arbitrary
+ order.
+
+ When you run "make", this may cause some of the generated files
+ to be reconstructed.
+
+ If you do not have the right verison of automake and autoconf,
+ these files will be regenerated incorrectly.
+
+ In this case, you can "fix" your distribution by running:
+
+ ntp_update -C
+
+ which will force any local changes to your NTP files to be
+ discarded and replaced with the versions in the repository.
+
+ If "ntp_update -C" does not work just remove the "broken"
+ files (probably Makefile.in files) and re-run ntp_udate.
+
There are some mailing lists for the NTP CVS distribution. For more
-information, send a message to <majordomo@ntp.org> with the "lists" in
-the body of the message.
+information, send a message to <majordomo@ntp.org> with the word "lists"
+in the body of the message.
-If you get NTP via CVS, you will need to build the release using GNU make
+If you get NTP via CVS, you MAY need to build the release using GNU make
and gcc.
You can then "make dist" to build a release tarball that does not require
GNU make or gcc.
-The reason GNU make and gcc are required is because the repository version
-of NTP does not have the make dependencies built-in. These dependencies
-are created dynamically, and this dynamic process requires GNU make and gcc.
+The reason GNU make and gcc may be required is because the repository
+version of NTP does not have the make dependencies built-in. These
+dependencies are created dynamically, and this dynamic process may
+require GNU make and gcc.
+
+I'm told that the version of automake we are now using does not require
+GNU make or gcc for the dependency tracking, but I haven't tested this
+yet.
diff --git a/contrib/ntp/README.des b/contrib/ntp/README.des
index 8fa0ff855200..88f0aea0667b 100644
--- a/contrib/ntp/README.des
+++ b/contrib/ntp/README.des
@@ -6,14 +6,9 @@ If you want DES support in ntp:
If you *need* DES support:
- first see if you can simply "want" DES support instead
-- Get RSAREF or RSAEURO (or a reasonable facsimile thereof)
-- - Unpack it in the top-level source directory of the NTP distribution
- in a directory named rsaref2
- (You should see directories like ports, rsaref2, scripts)
+- Follow the instructions in README.rsa
-When you run configure, the Right Thing will happen.
-
-Be advised that the RSA DES code is not quite as portable os one might
+Be advised that the RSA DES code is not quite as portable as one might
wish for. In particular, DES under NTP will only work between machines
of the same "endianness".
diff --git a/contrib/ntp/README.rsa b/contrib/ntp/README.rsa
new file mode 100644
index 000000000000..3568dbb0d540
--- /dev/null
+++ b/contrib/ntp/README.rsa
@@ -0,0 +1,105 @@
+If you want to use the RSA stuff for crypto keys:
+
+- Get RSAREF or RSAEURO.
+- - Unpack it in the top-level source directory of the NTP distribution
+ in a directory named rsaref2 or rsaeuro1, respectively
+ (You should see directories like ports, rsaref2, scripts)
+
+Make sure rsa.c has the security patch applied - a copy of it is at the
+end of this file.
+
+When you run configure, the Right Thing will happen.
+
+Be advised that the RSA DES code is not quite as portable os one might
+wish for. In particular, DES under NTP will only work between machines
+of the same "endianness".
+
+Dave would prefer that new/alternative encryption schemes follow the
+RSA API.
+
+
+--- rsa.c.orig Fri Mar 25 14:01:48 1994
++++ rsaref2/source/rsa.c Mon Dec 13 13:10:28 1999
+@@ -33,6 +33,9 @@
+ unsigned char byte, pkcsBlock[MAX_RSA_MODULUS_LEN];
+ unsigned int i, modulusLen;
+
++ if (publicKey->bits > MAX_RSA_MODULUS_BITS)
++ return (RE_LEN);
++
+ modulusLen = (publicKey->bits + 7) / 8;
+ if (inputLen + 11 > modulusLen)
+ return (RE_LEN);
+@@ -78,6 +81,9 @@
+ unsigned char pkcsBlock[MAX_RSA_MODULUS_LEN];
+ unsigned int i, modulusLen, pkcsBlockLen;
+
++ if (publicKey->bits > MAX_RSA_MODULUS_BITS)
++ return (RE_LEN);
++
+ modulusLen = (publicKey->bits + 7) / 8;
+ if (inputLen > modulusLen)
+ return (RE_LEN);
+@@ -128,6 +134,9 @@
+ int status;
+ unsigned char pkcsBlock[MAX_RSA_MODULUS_LEN];
+ unsigned int i, modulusLen;
++
++ if (privateKey->bits > MAX_RSA_MODULUS_BITS)
++ return (RE_LEN);
+
+ modulusLen = (privateKey->bits + 7) / 8;
+ if (inputLen + 11 > modulusLen)
+@@ -168,6 +177,9 @@
+ unsigned char pkcsBlock[MAX_RSA_MODULUS_LEN];
+ unsigned int i, modulusLen, pkcsBlockLen;
+
++ if (privateKey->bits > MAX_RSA_MODULUS_BITS)
++ return (RE_LEN);
++
+ modulusLen = (privateKey->bits + 7) / 8;
+ if (inputLen > modulusLen)
+ return (RE_LEN);
+
+--- rsa.c.orig Sat Sep 28 22:59:40 1996
++++ rsaeuro1/source/rsa.c Sat Jul 8 00:33:13 2000
+@@ -51,6 +51,9 @@ R_RANDOM_STRUCT *randomStruct; /* rando
+ unsigned char byte, pkcsBlock[MAX_RSA_MODULUS_LEN];
+ unsigned int i, modulusLen;
+
++ if (publicKey->bits > MAX_RSA_MODULUS_BITS)
++ return (RE_LEN);
++
+ modulusLen = (publicKey->bits + 7) / 8;
+
+ if(inputLen + 11 > modulusLen)
+@@ -101,6 +104,9 @@ R_RSA_PUBLIC_KEY *publicKey; /* RSA p
+ unsigned char pkcsBlock[MAX_RSA_MODULUS_LEN];
+ unsigned int i, modulusLen, pkcsBlockLen;
+
++ if (publicKey->bits > MAX_RSA_MODULUS_BITS)
++ return (RE_LEN);
++
+ modulusLen = (publicKey->bits + 7) / 8;
+
+ if(inputLen > modulusLen)
+@@ -154,6 +160,9 @@ R_RSA_PRIVATE_KEY *privateKey; /* RSA p
+ unsigned char pkcsBlock[MAX_RSA_MODULUS_LEN];
+ unsigned int i, modulusLen;
+
++ if (privateKey->bits > MAX_RSA_MODULUS_BITS)
++ return (RE_LEN);
++
+ modulusLen = (privateKey->bits + 7) / 8;
+
+ if(inputLen + 11 > modulusLen)
+@@ -193,6 +202,9 @@ R_RSA_PRIVATE_KEY *privateKey; /* RSA p
+ unsigned char pkcsBlock[MAX_RSA_MODULUS_LEN];
+ unsigned int i, modulusLen, pkcsBlockLen;
+
++ if (privateKey->bits > MAX_RSA_MODULUS_BITS)
++ return (RE_LEN);
++
+ modulusLen = (privateKey->bits + 7) / 8;
+
+ if(inputLen > modulusLen)
diff --git a/contrib/ntp/TODO b/contrib/ntp/TODO
index e57a2c46b2bd..833d46976642 100644
--- a/contrib/ntp/TODO
+++ b/contrib/ntp/TODO
@@ -1,6 +1,8 @@
*** IF YOU CAN HELP FIX ANY OF THESE THINGS, PLEASE DO! ***
+010402: Look harder at -lm and -lelf - they are needed less and less...
+
970711: Look Real Hard at changing the key stuff from u_long to u_int32.
970711: Make sure it's safe to convert proto_config's 2nd argument from
diff --git a/contrib/ntp/acconfig.h b/contrib/ntp/acconfig.h
index a46ca673a0ba..dfb0582a8074 100644
--- a/contrib/ntp/acconfig.h
+++ b/contrib/ntp/acconfig.h
@@ -1,9 +1,3 @@
-/* Package */
-#undef PACKAGE
-
-/* Version */
-#undef VERSION
-
/* debugging code */
#undef DEBUG
@@ -76,6 +70,12 @@
/* 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
@@ -374,9 +374,6 @@
/* 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 use struct timespec rather than struct timeval (time in ns rather than us) */
-#undef HAVE_TIMESPEC
-
/* Define if you have the interface in the Draft RFC */
#undef HAVE_PPSAPI
@@ -402,6 +399,9 @@
/* cfset[io]speed()? */
#undef DECL_CFSETISPEED_0
+/* hstrerror()? */
+#undef DECL_HSTRERROR_0
+
/* ioctl()? */
#undef DECL_IOCTL_0
@@ -472,3 +472,8 @@
/* toupper()? */
#undef DECL_TOUPPER_0
+
+/* strerror()? */
+#undef DECL_STRERROR_0
+
+#undef ULONG_CONST
diff --git a/contrib/ntp/acinclude.m4 b/contrib/ntp/acinclude.m4
new file mode 100644
index 000000000000..82ade3850cca
--- /dev/null
+++ b/contrib/ntp/acinclude.m4
@@ -0,0 +1,36 @@
+AC_DEFUN(hs_ULONG_CONST,
+[ AC_EGREP_CPP(Circus,
+ [#define ACAT(a,b)a ## b
+ACAT(Cir,cus)
+], AC_DEFINE([ULONG_CONST(a)], [a ## UL]),
+ AC_EGREP_CPP(Reiser,
+[#define RCAT(a,b)a/**/b
+RCAT(Rei,ser)
+], AC_DEFINE([ULONG_CONST(a)], [a/**/L]),
+ AC_MSG_ERROR([How do we create an unsigned long constant?])))])
+dnl @synopsis AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
+dnl
+dnl This macro defines (with AC_DEFINE) VARNAME to the expansion of the DIR
+dnl variable, taking care of fixing up ${prefix} and such.
+dnl
+dnl Note that the 3 argument form is only supported with autoconf 2.13 and
+dnl later (i.e. only where AC_DEFINE supports 3 arguments).
+dnl
+dnl Examples:
+dnl
+dnl AC_DEFINE_DIR(DATADIR, datadir)
+dnl AC_DEFINE_DIR(PROG_PATH, bindir, [Location of installed binaries])
+dnl
+dnl @version $Id: acinclude.m4,v 1.3 2000/08/04 03:26:22 stenn Exp $
+dnl @author Alexandre Oliva <oliva@lsd.ic.unicamp.br>
+
+AC_DEFUN(AC_DEFINE_DIR, [
+ ac_expanded=`(
+ test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+ test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"
+ eval echo \""[$]$2"\"
+ )`
+ ifelse($3, ,
+ AC_DEFINE_UNQUOTED($1, "$ac_expanded"),
+ AC_DEFINE_UNQUOTED($1, "$ac_expanded", $3))
+])
diff --git a/contrib/ntp/aclocal.m4 b/contrib/ntp/aclocal.m4
index 981fd7243ead..01752eb2bbda 100644
--- a/contrib/ntp/aclocal.m4
+++ b/contrib/ntp/aclocal.m4
@@ -1,65 +1,139 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4a
-
-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
+# aclocal.m4 generated automatically by aclocal 1.4e
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+AC_DEFUN(hs_ULONG_CONST,
+[ AC_EGREP_CPP(Circus,
+ [#define ACAT(a,b)a ## b
+ACAT(Cir,cus)
+], AC_DEFINE([ULONG_CONST(a)], [a ## UL]),
+ AC_EGREP_CPP(Reiser,
+[#define RCAT(a,b)a/**/b
+RCAT(Rei,ser)
+], AC_DEFINE([ULONG_CONST(a)], [a/**/L]),
+ AC_MSG_ERROR([How do we create an unsigned long constant?])))])
+dnl @synopsis AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
+dnl
+dnl This macro defines (with AC_DEFINE) VARNAME to the expansion of the DIR
+dnl variable, taking care of fixing up ${prefix} and such.
+dnl
+dnl Note that the 3 argument form is only supported with autoconf 2.13 and
+dnl later (i.e. only where AC_DEFINE supports 3 arguments).
+dnl
+dnl Examples:
+dnl
+dnl AC_DEFINE_DIR(DATADIR, datadir)
+dnl AC_DEFINE_DIR(PROG_PATH, bindir, [Location of installed binaries])
+dnl
+dnl @version $Id: acinclude.m4,v 1.3 2000/08/04 03:26:22 stenn Exp $
+dnl @author Alexandre Oliva <oliva@lsd.ic.unicamp.br>
+
+AC_DEFUN(AC_DEFINE_DIR, [
+ ac_expanded=`(
+ test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+ test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"
+ eval echo \""[$]$2"\"
+ )`
+ ifelse($3, ,
+ AC_DEFINE_UNQUOTED($1, "$ac_expanded"),
+ AC_DEFINE_UNQUOTED($1, "$ac_expanded", $3))
+])
# Like AC_CONFIG_HEADER, but automatically create stamp file.
-AC_DEFUN(AM_CONFIG_HEADER,
-[AC_PREREQ([2.12])
-AC_CONFIG_HEADER([$1])
-dnl When config.status generates a header, we must update the stamp-h file.
-dnl This file resides in the same directory as the config header
-dnl that is generated. We must strip everything past the first ":",
-dnl and everything past the last "/".
-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
-<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
-<<am_indx=1
-for am_file in <<$1>>; do
- case " <<$>>CONFIG_HEADERS " in
- *" <<$>>am_file "*<<)>>
- echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
- ;;
- esac
- am_indx=`expr "<<$>>am_indx" + 1`
-done<<>>dnl>>)
-changequote([,]))])
+# serial 3
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated. We must strip everything past the first ":",
+# and everything past the last "/".
+
+AC_PREREQ([2.12])
+
+AC_DEFUN([AM_CONFIG_HEADER],
+[AC_CONFIG_HEADER([$1])
+ AC_OUTPUT_COMMANDS(
+ ifelse(patsubst([$1], [[^ ]], []),
+ [],
+ [test -z "$CONFIG_HEADERS" || echo timestamp >dnl
+ patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),
+ [am_indx=1
+ for am_file in $1; do
+ case " $CONFIG_HEADERS " in
+ *" $am_file "*)
+ echo timestamp > `echo $am_file | sed 's%:.*%%;s%[^/]*$%%'`stamp-h$am_indx
+ ;;
+ esac
+ am_indx=\`expr \$am_indx + 1\`
+ done])
+])
# Do all the work for Automake. This macro actually does too much --
# some checks are only needed if your package does certain things.
# But this isn't really a big deal.
-# serial 1
+# serial 5
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery. Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AC_PROG_INSTALL])
-dnl We require 2.13 because we rely on SHELL being computed by configure.
+
+# We require 2.13 because we rely on SHELL being computed by configure.
AC_PREREQ([2.13])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`CDPATH=: && cd $srcdir && pwd`" != "`pwd`" &&
+
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED.
+# The purpose of this macro is to provide the user with a means to
+# check macros which are provided without letting her know how the
+# information is coded.
+# If this macro is not defined by Autoconf, define it here.
+ifdef([AC_PROVIDE_IFELSE],
+ [],
+ [define([AC_PROVIDE_IFELSE],
+ [ifdef([AC_PROVIDE_$1],
+ [$2], [$3])])])
+
+
+# AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE])
+# ----------------------------------------------
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_REQUIRE([AC_PROG_INSTALL])dnl
+# test to see if srcdir already configured
+if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+ AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first])
fi
+
+# Define the identity of the package.
+PACKAGE=$1
+AC_SUBST(PACKAGE)dnl
+VERSION=$2
+AC_SUBST(VERSION)dnl
ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
+
+# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
+# the ones we care about.
+ifdef([m4_pattern_allow],
+ [m4_pattern_allow([^AM_(C|CPP|CXX|OBJC|F|R|GCJ)FLAGS])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
AM_MISSING_PROG(ACLOCAL, aclocal)
AM_MISSING_PROG(AUTOCONF, autoconf)
AM_MISSING_PROG(AUTOMAKE, automake)
@@ -67,40 +141,49 @@ AM_MISSING_PROG(AUTOHEADER, autoheader)
AM_MISSING_PROG(MAKEINFO, makeinfo)
AM_MISSING_PROG(AMTAR, tar)
AM_MISSING_INSTALL_SH
-dnl We need awk for the "check" target. The system "awk" is bad on
-dnl some platforms.
-AC_REQUIRE([AC_PROG_AWK])
-AC_REQUIRE([AC_PROG_MAKE_SET])
-AC_REQUIRE([AM_DEP_TRACK])
-AC_REQUIRE([AM_SET_DEPDIR])
-ifdef([AC_PROVIDE_AC_PROG_CC], [AM_DEPENDENCIES(CC)], [
- define([AC_PROG_CC], defn([AC_PROG_CC])[AM_DEPENDENCIES(CC)])])
-ifdef([AC_PROVIDE_AC_PROG_CXX], [AM_DEPENDENCIES(CXX)], [
- define([AC_PROG_CXX], defn([AC_PROG_CXX])[AM_DEPENDENCIES(CXX)])])
+AM_PROG_INSTALL_STRIP
+# We need awk for the "check" target. The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_PROVIDE_IFELSE([AC_PROG_][CC],
+ [AM_DEPENDENCIES(CC)],
+ [define([AC_PROG_][CC],
+ defn([AC_PROG_][CC])[AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_][CXX],
+ [AM_DEPENDENCIES(CXX)],
+ [define([AC_PROG_][CXX],
+ defn([AC_PROG_][CXX])[AM_DEPENDENCIES(CXX)])])dnl
])
#
# Check to make sure that the build environment is sane.
#
-AC_DEFUN(AM_SANITY_CHECK,
+# serial 3
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
[AC_MSG_CHECKING([whether build environment is sane])
# Just in case
sleep 1
-echo timestamp > conftestfile
+echo timestamp > conftest.file
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
- if test "[$]*" = "X"; then
+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+ if test "$[*]" = "X"; then
# -L didn't work.
- set X `ls -t $srcdir/configure conftestfile`
+ set X `ls -t $srcdir/configure conftest.file`
fi
- if test "[$]*" != "X $srcdir/configure conftestfile" \
- && test "[$]*" != "X conftestfile $srcdir/configure"; then
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
# If neither matched, then we have a broken ls. This can happen
# if, for instance, CONFIG_SHELL is bash and it inherits a
@@ -110,7 +193,7 @@ if (
alias in your environment])
fi
- test "[$]2" = conftestfile
+ test "$[2]" = conftest.file
)
then
# Ok.
@@ -122,72 +205,183 @@ fi
rm -f conftest*
AC_MSG_RESULT(yes)])
-dnl AM_MISSING_PROG(NAME, PROGRAM)
-AC_DEFUN(AM_MISSING_PROG, [
-AC_REQUIRE([AM_MISSING_HAS_RUN])
+
+# serial 2
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
$1=${$1-"${am_missing_run}$2"}
AC_SUBST($1)])
-dnl Like AM_MISSING_PROG, but only looks for install-sh.
-dnl AM_MISSING_INSTALL_SH()
-AC_DEFUN(AM_MISSING_INSTALL_SH, [
-AC_REQUIRE([AM_MISSING_HAS_RUN])
+
+# AM_MISSING_INSTALL_SH
+# ---------------------
+# Like AM_MISSING_PROG, but only looks for install-sh.
+AC_DEFUN([AM_MISSING_INSTALL_SH],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
if test -z "$install_sh"; then
- install_sh="$ac_aux_dir/install-sh"
- test -f "$install_sh" || install_sh="$ac_aux_dir/install.sh"
- test -f "$install_sh" || install_sh="${am_missing_run}${ac_auxdir}/install-sh"
- dnl FIXME: an evil hack: we remove the SHELL invocation from
- dnl install_sh because automake adds it back in. Sigh.
- install_sh="`echo $install_sh | sed -e 's/\${SHELL}//'`"
+ for install_sh in "$ac_aux_dir/install-sh" \
+ "$ac_aux_dir/install.sh" \
+ "${am_missing_run}${ac_auxdir}/install-sh";
+ do
+ test -f "$install_sh" && break
+ done
+ # FIXME: an evil hack: we remove the SHELL invocation from
+ # install_sh because automake adds it back in. Sigh.
+ install_sh=`echo $install_sh | sed -e 's/\${SHELL}//'`
fi
AC_SUBST(install_sh)])
-dnl AM_MISSING_HAS_RUN.
-dnl Define MISSING if not defined so far and test if it supports --run.
-dnl If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN], [
-test x"${MISSING+set}" = xset || \
- MISSING="\${SHELL} `CDPATH=: && cd $ac_aux_dir && pwd`/missing"
-dnl Use eval to expand $SHELL
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[test x"${MISSING+set}" = xset ||
+ MISSING="\${SHELL} `CDPATH=:; cd $ac_aux_dir && pwd`/missing"
+# Use eval to expand $SHELL
if eval "$MISSING --run :"; then
am_missing_run="$MISSING --run "
else
am_missing_run=
- AC_MSG_WARN([\`missing' script is too old or missing])
+ am_backtick='`'
+ AC_MSG_WARN([${am_backtick}missing' script is too old or missing])
fi
])
-dnl See how the compiler implements dependency checking.
-dnl Usage:
-dnl AM_DEPENDENCIES(NAME)
-dnl NAME is "CC", "CXX" or "OBJC".
+# AM_AUX_DIR_EXPAND
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to ${srcdir}/foo. In other projects, it is set to `.'.
+# Of course, Automake must honor this variable whenever it call a tool
+# from the auxiliary directory. The problem is that $srcdir (hence
+# $ac_aux_dir) can be either an absolute path or a path relative to
+# $top_srcdir or absolute, this depends on how configure is run. This
+# is pretty anoying since it makes $ac_aux_dir quite unusable in
+# subdirectories: on the top source directory, any form will work
+# fine, but in subdirectories relative pat needs to be adapted.
+# - calling $top_srcidr/$ac_aux_dir/missing would success if $srcdir is
+# relative, but fail if $srcdir is absolute
+# - conversly, calling $ax_aux_dir/missing would fail if $srcdir is
+# absolute, and success on relative paths.
+#
+# Consequently, we define and use $am_aux_dir, the "always absolute"
+# version of $ac_aux_dir.
-dnl We try a few techniques and use that to set a single cache variable.
+AC_DEFUN([AM_AUX_DIR_EXPAND], [
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
+])
-AC_DEFUN(AM_DEPENDENCIES,[
-AC_REQUIRE([AM_SET_DEPDIR])
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])
-ifelse([$1],CC,[
-AC_REQUIRE([AC_PROG_CC])
-AC_REQUIRE([AC_PROG_CPP])
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries. This is especially
+# annoying in cross=compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so if we ever
+# need to use a non standard strip, we just have to make sure we use
+# install-sh with the STRIPPROG variable set.
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_MISSING_INSTALL_SH])
+dnl Don't test for $cross_compiling = yes, it might be `maybe'...
+# We'd like to do this but we can't because it will unconditionally
+# require config.guess. One way would be if autoconf had the capability
+# to let us compile in this code only when config.guess was already
+# a possibility.
+#if test "$cross_compiling" != no; then
+# # since we are cross-compiling, we need to check for a suitable `strip'
+# AM_PROG_STRIP
+# if test -z "$STRIP"; then
+# AC_MSG_WARN([strip missing, install-strip will not strip binaries])
+# fi
+#fi
+
+# If $STRIP is defined (either by the user, or by AM_PROG_STRIP),
+# instruct install-strip to use install-sh and the given $STRIP program.
+# Otherwise, just use ${INSTALL}: the idea is to use the vendor install
+# as much as possible, because it's faster.
+if test -z "$STRIP"; then
+ # The top level make will set INSTALL_PROGRAM=$(INSTALL_STRIP_PROGRAM)
+ # and the double dolard below is there to make sure that ${INSTALL}
+ # is substitued in the sub-makes, not at the top-level; this is
+ # needed if ${INSTALL} is a relative path (ajusted in each subdirectory
+ # by config.status).
+ INSTALL_STRIP_PROGRAM='$${INSTALL} -s'
+ INSTALL_STRIP_PROGRAM_ENV=''
+else
+ _am_dirpart="`echo $install_sh | sed -e 's,//*[[^/]]*$,,'`"
+ INSTALL_STRIP_PROGRAM="\${SHELL} \`CDPATH=: && cd $_am_dirpart && pwd\`/install-sh -c -s"
+ INSTALL_STRIP_PROGRAM_ENV="STRIPPROG='\$(STRIP)'"
+fi
+AC_SUBST([STRIP])
+AC_SUBST([INSTALL_STRIP_PROGRAM])
+AC_SUBST([INSTALL_STRIP_PROGRAM_ENV])])
+
+#AC_DEFUN([AM_PROG_STRIP],
+#[# Check for `strip', unless the installer
+# has set the STRIP environment variable.
+# Note: don't explicitly check for -z "$STRIP" here because
+# that will cause problems if AC_CANONICAL_* is AC_REQUIREd after
+# this macro, and anyway it doesn't have an effect anyway.
+#AC_CHECK_TOOL([STRIP],[strip])
+#])
+
+# serial 3
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery. Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+# AM_DEPENDENCIES(NAME)
+# ---------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX" or "OBJC".
+# We try a few techniques and use that to set a single cache variable.
+AC_DEFUN([AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+ifelse([$1], CC,
+ [AC_REQUIRE([AC_PROG_][CC])dnl
+AC_REQUIRE([AC_PROG_][CPP])
depcc="$CC"
-depcpp="$CPP"],[$1],CXX,[
-AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
+depcpp="$CPP"],
+ [$1], CXX, [AC_REQUIRE([AC_PROG_][CXX])dnl
+AC_REQUIRE([AC_PROG_][CXXCPP])
depcc="$CXX"
-depcpp="$CXXCPP"],[$1],OBJC,[
-am_cv_OBJC_dependencies_compiler_type=gcc],[
-AC_REQUIRE([AC_PROG_][$1])
-depcc="$[$1]"
+depcpp="$CXXCPP"],
+ [$1], OBJC, [am_cv_OBJC_dependencies_compiler_type=gcc],
+ [AC_REQUIRE([AC_PROG_][$1])dnl
+depcc="$$1"
depcpp=""])
-AC_MSG_CHECKING([dependency style of $depcc])
-AC_CACHE_VAL(am_cv_[$1]_dependencies_compiler_type,[
-if test -z "$AMDEP"; then
- echo '#include "conftest.h"' > conftest.c
- echo 'int i;' > conftest.h
- am_cv_[$1]_dependencies_compiler_type=none
- for depmode in `sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < "$am_depcomp"`; do
+AC_REQUIRE([AM_MAKE_INCLUDE])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+ [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
+ mkdir confdir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" confdir
+ cd confdir
+
+ am_cv_$1_dependencies_compiler_type=none
+ for depmode in `sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < "./depcomp"`; do
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ echo '#include "conftest.h"' > conftest.c
+ echo 'int i;' > conftest.h
+
case "$depmode" in
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
@@ -200,40 +394,51 @@ if test -z "$AMDEP"; then
;;
none) break ;;
esac
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this.
if depmode="$depmode" \
source=conftest.c object=conftest.o \
depfile=conftest.Po tmpdepfile=conftest.TPo \
- $SHELL $am_depcomp $depcc -c conftest.c 2>/dev/null &&
+ $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
grep conftest.h conftest.Po > /dev/null 2>&1; then
- am_cv_[$1]_dependencies_compiler_type="$depmode"
+ am_cv_$1_dependencies_compiler_type="$depmode"
break
fi
done
- rm -f conftest.*
+ cd ..
+ rm -rf confdir
else
- am_cv_[$1]_dependencies_compiler_type=none
+ am_cv_$1_dependencies_compiler_type=none
fi
])
-AC_MSG_RESULT($am_cv_[$1]_dependencies_compiler_type)
-[$1]DEPMODE="depmode=$am_cv_[$1]_dependencies_compiler_type"
-AC_SUBST([$1]DEPMODE)
+$1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type"
+AC_SUBST([$1DEPMODE])
])
-dnl Choose a directory name for dependency files.
-dnl This macro is AC_REQUIREd in AM_DEPENDENCIES
-AC_DEFUN(AM_SET_DEPDIR,[
-if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in AM_DEPENDENCIES
+AC_DEFUN([AM_SET_DEPDIR],
+[if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then
DEPDIR=.deps
+ # We redirect because .deps might already exist and be populated.
+ # In this situation we don't want to see an error.
+ rmdir .deps > /dev/null 2>&1
else
DEPDIR=_deps
fi
AC_SUBST(DEPDIR)
])
-AC_DEFUN(AM_DEP_TRACK,[
-AC_ARG_ENABLE(dependency-tracking,
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE(dependency-tracking,
[ --disable-dependency-tracking Speeds up one-time builds
--enable-dependency-tracking Do not reject slow dependency extractors])
if test "x$enable_dependency_tracking" = xno; then
@@ -257,16 +462,16 @@ subst(AMDEPBACKSLASH)
popdef([subst])
])
-dnl Generate code to set up dependency tracking.
-dnl This macro should only be invoked once -- use via AC_REQUIRE.
-dnl Usage:
-dnl AM_OUTPUT_DEPENDENCY_COMMANDS
+# Generate code to set up dependency tracking.
+# This macro should only be invoked once -- use via AC_REQUIRE.
+# Usage:
+# AM_OUTPUT_DEPENDENCY_COMMANDS
-dnl
-dnl This code is only required when automatic dependency tracking
-dnl is enabled. FIXME. This creates each `.P' file that we will
-dnl need in order to bootstrap the dependency handling code.
-AC_DEFUN(AM_OUTPUT_DEPENDENCY_COMMANDS,[
+#
+# This code is only required when automatic dependency tracking
+# is enabled. FIXME. This creates each `.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[
AC_OUTPUT_COMMANDS([
test x"$AMDEP" != x"" ||
for mf in $CONFIG_FILES; do
@@ -308,10 +513,35 @@ done
], [AMDEP="$AMDEP"
ac_aux_dir="$ac_aux_dir"])])
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+# BSD make uses .include
+cat > confinc << 'END'
+doit:
+ @echo done
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+_am_include='#'
+for am_inc in include .include; do
+ echo "$am_inc confinc" > confmf
+ if test "`$am_make -f confmf 2> /dev/null`" = "done"; then
+ _am_include=$am_inc
+ break
+ fi
+done
+AC_SUBST(_am_include)
+AC_MSG_RESULT($_am_include)
+rm -f confinc confmf
+])
+
# serial 1
-AC_DEFUN(AM_C_PROTOTYPES,
+AC_DEFUN([AM_C_PROTOTYPES],
[AC_REQUIRE([AM_PROG_CC_STDC])
AC_REQUIRE([AC_PROG_CPP])
AC_MSG_CHECKING([for function prototypes])
@@ -322,10 +552,10 @@ if test "$am_cv_prog_cc_stdc" != no; then
else
AC_MSG_RESULT(no)
U=_ ANSI2KNR=./ansi2knr
- # Ensure some checks needed by ansi2knr itself.
- AC_HEADER_STDC
- AC_CHECK_HEADERS(string.h)
fi
+# Ensure some checks needed by ansi2knr itself.
+AC_HEADER_STDC
+AC_CHECK_HEADERS(string.h)
AC_SUBST(U)dnl
AC_SUBST(ANSI2KNR)dnl
])
@@ -348,7 +578,7 @@ AC_SUBST(ANSI2KNR)dnl
# program @code{ansi2knr}, which comes with Ghostscript.
# @end defmac
-AC_DEFUN(AM_PROG_CC_STDC,
+AC_DEFUN([AM_PROG_CC_STDC],
[AC_REQUIRE([AC_PROG_CC])
AC_BEFORE([$0], [AC_C_INLINE])
AC_BEFORE([$0], [AC_C_CONST])
@@ -358,7 +588,7 @@ dnl like #elif.
dnl FIXME: can't do this because then AC_AIX won't work due to a
dnl circular dependency.
dnl AC_BEFORE([$0], [AC_PROG_CPP])
-AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C)
+AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C])
AC_CACHE_VAL(am_cv_prog_cc_stdc,
[am_cv_prog_cc_stdc=no
ac_save_CC="$CC"
@@ -411,7 +641,7 @@ CC="$ac_save_CC"
if test -z "$am_cv_prog_cc_stdc"; then
AC_MSG_RESULT([none needed])
else
- AC_MSG_RESULT($am_cv_prog_cc_stdc)
+ AC_MSG_RESULT([$am_cv_prog_cc_stdc])
fi
case "x$am_cv_prog_cc_stdc" in
x|xno) ;;
diff --git a/contrib/ntp/adjtimed/Makefile.in b/contrib/ntp/adjtimed/Makefile.in
index f223c8e0c35c..72ae6211805e 100644
--- a/contrib/ntp/adjtimed/Makefile.in
+++ b/contrib/ntp/adjtimed/Makefile.in
@@ -1,6 +1,7 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -31,8 +32,6 @@ mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
-DESTDIR =
-
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
@@ -48,7 +47,7 @@ INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
NORMAL_INSTALL = :
@@ -57,24 +56,30 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+
build_alias = @build_alias@
build_triplet = @build@
host_alias = @host_alias@
host_triplet = @host@
target_alias = @target_alias@
target_triplet = @target@
+
+@SET_MAKE@
AMDEP = @AMDEP@
AMTAR = @AMTAR@
+AUTOKEY = @AUTOKEY@
AWK = @AWK@
CC = @CC@
CFLAGS = @CFLAGS@
CHUTEST = @CHUTEST@
CLKTEST = @CLKTEST@
CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
DCFD = @DCFD@
DEPDIR = @DEPDIR@
+EF_LIBS = @EF_LIBS@
+EF_PROGS = @EF_PROGS@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
LDFLAGS = @LDFLAGS@
LIBPARSE = @LIBPARSE@
LIBRSAREF = @LIBRSAREF@
@@ -86,16 +91,27 @@ MAKE_LIBPARSE = @MAKE_LIBPARSE@
MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@
MAKE_LIBRSAREF = @MAKE_LIBRSAREF@
MAKE_NTPTIME = @MAKE_NTPTIME@
+MAKE_NTP_GENKEYS = @MAKE_NTP_GENKEYS@
MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
MAKE_TICKADJ = @MAKE_TICKADJ@
+MAKE_TIMETRIM = @MAKE_TIMETRIM@
+OPENSSL = @OPENSSL@
+OPENSSL_INC = @OPENSSL_INC@
+OPENSSL_LIB = @OPENSSL_LIB@
PACKAGE = @PACKAGE@
+PATH_PERL = @PATH_PERL@
PATH_SH = @PATH_SH@
PROPDELAY = @PROPDELAY@
RANLIB = @RANLIB@
+RSADIR = @RSADIR@
+RSAOBJS = @RSAOBJS@
RSAREF = @RSAREF@
+RSASRCS = @RSASRCS@
+STRIP = @STRIP@
TESTDCF = @TESTDCF@
U = @U@
VERSION = @VERSION@
+_am_include = @_am_include@
install_sh = @install_sh@
#AUTOMAKE_OPTIONS = ../ansi2knr #no-dependencies
@@ -108,107 +124,93 @@ INCLUDES = -I$(top_srcdir)/include
LDADD = ../libntp/libntp.a
#EXTRA_DIST = TAGS
ETAGS_ARGS = Makefile.am
+EXEEXT =
+OBJEXT = o
subdir = adjtimed
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES =
-PROGRAMS = $(bin_PROGRAMS)
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+EXTRA_PROGRAMS = adjtimed$(EXEEXT)
+bin_PROGRAMS = @MAKE_ADJTIMED@
+PROGRAMS = $(bin_PROGRAMS)
-DEFS = @DEFS@ -I. -I$(srcdir) -I..
+DEFS = @DEFS@ -I. -I$(srcdir) -I$(top_builddir)
CPPFLAGS = @CPPFLAGS@
LIBS = @LIBS@
ANSI2KNR = ../util/ansi2knr
adjtimed_SOURCES = adjtimed.c
-adjtimed_OBJECTS = adjtimed$U.o
+adjtimed_OBJECTS = adjtimed$U.$(OBJEXT)
adjtimed_LDADD = $(LDADD)
-adjtimed_DEPENDENCIES = ../libntp/libntp.a
+adjtimed_DEPENDENCIES = ../libntp/libntp.a
adjtimed_LDFLAGS =
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = adjtimed.c
-DIST_COMMON = README Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
+DIST_SOURCES = adjtimed.c
depcomp = $(SHELL) $(top_srcdir)/depcomp
-DEP_FILES = @AMDEP@ $(DEPDIR)/adjtimed$U.Po
-SOURCES = adjtimed.c
-OBJECTS = adjtimed$U.o
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .c .o
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu adjtimed/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
+@AMDEP@DEP_FILES = $(DEPDIR)/adjtimed$U.Po
+DIST_COMMON = README Makefile.am Makefile.in
-mostlyclean-binPROGRAMS:
+SOURCES = adjtimed.c
+OBJECTS = adjtimed$U.$(OBJEXT)
-clean-binPROGRAMS:
- -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+all: all-am
-distclean-binPROGRAMS:
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
-maintainer-clean-binPROGRAMS:
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu adjtimed/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && \
+ CONFIG_HEADERS= CONFIG_LINKS= \
+ CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
if test -f $$p; then \
- f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \
- echo " $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/$$f"; \
- $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/$$f; \
+ f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
else :; fi; \
done
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
- f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \
+ f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
rm -f $(DESTDIR)$(bindir)/$$f; \
done
-mostlyclean-compile:
- -rm -f *.o core *.core
+clean-binPROGRAMS:
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-clean-compile:
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT) core *.core
distclean-compile:
-rm -f *.tab.c
-
-maintainer-clean-compile:
-../util/ansi2knr: ../util/ansi2knr.o
+../util/ansi2knr: ../util/ansi2knr.$(OBJEXT)
cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
-../util/ansi2knr.o:
- cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.o
+../util/ansi2knr.$(OBJEXT):
+ cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.$(OBJEXT)
mostlyclean-kr:
-rm -f *_.c
-clean-kr:
-
-distclean-kr:
-
-maintainer-clean-kr:
-
adjtimed: $(adjtimed_OBJECTS) $(adjtimed_DEPENDENCIES)
@rm -f adjtimed
$(LINK) $(adjtimed_LDFLAGS) $(adjtimed_OBJECTS) $(adjtimed_LDADD) $(LIBS)
adjtimed_.c: adjtimed.c $(ANSI2KNR)
$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/adjtimed.c; then echo $(srcdir)/adjtimed.c; else echo adjtimed.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > adjtimed_.c
-adjtimed_.o : $(ANSI2KNR)
+adjtimed_.$(OBJEXT) : $(ANSI2KNR)
tags: TAGS
@@ -219,9 +221,9 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- mkid -f$$here/ID $$unique $(LISP)
+ mkid -fID $$unique $(LISP)
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
@@ -234,74 +236,71 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
|| etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
-mostlyclean-tags:
-
-clean-tags:
+GTAGS:
+ here=`CDPATH=: && cd $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $$here
distclean-tags:
-rm -f TAGS ID
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-distdir: $(DISTFILES)
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
- if test -d $$d/$$file; then \
- cp -pR $$d/$$file $(distdir); \
- else \
- test -f $(distdir)/$$file \
- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- || cp -p $$d/$$file $(distdir)/$$file || :; \
- fi; \
- done
-
-@AMDEP@include $(DEPDIR)/adjtimed$U.Po
-
-mostlyclean-depend:
-
-clean-depend:
+@AMDEP@@_am_include@ $(DEPDIR)/adjtimed$U.Po
distclean-depend:
-rm -rf $(DEPDIR)
-maintainer-clean-depend:
-
@AMDEP@CCDEPMODE = @CCDEPMODE@
.c.o:
@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c -o $@ $<
+ $(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
+.c.obj:
+@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(COMPILE) -c -o $@ `cygpath -w $<`
+
+
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+ cp -pR $$d/$$file $(distdir) \
+ || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
check-am: all-am
check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am: install-binPROGRAMS
-install-exec: install-exec-am
+all-am: Makefile $(PROGRAMS)
-install-data-am:
+installdirs:
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
+
+install: install-am
+install-exec: install-exec-am
install-data: install-data-am
+uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-binPROGRAMS
-uninstall: uninstall-am
-all-am: Makefile $(PROGRAMS)
-all-redirect: all-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-installdirs:
- $(mkinstalldirs) $(DESTDIR)$(bindir)
+installcheck: installcheck-am
+
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
mostlyclean-generic:
@@ -312,45 +311,55 @@ distclean-generic:
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
-rm -f Makefile.in
-mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \
- mostlyclean-kr mostlyclean-tags mostlyclean-depend \
- mostlyclean-generic
+clean: clean-am
-mostlyclean: mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
-clean-am: clean-binPROGRAMS clean-compile clean-kr clean-tags \
- clean-depend clean-generic mostlyclean-am
+distclean: distclean-am
-clean: clean-am
+distclean-am: clean-am distclean-compile distclean-depend \
+ distclean-generic distclean-tags
-distclean-am: distclean-binPROGRAMS distclean-compile distclean-kr \
- distclean-tags distclean-depend distclean-generic \
- clean-am
+dvi:
-distclean: distclean-am
+dvi-am:
-maintainer-clean-am: maintainer-clean-binPROGRAMS \
- maintainer-clean-compile maintainer-clean-kr \
- maintainer-clean-tags maintainer-clean-depend \
- maintainer-clean-generic distclean-am
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
+info:
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-info:
+
+install-man:
+
+installcheck-am:
maintainer-clean: maintainer-clean-am
-.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
-maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-kr distclean-kr clean-kr \
-maintainer-clean-kr tags mostlyclean-tags distclean-tags clean-tags \
-maintainer-clean-tags distdir mostlyclean-depend distclean-depend \
-clean-depend maintainer-clean-depend info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-kr
+
+uninstall-am: uninstall-binPROGRAMS
+
+.PHONY: all all-am check check-am clean clean-binPROGRAMS clean-generic \
+ distclean distclean-compile distclean-depend distclean-generic \
+ distclean-tags distdir dvi dvi-am info info-am install \
+ install-am install-binPROGRAMS install-data install-data-am \
+ install-exec install-exec-am install-info install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-kr tags \
+ uninstall uninstall-am uninstall-binPROGRAMS
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/contrib/ntp/build b/contrib/ntp/build
index 8caf6413a7e5..22252d325937 100755
--- a/contrib/ntp/build
+++ b/contrib/ntp/build
@@ -1,11 +1,27 @@
#! /bin/sh
LOGF=make.log
-
-CONFIG_ARGS="$@"
-
IAM=`hostname || uname -n`
+case "$1" in
+ 0.*)
+ SIG=$1
+ shift
+ CONFIG_ARGS="$@"
+ KEY=`sed -e q < .buildkey`
+ case "$SIG" in
+ $KEY) ;;
+ *)
+ echo "Wrong directory for build on host $IAM"
+ exit 1
+ ;;
+ esac
+ ;;
+ *)
+ CONFIG_ARGS="$@"
+ ;;
+esac
+
#set -e
#set -x
@@ -28,6 +44,17 @@ case "$IAM" in
;;
esac
+KEYSUF=""
+
+case "$CONFIG_ARGS" in
+ *--with-crypto=autokey*)
+ KEYSUF="-autokey"
+ ;;
+ *--without-crypto*)
+ [ -d rsaref2 ] && KEYSUF="-norsaref"
+ ;;
+esac
+
CCSUF=""
case "$CC" in
@@ -36,7 +63,7 @@ case "$CC" in
;;
esac
-BDIR="$BDIR$CCSUF"
+BDIR="$BDIR$KEYSUF$CCSUF"
[ -d "$BDIR" ] || mkdir $BDIR
[ -f "$BDIR/.buildcvo" ] || echo $CVO > $BDIR/.buildcvo
@@ -47,6 +74,8 @@ cd $BDIR
(
[ -f config.status ] || ../configure $CONFIG_ARGS
+./config.status
+
case "$MAKE" in
'') make && make check
;;
diff --git a/contrib/ntp/clockstuff/Makefile.in b/contrib/ntp/clockstuff/Makefile.in
index 8eea5a99e756..da00d8d3ea18 100644
--- a/contrib/ntp/clockstuff/Makefile.in
+++ b/contrib/ntp/clockstuff/Makefile.in
@@ -1,6 +1,7 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -31,8 +32,6 @@ mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
-DESTDIR =
-
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
@@ -48,7 +47,7 @@ INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
NORMAL_INSTALL = :
@@ -57,24 +56,30 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+
build_alias = @build_alias@
build_triplet = @build@
host_alias = @host_alias@
host_triplet = @host@
target_alias = @target_alias@
target_triplet = @target@
+
+@SET_MAKE@
AMDEP = @AMDEP@
AMTAR = @AMTAR@
+AUTOKEY = @AUTOKEY@
AWK = @AWK@
CC = @CC@
CFLAGS = @CFLAGS@
CHUTEST = @CHUTEST@
CLKTEST = @CLKTEST@
CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
DCFD = @DCFD@
DEPDIR = @DEPDIR@
+EF_LIBS = @EF_LIBS@
+EF_PROGS = @EF_PROGS@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
LDFLAGS = @LDFLAGS@
LIBPARSE = @LIBPARSE@
LIBRSAREF = @LIBRSAREF@
@@ -86,16 +91,27 @@ MAKE_LIBPARSE = @MAKE_LIBPARSE@
MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@
MAKE_LIBRSAREF = @MAKE_LIBRSAREF@
MAKE_NTPTIME = @MAKE_NTPTIME@
+MAKE_NTP_GENKEYS = @MAKE_NTP_GENKEYS@
MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
MAKE_TICKADJ = @MAKE_TICKADJ@
+MAKE_TIMETRIM = @MAKE_TIMETRIM@
+OPENSSL = @OPENSSL@
+OPENSSL_INC = @OPENSSL_INC@
+OPENSSL_LIB = @OPENSSL_LIB@
PACKAGE = @PACKAGE@
+PATH_PERL = @PATH_PERL@
PATH_SH = @PATH_SH@
PROPDELAY = @PROPDELAY@
RANLIB = @RANLIB@
+RSADIR = @RSADIR@
+RSAOBJS = @RSAOBJS@
RSAREF = @RSAREF@
+RSASRCS = @RSASRCS@
+STRIP = @STRIP@
TESTDCF = @TESTDCF@
U = @U@
VERSION = @VERSION@
+_am_include = @_am_include@
install_sh = @install_sh@
#AUTOMAKE_OPTIONS = ../ansi2knr no-dependencies
@@ -111,90 +127,77 @@ propdelay_LDADD = -lm
chutest_LDADD = ../libntp/libntp.a
clktest_LDADD = ../libntp/libntp.a
ETAGS_ARGS = Makefile.am
+EXEEXT =
+OBJEXT = o
subdir = clockstuff
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES =
-PROGRAMS = $(noinst_PROGRAMS)
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+EXTRA_PROGRAMS = propdelay$(EXEEXT) chutest$(EXEEXT) clktest$(EXEEXT)
+noinst_PROGRAMS = @PROPDELAY@ @CHUTEST@ @CLKTEST@
+PROGRAMS = $(noinst_PROGRAMS)
-DEFS = @DEFS@ -I. -I$(srcdir) -I..
+DEFS = @DEFS@ -I. -I$(srcdir) -I$(top_builddir)
CPPFLAGS = @CPPFLAGS@
LIBS = @LIBS@
ANSI2KNR = ../util/ansi2knr
chutest_SOURCES = chutest.c
-chutest_OBJECTS = chutest$U.o
-chutest_DEPENDENCIES = ../libntp/libntp.a
+chutest_OBJECTS = chutest$U.$(OBJEXT)
+chutest_DEPENDENCIES = ../libntp/libntp.a
chutest_LDFLAGS =
clktest_SOURCES = clktest.c
-clktest_OBJECTS = clktest$U.o
-clktest_DEPENDENCIES = ../libntp/libntp.a
+clktest_OBJECTS = clktest$U.$(OBJEXT)
+clktest_DEPENDENCIES = ../libntp/libntp.a
clktest_LDFLAGS =
propdelay_SOURCES = propdelay.c
-propdelay_OBJECTS = propdelay$U.o
-propdelay_DEPENDENCIES =
+propdelay_OBJECTS = propdelay$U.$(OBJEXT)
+propdelay_DEPENDENCIES =
propdelay_LDFLAGS =
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = chutest.c clktest.c propdelay.c
-DIST_COMMON = README Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
+DIST_SOURCES = chutest.c clktest.c propdelay.c
depcomp = $(SHELL) $(top_srcdir)/depcomp
-DEP_FILES = @AMDEP@ $(DEPDIR)/chutest$U.Po $(DEPDIR)/clktest$U.Po \
-$(DEPDIR)/propdelay$U.Po
+@AMDEP@DEP_FILES = $(DEPDIR)/chutest$U.Po $(DEPDIR)/clktest$U.Po \
+@AMDEP@ $(DEPDIR)/propdelay$U.Po
+DIST_COMMON = README Makefile.am Makefile.in
+
SOURCES = chutest.c clktest.c propdelay.c
-OBJECTS = chutest$U.o clktest$U.o propdelay$U.o
+OBJECTS = chutest$U.$(OBJEXT) clktest$U.$(OBJEXT) propdelay$U.$(OBJEXT)
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .c .o
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu clockstuff/Makefile
+all: all-am
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu clockstuff/Makefile
-mostlyclean-noinstPROGRAMS:
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && \
+ CONFIG_HEADERS= CONFIG_LINKS= \
+ CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
clean-noinstPROGRAMS:
-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
-distclean-noinstPROGRAMS:
-
-maintainer-clean-noinstPROGRAMS:
-
mostlyclean-compile:
- -rm -f *.o core *.core
-
-clean-compile:
+ -rm -f *.$(OBJEXT) core *.core
distclean-compile:
-rm -f *.tab.c
-
-maintainer-clean-compile:
-../util/ansi2knr: ../util/ansi2knr.o
+../util/ansi2knr: ../util/ansi2knr.$(OBJEXT)
cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
-../util/ansi2knr.o:
- cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.o
+../util/ansi2knr.$(OBJEXT):
+ cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.$(OBJEXT)
mostlyclean-kr:
-rm -f *_.c
-clean-kr:
-
-distclean-kr:
-
-maintainer-clean-kr:
-
propdelay: $(propdelay_OBJECTS) $(propdelay_DEPENDENCIES)
@rm -f propdelay
$(LINK) $(propdelay_LDFLAGS) $(propdelay_OBJECTS) $(propdelay_LDADD) $(LIBS)
@@ -204,7 +207,8 @@ clktest_.c: clktest.c $(ANSI2KNR)
$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clktest.c; then echo $(srcdir)/clktest.c; else echo clktest.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clktest_.c
propdelay_.c: propdelay.c $(ANSI2KNR)
$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/propdelay.c; then echo $(srcdir)/propdelay.c; else echo propdelay.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > propdelay_.c
-chutest_.o clktest_.o propdelay_.o : $(ANSI2KNR)
+chutest_.$(OBJEXT) clktest_.$(OBJEXT) propdelay_.$(OBJEXT) : \
+$(ANSI2KNR)
tags: TAGS
@@ -215,9 +219,9 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- mkid -f$$here/ID $$unique $(LISP)
+ mkid -fID $$unique $(LISP)
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
@@ -230,75 +234,72 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
|| etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
-mostlyclean-tags:
-
-clean-tags:
+GTAGS:
+ here=`CDPATH=: && cd $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $$here
distclean-tags:
-rm -f TAGS ID
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-distdir: $(DISTFILES)
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
- if test -d $$d/$$file; then \
- cp -pR $$d/$$file $(distdir); \
- else \
- test -f $(distdir)/$$file \
- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- || cp -p $$d/$$file $(distdir)/$$file || :; \
- fi; \
- done
-
-@AMDEP@include $(DEPDIR)/chutest$U.Po
-@AMDEP@include $(DEPDIR)/clktest$U.Po
-@AMDEP@include $(DEPDIR)/propdelay$U.Po
-
-mostlyclean-depend:
-
-clean-depend:
+@AMDEP@@_am_include@ $(DEPDIR)/chutest$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/clktest$U.Po
+@AMDEP@@_am_include@ $(DEPDIR)/propdelay$U.Po
distclean-depend:
-rm -rf $(DEPDIR)
-maintainer-clean-depend:
-
@AMDEP@CCDEPMODE = @CCDEPMODE@
.c.o:
@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c -o $@ $<
+ $(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
+.c.obj:
+@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(COMPILE) -c -o $@ `cygpath -w $<`
+
+
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+ cp -pR $$d/$$file $(distdir) \
+ || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
check-am: all-am
check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(PROGRAMS)
-install-data-am:
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
install-data: install-data-am
+uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(PROGRAMS)
-all-redirect: all-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-installdirs:
+installcheck: installcheck-am
+
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
mostlyclean-generic:
@@ -309,45 +310,53 @@ distclean-generic:
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
-rm -f Makefile.in
-mostlyclean-am: mostlyclean-noinstPROGRAMS mostlyclean-compile \
- mostlyclean-kr mostlyclean-tags mostlyclean-depend \
- mostlyclean-generic
+clean: clean-am
-mostlyclean: mostlyclean-am
+clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am
-clean-am: clean-noinstPROGRAMS clean-compile clean-kr clean-tags \
- clean-depend clean-generic mostlyclean-am
+distclean: distclean-am
-clean: clean-am
+distclean-am: clean-am distclean-compile distclean-depend \
+ distclean-generic distclean-tags
-distclean-am: distclean-noinstPROGRAMS distclean-compile distclean-kr \
- distclean-tags distclean-depend distclean-generic \
- clean-am
+dvi:
-distclean: distclean-am
+dvi-am:
-maintainer-clean-am: maintainer-clean-noinstPROGRAMS \
- maintainer-clean-compile maintainer-clean-kr \
- maintainer-clean-tags maintainer-clean-depend \
- maintainer-clean-generic distclean-am
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
+info:
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info:
+
+install-man:
+
+installcheck-am:
maintainer-clean: maintainer-clean-am
-.PHONY: mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
-clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-kr distclean-kr clean-kr \
-maintainer-clean-kr tags mostlyclean-tags distclean-tags clean-tags \
-maintainer-clean-tags distdir mostlyclean-depend distclean-depend \
-clean-depend maintainer-clean-depend info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-kr
+
+.PHONY: all all-am check check-am clean clean-generic \
+ clean-noinstPROGRAMS distclean distclean-compile \
+ distclean-depend distclean-generic distclean-tags distdir dvi \
+ dvi-am info info-am install install-am install-data \
+ install-data-am install-exec install-exec-am install-info \
+ install-man install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-kr tags uninstall uninstall-am
#EXTRA_DIST = TAGS
diff --git a/contrib/ntp/conf/baldwin.conf b/contrib/ntp/conf/baldwin.conf
index 0781825f990d..0998a9f0f45e 100644
--- a/contrib/ntp/conf/baldwin.conf
+++ b/contrib/ntp/conf/baldwin.conf
@@ -6,18 +6,17 @@
# driver, as well as a multicast server. The prefer keyword on the
# local clock driver declares an external clock and that the time of
# this server should not be wiggled by an NTP peer, unless the
-# external clock comes unstuck. Note the use of the multicast group
+# external source comes unstuck. Note the use of the multicast group
# ID assigned to NTP, 224.0.1.1, which identifies this as a multicast
# server rather than a broadcast one. The other NTP peers are known
# stratum-1 chimes intended as backup should the external clock croak.
#
-peer 127.127.1.0 prefer # local clock driver
-fudge 127.127.12.0 stratum 0 refid GPS
+server 127.127.1.0 prefer # local clock driver
broadcast 224.0.1.1 key 6 ttl 127
-peer rackety.udel.edu # (Sun4c/40 IPC)
-peer barnstable.udel.edu # (Sun4c/65 SS1+)
-peer mizbeaver.udel.edu #(Bancomm bc700LAN)
-peer pogo.udel.edu # (Sun4c/65 SS1+)
+peer rackety.udel.edu
+peer barnstable.udel.edu
+peer mizbeaver.udel.edu
+peer pogo.udel.edu
#
# Miscellaneous stuff
#
diff --git a/contrib/ntp/conf/grundoon.conf b/contrib/ntp/conf/grundoon.conf
index 44629230e6ac..a26522dd62f8 100644
--- a/contrib/ntp/conf/grundoon.conf
+++ b/contrib/ntp/conf/grundoon.conf
@@ -2,153 +2,35 @@
# NTP configuration file (ntp.conf)
# grundoon.udel.edu
#
-# This machine can best be described as the kitchen sink. It has, in
-# addition to the baseboard tty ports ttya and ttyb, an 8-line
-# Serial/Parallel Interface (SPIF) with ports ttyz00 through ttyz07. The
-# configuration includes the following drivers, clock addresses and Unix
-# device names.
-#
-# Local Clock 127.127.1.0 /dev/audio
-# PST 1020 WWV/WWVH Receiver 127.127.3.1 /dev/pst1
-# Spectracom 8170 WWVB Receiver 127.127.4.1 /dev/wwvb1
-# IRIG Audio Decoder 127.127.6.0 /dev/audio
-# Scratchbuilt CHU Receiver 127.127.7.1 /dev/chu1
-# NIST ACTS modem 127.127.18.1 /dev/acts1
-# Heath GC-1000 WWV Receiver 127.127.19.1 /dev/pst1
-# PPS Clock 127.127.22.1 none
-#
-# This machine has the kernel modifications described in the README.kern
-# file, as well as the tty_clk, tty_chu and ppsclock streams modules.
-#
-# Spectracom 8170/Netclock-2 WWVB receiver. This receiver is equipped
-# with a 1-pps and IRIG outputs. The 1-pps signal is connected via the
-# ppsclock streams module and the carrier detect line of the CHU
-# receiver below (ttyb). The IRIG signal is connected via an attenuator
-# to the audio port (/dev/audio). The propagation delay computed from
-# geographical coordinates is 8.8 ms, while the receiver delay
-# calibrated at the factory is 17.3 ms, for a total delay of 26.1 ms.
-# This is confirmed within 0.1 ms at the 1-pps signal output using a
-# portable cesium clock. We add a fudge time1 of 3.5 ms so the driver
-# time agrees with the 1-pps signal to within 1 ms. The fudge flag4 is
-# set to cause the receiver to dump the quality table once each day to
-# the clockstats file.
-
-#
-#server 127.127.4.1 # /dev/wwvb1 -> /dev/ttyz03
-#fudge 127.127.4.1 time1 0.0035 flag4 1
-#
-# IRIG Audio Decoder. The IRGI signal of the Spectracom WWVB receiver is
-# connected to the audio codec via a resistor attenuator. We add a fudge
-# time1 of 3.5 ms so the driver agrees with the calibrated 1-pps signal
-# to within 0.1 ms. We also specify a reference ID of WWVB to indicate
-# the signal origin. Note the prefer keyword in the server line, which
-# favors this driver over all others that survive the clock selection
-# algorithm. See README.refclock for further insight on this feature.
-#
-server 127.127.6.0 prefer # /dev/audio
-fudge 127.127.6.0 time1 0.0005 refid WWVB
+server 127.127.11.1 prefer # Arbiter 1088 GPS receiver
+fudge 127.127.11.1 time1 .00487 flag1 1 flag4 1
+server 127.127.22.1 minpoll 4 # PPS quick poll
+fudge 127.127.22.1 # use PLL/FLL loop
-#
-# PST/Traconex 1020 WWV/WWVH Receier. The internal DIPswitches are set
-# as near as possible to the delays to WWV (8.8 ms) and WWVH (28.1 ms),
-# as computed from geographical coordinates. We add a fudge time1 of 5.9
-# ms so the driver time agrees with the 1-pps signal to within 1 ms for
-# WWV. We also set the stratum to 1, so this receiver will not normally
-# be selected, unless the primary WWVB receiver comes unstuck.
-#
-server 127.127.3.1 # /dev/pst1 -> ttyz05
-fudge 127.127.3.1 time1 0.0059 stratum 1
+broadcast 128.4.2.255 key 5 # brpadcast on LAN shared key
+broadcast 239.1.1.2 autokey # multicast on WAN autokey
+manycastclient 239.1.1.1 autokey maxpoll 12 ttl 7
+manycastserver 239.1.1.1
#
-# Scratchbuilt CHU Receiver. The audio signal from a computer controlled
-# CHU receiver is connected to a gadget box, which contains a 103A modem
-# chip and level converter operating at 300 bps. The propagation delay
-# computed from geographical coordinates is 3.0 ms, which is the value
-# of the fudge time1 parameter. We add a fudge time2 of 9.9 ms so that
-# the driver time agrees with the 1-pps signal to within a few ms,
-# ordinarily the best possible with this receiver. The fudge flag3 is
-# set because the 1-pps signal happens to be connected vit the carrier
-# detect line on this port (ttyb). We also set the stratum to 1, so this
-# receiver will not normally be selected, unless the primary WWVB
-# receiver comes unstuck.
-#
-server 127.127.7.1 # /dev/chu1 -> /dev/ttyb
-fudge 127.127.7.1 time1 0.0030 time2 0.0099 flag3 1 stratum 1
-
-#
-# NIST Automated Computer Time Service. This driver calls a special
-# telephone number in Boulder, CO, to fetch the time directly from the
-# NIST cesium farm. The details of the complicated calling program are
-# in the README.refclock file. The Practical Peripherals 9600SA modem
-# does not work correctly with the ACTS echo-delay scheme for
-# automatically calculating the propagation delay, so the fudge flag2 is
-# set to disable the feature. Instead, we add a fudge time1 of 65.0 ms
-# so that the driver time agrees with th e1-pps signal to within 1 ms.
-# The phone command specifies three alternate telephone numbers,
-# including AT modem command prefix, which will be tried one after the
-# other at each measurement attempt. In this case, a cron job is used to
-# set fudge flag1, causing a measurement attempt, every six hours.
-#
-server 127.127.18.1 # /dev/acts1 -> /dev/ttyz00
-fudge 127.127.18.1 time1 0.0650 flag2 1
-phone atdt13034944774 atdt13034944785 atdt13034944774
-
+# Access control stuff
#
-# Heath GC-1000 Most Accurate Clock. This is a WWV receiver with a
-# claimed accuracy better than 100 ms under "hi spec" conditions, but
-# such conditions are not frequent. The propagation delay DIPswitchs are
-# set to 9 ms, as close as possible to the 8.8 ms computed from
-# geographical coordinates. We add a fudge time2 of 40.0 ms so that the
-# driver time agrees with the 1-pps signal to within 50 ms, ordinarily
-# the best possible with this receiver. We also set the stratum to 1, so
-# this receiver will not normally be selected, unless the primary WWVB
-# receiver comes unstuck.
+restrict default noserve # default deny
+restrict 127.0.0.1 # allow local host
+restrict 128.4.0.0 mask 255.255.0.0 # allow DCnet clients
+restrict 128.175.0.0 mask 255.255.0.0 # allow UDel clients
+restrict 140.173.0.0 mask 255.255.0.0 # allow DARTnet/CAIRN clients
#
-server 127.127.19.1 # /dev/heath1 -> ttyz07
-fudge 127.127.19.1 time1 0.040 stratum 1
-
-#
-# Undisciplined Local Clock. This is a fake driver intended for backup
-# and when no outside source of synchronized time is available. The
-# default stratum is usually 3, but in this case we elect to use stratum
-# 0. Since the server line does not have the prefer keyword, this driver
-# is never used for synchronization, unless no other other
-# synchronization source is available. In case the local host is
-# controlled by some external source, such as an external oscillator or
-# another protocol, the prefer keyword would cause the local host to
-# disregard all other synchronization sources, unless the kernel
-# modifications are in use and declare an unsynchronized condition.
-#
-server 127.127.1.0 # local clock
-fudge 127.127.1.0 stratum 0
-
-#
-# PPS Clock. This driver is used to capture a 1-pps signal when the PPS
-# kernel modifications are not in use. It can be configured for the
-# tty_clk or ppsclock streams module or no module at all, assuming the
-# RS232 connector is properly wired. Normally, the 1-pps signal is
-# generated by a radio clock, in this cast the Spectracom clock
-# 127.127.4.1 also configured for this host. When used this way, the
-# associated radio clock normally has the prefer keyword in the serve
-# command line. The PPS driver then will be selected only if the prefer
-# peer is operating within nominal error bounds. See the README.refclock
-# file for further details.
+# Authentication stuff
#
-#server 127.127.22.1 # pps clock
-
+crypto # enable public key
+keys /usr/local/etc/ntp.keys # path for keys file
+trustedkey 3 4 5 14 # define trusted keys
+requestkey 14 # key (7) for accessing server variables
+controlkey 14 # key (6) for accessing server variables
#
-# Miscellaneous stuff. We enable authentication in order to prevent
+# Miscellaneous stuff
#
driftfile /etc/ntp.drift # path for drift file
-statsdir /grundoon/ntpstats/ # directory for statistics files
-filegen peerstats file peerstats type day enable
+statsdir /var/spool/ntpstats/ # directory for statistics files
filegen loopstats file loopstats type day enable
-filegen clockstats file clockstats type day enable
-
-#
-# Authentication stuff
-#
-keys /usr/local/etc/ntp.keys # path for keys file
-trustedkey 1 2 3 4 5 6 14 15 # define trusted keys
-requestkey 15 # key (7) for accessing server variables
-controlkey 15 # key (6) for accessing server variables
diff --git a/contrib/ntp/conf/pogo.conf b/contrib/ntp/conf/pogo.conf
index e97d4c5c7bfd..2014fdd4d8de 100644
--- a/contrib/ntp/conf/pogo.conf
+++ b/contrib/ntp/conf/pogo.conf
@@ -1,30 +1,55 @@
#
# NTP configuration file (ntp.conf)
-# pogo.udel.edu
-#
-server 127.127.10.1 prefer # austron 2201A gps receiver
-peer 128.4.1.1 # rackety.udel.edu (Sun4c/40 IPC)
-peer 128.4.1.2 # mizbeaver.udel.edu (Bancomm bc700LAN)
-peer 128.4.1.4 # barnstable.udel.edu (Sun4c/65 SS1+)
-peer 128.4.1.5 maxpoll 8 # churchy.udel.edu (cisco IGS router)
-peer 132.163.135.130 maxpoll 8 # time_A.timefreq.bldrdoc.gov (Cesium)
-peer 131.188.1.40 maxpoll 8 # ntps1-0.uni-erlangen.de (DCF77)
-peer 129.132.2.21 maxpoll 8 # swisstime.ethz.ch (DCF77)
-peer 130.155.98.13 maxpoll 8 # terss.ml.csiro.au (Cesium)
-peer 192.36.143.150 maxpoll 8 # Time1.Stupi.SE (Cesium)
+# SunOS pogo.udel.edu 5.8 Generic sun4u sparc SUNW,Ultra-1
#
-# Miscellaneous stuff
+server 127.127.6.1 prefer # IRIG from GPS1
+fudge 127.127.6.1 refid GPS1 time1 -.002777 flag2 1
+server 127.127.4.1 # spectracom GPS receiver
+# delays: prop 0.0088 ant .0002 rcvr .0173 = 26.3 ms; os .0035
+fudge 127.127.4.1 refid GPS2 time1 .000221
+server 127.127.22.0 # PPS from GPS2
+fudge 127.127.22.0 flag3 1 # kernel PPS
#
-precision -18 # clock reading precision (usec)
-driftfile /etc/ntp.drift # path for drift file
-statsdir /pogo/ntpstats/ # directory for statistics files
-filegen peerstats file peerstats type day enable
-filegen loopstats file loopstats type day enable
-filegen clockstats file clockstats type day enable
+# Backups
+#
+server 128.4.1.2 # mizbeaver
+server 128.175.60.175 version 3 # ntp1.nss
+#
+# Services
+#
+manycastclient 239.1.1.1 autokey maxpoll 12 ttl 7
+manycastserver 239.1.1.1
+#
+# Access control stuff
+#
+restrict default noserve # default deny
+restrict 127.0.0.1 # allow local host
+restrict 128.4.0.0 mask 255.255.0.0 # allow DCnet clients
+restrict 128.175.0.0 mask 255.255.0.0 # allow UDel clients
+restrict 140.173.0.0 mask 255.255.0.0 # allow DARTnet/CAIRN clients
#
# Authentication stuff
#
+# Local filesystem
+# /etc/ntpkey -> ntpkey.3171396491
+# /etc/ntpkey.3171396491
+#
+# NFS mounted filesystem
+# /usr/local/etc/ntpkey -> /etc/ntpkey
+# /usr/local/etc/ntpkey_dh -> ntpkey_dh.3171396491
+# /usr/local/etc/ntpkey_dh.3171396491
+# /usr/local/etc/ntpkey_pogo.udel.edu -> ntpkey_pogo.udel.edu.3171396491
+# /usr/local/etc/ntpkey_pogo.udel.edu.3171396491
+#
+crypto privatekey /etc/ntpkey # enable public key
keys /usr/local/etc/ntp.keys # path for keys file
-trustedkey 3 4 5 6 14 # define trusted keys
-requestkey 15 # key (7) for accessing server variables
-controlkey 15 # key (6) for accessing server variables
+trustedkey 3 4 5 14 # define trusted keys
+requestkey 14 # key (7) for accessing server variables
+controlkey 14 # key (6) for accessing server variables
+#
+# Miscellaneous stuff
+#
+driftfile /etc/ntp.drift # path for drift file
+statsdir /var/spool/ntpstats/ # directory for statistics files
+filegen loopstats file loopstats type day enable
+
diff --git a/contrib/ntp/conf/rackety.conf b/contrib/ntp/conf/rackety.conf
new file mode 100644
index 000000000000..d3f231ccf64f
--- /dev/null
+++ b/contrib/ntp/conf/rackety.conf
@@ -0,0 +1,48 @@
+#
+# NTP configuration file (ntp.conf)
+# SunOS rackety.u 4.1.3 243 sun4c
+#
+server 127.127.4.0 prefer # Spectracom GPS receiver #1
+fudge 127.127.4.0 refid GPS1 time1 -.000097 flag1 1
+server 127.127.4.1 # Spectracom GPS receiver #2
+fudge 127.127.4.1 refid GPS2 time1 -.000097 flag1 1
+server 127.127.4.2 # Spectracom WWVB receiver #1
+# delays: prop 0.0088 ant .0002 rcvr .0173 = 26.3 ms; os .0035
+fudge 127.127.4.2 refid WVB1 time1 .0021 flag4 1 flag1 1
+server 127.127.4.3 # Spectracom WWVB receiver #2
+# delays: prop 0.0088 ant .0002 rcvr .0173 = 26.3 ms; os .0035
+fudge 127.127.4.3 refid WVB2 time1 .0021 flag4 1 flag1 1
+server 127.127.22.1 # PPS
+fudge 127.127.22.1 flag3 1 # kernel PPS
+#
+# Services
+#
+broadcast 224.0.1.1 autokey # multicast
+broadcast 128.4.1.255 autokey # local subnet broadcast
+manycastclient 239.1.1.1 autokey maxpoll 12 ttl 7 # manycast
+manycastserver 239.1.1.1 # manycast
+#
+# Access controls
+#
+restrict default limited # default limit clients per net
+restrict 127.0.0.1 # allow local host
+restrict 128.4.0.0 mask 255.255.0.0 # allow DCnet clients
+restrict 128.175.0.0 mask 255.255.0.0 # allow UDELnet clients
+restrict 140.173.0.0 mask 255.255.0.0 # allow DARTnet/CAIRN clients
+#
+# Authentication stuff
+#
+crypto # enable public key
+keys /usr/local/etc/ntp.keys # symmetric keys file
+trustedkey 3 4 5 14 # define trusted keys
+requestkey 14 # key (7) for accessing server variables
+controlkey 14 # key (6) for accessing server variables
+#
+# Miscellaneous stuff
+#
+driftfile /etc/ntp.drift # frequency offset
+statsdir /rackety/ntpstats/ # directory for statistics files
+filegen peerstats file peerstats type day enable
+filegen loopstats file loopstats type day enable
+filegen clockstats file clockstats type day enable
+
diff --git a/contrib/ntp/config.guess b/contrib/ntp/config.guess
index a28a21411e2d..c339a949429e 100755
--- a/contrib/ntp/config.guess
+++ b/contrib/ntp/config.guess
@@ -1,8 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
-#
+
+timestamp='2001-06-29'
+
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
@@ -23,51 +25,153 @@
# the same distribution terms that you use for the rest of that program.
# Written by Per Bothner <bothner@cygnus.com>.
-# The master version of this file is at the FSF in /home/gd/gnu/lib.
-# Please send patches to the Autoconf mailing list <autoconf@gnu.org>.
+# Please send patches to <config-patches@gnu.org>.
#
# This script attempts to guess a canonical system name similar to
# config.sub. If it succeeds, it prints the system name on stdout, and
# exits with 0. Otherwise, it exits with 1.
#
# The plan is that this can be called by configure scripts if you
-# don't specify an explicit system type (host/target name).
-#
-# Only a few systems have been added to this list; please add others
-# (but try to keep the structure clean).
-#
+# don't specify an explicit build system type.
-# Use $HOST_CC if defined. $CC may point to a cross-compiler
-if test x"$CC_FOR_BUILD" = x; then
- if test x"$HOST_CC" != x; then
- CC_FOR_BUILD="$HOST_CC"
- else
- if test x"$CC" != x; then
- CC_FOR_BUILD="$CC"
- else
- CC_FOR_BUILD=cc
- fi
- fi
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+ -h, --help print this help, then exit
+ -t, --time-stamp print date of last modification, then exit
+ -v, --version print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+ case $1 in
+ --time-stamp | --time* | -t )
+ echo "$timestamp" ; exit 0 ;;
+ --version | -v )
+ echo "$version" ; exit 0 ;;
+ --help | --h* | -h )
+ echo "$usage"; exit 0 ;;
+ -- ) # Stop option processing
+ shift; break ;;
+ - ) # Use stdin as input.
+ break ;;
+ -* )
+ echo "$me: invalid option $1$help" >&2
+ exit 1 ;;
+ * )
+ break ;;
+ esac
+done
+
+if test $# != 0; then
+ echo "$me: too many arguments$help" >&2
+ exit 1
fi
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script.
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,) echo "int dummy(){}" > $dummy.c ;
+ for c in cc gcc c89 ; do
+ ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
+ if test $? = 0 ; then
+ CC_FOR_BUILD="$c"; break ;
+ fi ;
+ done ;
+ rm -f $dummy.c $dummy.o $dummy.rel ;
+ if test x"$CC_FOR_BUILD" = x ; then
+ CC_FOR_BUILD=no_compiler_found ;
+ fi
+ ;;
+ ,,*) CC_FOR_BUILD=$CC ;;
+ ,*,*) CC_FOR_BUILD=$HOST_CC ;;
+esac'
+
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 8/24/94.)
+# (ghazi@noc.rutgers.edu 1994-08-24)
if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
PATH=$PATH:/.attbin ; export PATH
fi
UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
-
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ *:NetBSD:*:*)
+ # Netbsd (nbsd) targets should (where applicable) match one or
+ # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
+ # switched to ELF, *-*-netbsd* would select the old
+ # object file format. This provides both forward
+ # compatibility and a consistent mechanism for selecting the
+ # object file format.
+ # Determine the machine/vendor (is the vendor relevant).
+ case "${UNAME_MACHINE}" in
+ amiga) machine=m68k-unknown ;;
+ arm32) machine=arm-unknown ;;
+ atari*) machine=m68k-atari ;;
+ sun3*) machine=m68k-sun ;;
+ mac68k) machine=m68k-apple ;;
+ macppc) machine=powerpc-apple ;;
+ hp3[0-9][05]) machine=m68k-hp ;;
+ ibmrt|romp-ibm) machine=romp-ibm ;;
+ *) machine=${UNAME_MACHINE}-unknown ;;
+ esac
+ # The Operating System including object format, if it has switched
+ # to ELF recently, or will in the future.
+ case "${UNAME_MACHINE}" in
+ i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
+ eval $set_cc_for_build
+ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep __ELF__ >/dev/null
+ then
+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ # Return netbsd for either. FIX?
+ os=netbsd
+ else
+ os=netbsdelf
+ fi
+ ;;
+ *)
+ os=netbsd
+ ;;
+ esac
+ # The OS release
+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+ # contains redundant information, the shorter form:
+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ echo "${machine}-${os}${release}"
+ exit 0 ;;
alpha:OSF1:*:*)
if test $UNAME_RELEASE = "V4.0"; then
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -77,41 +181,52 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
cat <<EOF >$dummy.s
+ .data
+\$Lformat:
+ .byte 37,100,45,37,120,10,0 # "%d-%x\n"
+
+ .text
.globl main
+ .align 4
.ent main
main:
- .frame \$30,0,\$26,0
- .prologue 0
- .long 0x47e03d80 # implver $0
- lda \$2,259
- .long 0x47e20c21 # amask $2,$1
- srl \$1,8,\$2
- sll \$2,2,\$2
- sll \$0,3,\$0
- addl \$1,\$0,\$0
- addl \$2,\$0,\$0
- ret \$31,(\$26),1
+ .frame \$30,16,\$26,0
+ ldgp \$29,0(\$27)
+ .prologue 1
+ .long 0x47e03d80 # implver \$0
+ lda \$2,-1
+ .long 0x47e20c21 # amask \$2,\$1
+ lda \$16,\$Lformat
+ mov \$0,\$17
+ not \$1,\$18
+ jsr \$26,printf
+ ldgp \$29,0(\$26)
+ mov 0,\$16
+ jsr \$26,exit
.end main
EOF
+ eval $set_cc_for_build
$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
if test "$?" = 0 ; then
- ./$dummy
- case "$?" in
- 7)
+ case `./$dummy` in
+ 0-0)
UNAME_MACHINE="alpha"
;;
- 15)
+ 1-0)
UNAME_MACHINE="alphaev5"
;;
- 14)
+ 1-1)
UNAME_MACHINE="alphaev56"
;;
- 10)
+ 1-101)
UNAME_MACHINE="alphapca56"
;;
- 16)
+ 2-303)
UNAME_MACHINE="alphaev6"
;;
+ 2-307)
+ UNAME_MACHINE="alphaev67"
+ ;;
esac
fi
rm -f $dummy.s $dummy
@@ -127,11 +242,8 @@ EOF
echo alpha-dec-winnt3.5
exit 0 ;;
Amiga*:UNIX_System_V:4.0:*)
- echo m68k-cbm-sysv4
+ echo m68k-unknown-sysv4
exit 0;;
- amiga:NetBSD:*:*)
- echo m68k-cbm-netbsd${UNAME_RELEASE}
- exit 0 ;;
amiga:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
@@ -156,13 +268,13 @@ EOF
wgrisc:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
+ *:OS/390:*:*)
+ echo i370-ibm-openedition
+ exit 0 ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
exit 0;;
- arm32:NetBSD:*:*)
- echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
- exit 0 ;;
- SR2?01:HI-UX/MPP:*:*)
+ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
exit 0;;
Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
@@ -218,15 +330,12 @@ EOF
aushp:SunOS:*:*)
echo sparc-auspex-sunos${UNAME_RELEASE}
exit 0 ;;
- atari*:NetBSD:*:*)
- echo m68k-atari-netbsd${UNAME_RELEASE}
- exit 0 ;;
atari*:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
- # "atarist" or "atariste" at least should have a processor
+ # "atarist" or "atariste" at least should have a processor
# > m68000). The system name ranges from "MiNT" over "FreeMiNT"
# to the lowercase version "mint" (or "freemint"). Finally
# the system name "TOS" denotes a system which is actually not
@@ -250,15 +359,9 @@ EOF
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
echo m68k-unknown-mint${UNAME_RELEASE}
exit 0 ;;
- sun3*:NetBSD:*:*)
- echo m68k-sun-netbsd${UNAME_RELEASE}
- exit 0 ;;
sun3*:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
- mac68k:NetBSD:*:*)
- echo m68k-apple-netbsd${UNAME_RELEASE}
- exit 0 ;;
mac68k:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
@@ -271,9 +374,6 @@ EOF
powerpc:machten:*:*)
echo powerpc-apple-machten${UNAME_RELEASE}
exit 0 ;;
- macppc:NetBSD:*:*)
- echo powerpc-apple-netbsd${UNAME_RELEASE}
- exit 0 ;;
RISC*:Mach:*:*)
echo mips-dec-mach_bsd4.3
exit 0 ;;
@@ -289,6 +389,7 @@ EOF
mips:*:*:UMIPS | mips:*:*:RISCos)
sed 's/^ //' << EOF >$dummy.c
#ifdef __cplusplus
+#include <stdio.h> /* for printf() prototype */
int main (int argc, char *argv[]) {
#else
int main (argc, argv) int argc; char *argv[]; {
@@ -307,12 +408,16 @@ EOF
exit (-1);
}
EOF
+ eval $set_cc_for_build
$CC_FOR_BUILD $dummy.c -o $dummy \
&& ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
- && rm $dummy.c $dummy && exit 0
+ && rm -f $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
echo mips-mips-riscos${UNAME_RELEASE}
exit 0 ;;
+ Motorola:PowerMAX_OS:*:*)
+ echo powerpc-motorola-powermax
+ exit 0 ;;
Night_Hawk:Power_UNIX:*:*)
echo powerpc-harris-powerunix
exit 0 ;;
@@ -328,15 +433,18 @@ EOF
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
- if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
- -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
+ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ then
+ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+ [ ${TARGET_BINARY_INTERFACE}x = x ]
+ then
echo m88k-dg-dgux${UNAME_RELEASE}
- else
+ else
echo m88k-dg-dguxbcs${UNAME_RELEASE}
+ fi
+ else
+ echo i586-dg-dgux${UNAME_RELEASE}
fi
- else echo i586-dg-dgux${UNAME_RELEASE}
- fi
exit 0 ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
@@ -357,9 +465,17 @@ EOF
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
- i?86:AIX:*:*)
+ i*86:AIX:*:*)
echo i386-ibm-aix
exit 0 ;;
+ ia64:AIX:*:*)
+ if [ -x /usr/bin/oslevel ] ; then
+ IBM_REV=`/usr/bin/oslevel`
+ else
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
+ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+ exit 0 ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
sed 's/^ //' << EOF >$dummy.c
@@ -373,7 +489,8 @@ EOF
exit(0);
}
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+ eval $set_cc_for_build
+ $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
echo rs6000-ibm-aix3.2.5
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
@@ -382,9 +499,9 @@ EOF
echo rs6000-ibm-aix3.2
fi
exit 0 ;;
- *:AIX:*:4)
+ *:AIX:*:[45])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
- if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
else
IBM_ARCH=powerpc
@@ -392,7 +509,7 @@ EOF
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
else
- IBM_REV=4.${UNAME_RELEASE}
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${IBM_ARCH}-ibm-aix${IBM_REV}
exit 0 ;;
@@ -402,7 +519,7 @@ EOF
ibmrt:4.4BSD:*|romp-ibm:BSD:*)
echo romp-ibm-bsd4.4
exit 0 ;;
- ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and
+ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
exit 0 ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
@@ -418,11 +535,31 @@ EOF
echo m68k-hp-bsd4.4
exit 0 ;;
9000/[34678]??:HP-UX:*:*)
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
case "${UNAME_MACHINE}" in
9000/31? ) HP_ARCH=m68000 ;;
9000/[34]?? ) HP_ARCH=m68k ;;
9000/[678][0-9][0-9])
+ case "${HPUX_REV}" in
+ 11.[0-9][0-9])
+ if [ -x /usr/bin/getconf ]; then
+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+ case "${sc_cpu_version}" in
+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+ 532) # CPU_PA_RISC2_0
+ case "${sc_kernel_bits}" in
+ 32) HP_ARCH="hppa2.0n" ;;
+ 64) HP_ARCH="hppa2.0w" ;;
+ esac ;;
+ esac
+ fi ;;
+ esac
+ if [ "${HP_ARCH}" = "" ]; then
sed 's/^ //' << EOF >$dummy.c
+
+ #define _HPUX_SOURCE
#include <stdlib.h>
#include <unistd.h>
@@ -453,12 +590,18 @@ EOF
exit (0);
}
EOF
- ($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+ eval $set_cc_for_build
+ (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+ if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
rm -f $dummy.c $dummy
+ fi ;;
esac
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
exit 0 ;;
+ ia64:HP-UX:*:*)
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ echo ia64-hp-hpux${HPUX_REV}
+ exit 0 ;;
3050*:HI-UX:*:*)
sed 's/^ //' << EOF >$dummy.c
#include <unistd.h>
@@ -485,7 +628,8 @@ EOF
exit (0);
}
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+ eval $set_cc_for_build
+ $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
echo unknown-hitachi-hiuxwe2
exit 0 ;;
@@ -504,7 +648,7 @@ EOF
hp8??:OSF1:*:*)
echo hppa1.0-hp-osf
exit 0 ;;
- i?86:OSF1:*:*)
+ i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
echo ${UNAME_MACHINE}-unknown-osf1mk
else
@@ -547,29 +691,30 @@ EOF
-e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
exit 0 ;;
CRAY*TS:*:*:*)
- echo t90-cray-unicos${UNAME_RELEASE}
+ echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
+ CRAY*T3D:*:*:*)
+ echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
CRAY*T3E:*:*:*)
- echo alpha-cray-unicosmk${UNAME_RELEASE}
+ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
+ CRAY*SV1:*:*:*)
+ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
CRAY-2:*:*:*)
echo cray2-cray-unicos
exit 0 ;;
- F300:UNIX_System_V:*:*)
+ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
- echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit 0 ;;
- F301:UNIX_System_V:*:*)
- echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
- exit 0 ;;
- hp3[0-9][05]:NetBSD:*:*)
- echo m68k-hp-netbsd${UNAME_RELEASE}
- exit 0 ;;
hp300:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
- i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
exit 0 ;;
sparc*:BSD/OS:*:*)
@@ -579,17 +724,8 @@ EOF
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit 0 ;;
*:FreeBSD:*:*)
- if test -x /usr/bin/objformat; then
- if test "elf" = "`/usr/bin/objformat`"; then
- echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
- exit 0
- fi
- fi
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit 0 ;;
- *:NetBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
- exit 0 ;;
*:OpenBSD:*:*)
echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
exit 0 ;;
@@ -599,6 +735,9 @@ EOF
i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit 0 ;;
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit 0 ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -617,150 +756,95 @@ EOF
*:GNU:*:*)
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit 0 ;;
- *:Linux:*:*)
- # uname on the ARM produces all sorts of strangeness, and we need to
- # filter it out.
- case "$UNAME_MACHINE" in
- armv*) UNAME_MACHINE=$UNAME_MACHINE ;;
- arm* | sa110*) UNAME_MACHINE="arm" ;;
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+ exit 0 ;;
+ arm*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ ia64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux
+ exit 0 ;;
+ m68*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ mips:Linux:*:*)
+ case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
+ big) echo mips-unknown-linux-gnu && exit 0 ;;
+ little) echo mipsel-unknown-linux-gnu && exit 0 ;;
esac
-
+ ;;
+ ppc:Linux:*:*)
+ echo powerpc-unknown-linux-gnu
+ exit 0 ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ EV5) UNAME_MACHINE=alphaev5 ;;
+ EV56) UNAME_MACHINE=alphaev56 ;;
+ PCA56) UNAME_MACHINE=alphapca56 ;;
+ PCA57) UNAME_MACHINE=alphapca56 ;;
+ EV6) UNAME_MACHINE=alphaev6 ;;
+ EV67) UNAME_MACHINE=alphaev67 ;;
+ EV68*) UNAME_MACHINE=alphaev67 ;;
+ esac
+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ exit 0 ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ *) echo hppa-unknown-linux-gnu ;;
+ esac
+ exit 0 ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+ echo hppa64-unknown-linux-gnu
+ exit 0 ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
+ exit 0 ;;
+ sh*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ sparc:Linux:*:* | sparc64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ x86_64:Linux:*:*)
+ echo x86_64-unknown-linux-gnu
+ exit 0 ;;
+ i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
# problems with other programs or directories called `ld' in the path.
- ld_help_string=`cd /; ld --help 2>&1`
- ld_supported_emulations=`echo $ld_help_string \
- | sed -ne '/supported emulations:/!d
+ ld_supported_targets=`cd /; ld --help 2>&1 \
+ | sed -ne '/supported targets:/!d
s/[ ][ ]*/ /g
- s/.*supported emulations: *//
+ s/.*supported targets: *//
s/ .*//
p'`
- case "$ld_supported_emulations" in
- *ia64) echo "${UNAME_MACHINE}-unknown-linux" ; exit 0 ;;
- i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;;
- i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;;
- sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
- armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
- m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
- elf32ppc | elf32ppclinux)
- # Determine Lib Version
- cat >$dummy.c <<EOF
-#include <features.h>
-#if defined(__GLIBC__)
-extern char __libc_version[];
-extern char __libc_release[];
-#endif
-main(argc, argv)
- int argc;
- char *argv[];
-{
-#if defined(__GLIBC__)
- printf("%s %s\n", __libc_version, __libc_release);
-#else
- printf("unkown\n");
-#endif
- return 0;
-}
-EOF
- LIBC=""
- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
- if test "$?" = 0 ; then
- ./$dummy | grep 1\.99 > /dev/null
- if test "$?" = 0 ; then
- LIBC="libc1"
- fi
- fi
- rm -f $dummy.c $dummy
- echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;;
+ case "$ld_supported_targets" in
+ elf32-i386)
+ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+ ;;
+ a.out-i386-linux)
+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+ exit 0 ;;
+ coff-i386)
+ echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+ exit 0 ;;
+ "")
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
+ # one that does not give us useful --help.
+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+ exit 0 ;;
esac
-
- if test "${UNAME_MACHINE}" = "alpha" ; then
- sed 's/^ //' <<EOF >$dummy.s
- .globl main
- .ent main
- main:
- .frame \$30,0,\$26,0
- .prologue 0
- .long 0x47e03d80 # implver $0
- lda \$2,259
- .long 0x47e20c21 # amask $2,$1
- srl \$1,8,\$2
- sll \$2,2,\$2
- sll \$0,3,\$0
- addl \$1,\$0,\$0
- addl \$2,\$0,\$0
- ret \$31,(\$26),1
- .end main
-EOF
- LIBC=""
- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
- if test "$?" = 0 ; then
- ./$dummy
- case "$?" in
- 7)
- UNAME_MACHINE="alpha"
- ;;
- 15)
- UNAME_MACHINE="alphaev5"
- ;;
- 14)
- UNAME_MACHINE="alphaev56"
- ;;
- 10)
- UNAME_MACHINE="alphapca56"
- ;;
- 16)
- UNAME_MACHINE="alphaev6"
- ;;
- esac
-
- objdump --private-headers $dummy | \
- grep ld.so.1 > /dev/null
- if test "$?" = 0 ; then
- LIBC="libc1"
- fi
- fi
- rm -f $dummy.s $dummy
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
- elif test "${UNAME_MACHINE}" = "mips" ; then
- cat >$dummy.c <<EOF
-#ifdef __cplusplus
- int main (int argc, char *argv[]) {
-#else
- int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __MIPSEB__
- printf ("%s-unknown-linux-gnu\n", argv[1]);
-#endif
-#ifdef __MIPSEL__
- printf ("%sel-unknown-linux-gnu\n", argv[1]);
-#endif
- return 0;
-}
-EOF
- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
- else
- # Either a pre-BFD a.out linker (linux-gnuoldld)
- # or one that does not give us useful --help.
- # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
- # If ld does not provide *any* "supported emulations:"
- # that means it is gnuoldld.
- echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
- test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
-
- case "${UNAME_MACHINE}" in
- i?86)
- VENDOR=pc;
- ;;
- *)
- VENDOR=unknown;
- ;;
- esac
- # Determine whether the default compiler is a.out or elf
- cat >$dummy.c <<EOF
+ # Determine whether the default compiler is a.out or elf
+ cat >$dummy.c <<EOF
#include <features.h>
#ifdef __cplusplus
+#include <stdio.h> /* for printf() prototype */
int main (int argc, char *argv[]) {
#else
int main (argc, argv) int argc; char *argv[]; {
@@ -768,28 +852,31 @@ EOF
#ifdef __ELF__
# ifdef __GLIBC__
# if __GLIBC__ >= 2
- printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
+ printf ("%s-pc-linux-gnu\n", argv[1]);
# else
- printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+ printf ("%s-pc-linux-gnulibc1\n", argv[1]);
# endif
# else
- printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+ printf ("%s-pc-linux-gnulibc1\n", argv[1]);
# endif
#else
- printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
+ printf ("%s-pc-linux-gnuaout\n", argv[1]);
#endif
return 0;
}
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
- fi ;;
-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
-# are messed up and put the nodename in both sysname and nodename.
- i?86:DYNIX/ptx:4*:*)
+ eval $set_cc_for_build
+ $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
+ test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+ ;;
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ # earlier versions are messed up and put the nodename in both
+ # sysname and nodename.
echo i386-sequent-sysv4
exit 0 ;;
- i?86:UNIX_SV:4.2MP:2.*)
+ i*86:UNIX_SV:4.2MP:2.*)
# Unixware is an offshoot of SVR4, but it has its own version
# number series starting with 2...
# I am not positive that other SVR4 systems won't match this,
@@ -797,22 +884,23 @@ EOF
# Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit 0 ;;
- i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+ i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+ UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
- echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
+ echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
else
- echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
fi
exit 0 ;;
- i?86:*:5:7*)
- UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
- (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
- (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586
- (/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686
- (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585
- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
+ i*86:*:5:[78]*)
+ case `/bin/uname -X | grep "^Machine"` in
+ *486*) UNAME_MACHINE=i486 ;;
+ *Pentium) UNAME_MACHINE=i586 ;;
+ *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+ esac
+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
exit 0 ;;
- i?86:*:3.2:*)
+ i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
@@ -830,7 +918,11 @@ EOF
echo ${UNAME_MACHINE}-pc-sysv32
fi
exit 0 ;;
+ i*86:*DOS:*:*)
+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
+ exit 0 ;;
pc:*:*:*)
+ # Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i386.
echo i386-pc-msdosdjgpp
@@ -854,7 +946,7 @@ EOF
exit 0 ;;
M68*:*:R3V[567]*:*)
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
- 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+ 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
OS_REL=''
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -865,21 +957,24 @@ EOF
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
&& echo i486-ncr-sysv4 && exit 0 ;;
- m68*:LynxOS:2.*:*)
+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
exit 0 ;;
- i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
TSUNAMI:LynxOS:2.*:*)
echo sparc-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
- rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
+ rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
SM[BE]S:UNIX_SV:*:*)
echo mips-dde-sysv${UNAME_RELEASE}
exit 0 ;;
@@ -913,7 +1008,7 @@ EOF
mc68*:A/UX:*:*)
echo m68k-apple-aux${UNAME_RELEASE}
exit 0 ;;
- news*:NEWS-OS:*:6*)
+ news*:NEWS-OS:6*:*)
echo mips-sony-newsos6
exit 0 ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
@@ -944,6 +1039,64 @@ EOF
*:Rhapsody:*:*)
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
exit 0 ;;
+ *:Darwin:*:*)
+ echo `uname -p`-apple-darwin${UNAME_RELEASE}
+ exit 0 ;;
+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
+ if test "${UNAME_MACHINE}" = "x86pc"; then
+ UNAME_MACHINE=pc
+ fi
+ echo `uname -p`-${UNAME_MACHINE}-nto-qnx
+ exit 0 ;;
+ *:QNX:*:4*)
+ echo i386-pc-qnx
+ exit 0 ;;
+ NSR-[KW]:NONSTOP_KERNEL:*:*)
+ echo nsr-tandem-nsk${UNAME_RELEASE}
+ exit 0 ;;
+ *:NonStop-UX:*:*)
+ echo mips-compaq-nonstopux
+ exit 0 ;;
+ BS2000:POSIX*:*:*)
+ echo bs2000-siemens-sysv
+ exit 0 ;;
+ DS/*:UNIX_System_V:*:*)
+ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+ exit 0 ;;
+ *:Plan9:*:*)
+ # "uname -m" is not consistent, so use $cputype instead. 386
+ # is converted to i386 for consistency with other x86
+ # operating systems.
+ if test "$cputype" = "386"; then
+ UNAME_MACHINE=i386
+ else
+ UNAME_MACHINE="$cputype"
+ fi
+ echo ${UNAME_MACHINE}-unknown-plan9
+ exit 0 ;;
+ i*86:OS/2:*:*)
+ # If we were able to find `uname', then EMX Unix compatibility
+ # is probably installed.
+ echo ${UNAME_MACHINE}-pc-os2-emx
+ exit 0 ;;
+ *:TOPS-10:*:*)
+ echo pdp10-unknown-tops10
+ exit 0 ;;
+ *:TENEX:*:*)
+ echo pdp10-unknown-tenex
+ exit 0 ;;
+ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+ echo pdp10-dec-tops20
+ exit 0 ;;
+ XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+ echo pdp10-xkl-tops20
+ exit 0 ;;
+ *:TOPS-20:*:*)
+ echo pdp10-unknown-tops20
+ exit 0 ;;
+ *:ITS:*:*)
+ echo pdp10-unknown-its
+ exit 0 ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1035,11 +1188,24 @@ main ()
#endif
#if defined (vax)
-#if !defined (ultrix)
- printf ("vax-dec-bsd\n"); exit (0);
-#else
- printf ("vax-dec-ultrix\n"); exit (0);
-#endif
+# if !defined (ultrix)
+# include <sys/param.h>
+# if defined (BSD)
+# if BSD == 43
+ printf ("vax-dec-bsd4.3\n"); exit (0);
+# else
+# if BSD == 199006
+ printf ("vax-dec-bsd4.3reno\n"); exit (0);
+# else
+ printf ("vax-dec-bsd\n"); exit (0);
+# endif
+# endif
+# else
+ printf ("vax-dec-bsd\n"); exit (0);
+# endif
+# else
+ printf ("vax-dec-ultrix\n"); exit (0);
+# endif
#endif
#if defined (alliant) && defined (i860)
@@ -1050,7 +1216,8 @@ main ()
}
EOF
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
+eval $set_cc_for_build
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
# Apollos put the system type in the environment.
@@ -1083,6 +1250,48 @@ then
esac
fi
-#echo '(Unable to guess system type)' 1>&2
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+ ftp://ftp.gnu.org/pub/gnu/config/
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo = `(hostinfo) 2>/dev/null`
+/bin/universe = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/contrib/ntp/config.h.in b/contrib/ntp/config.h.in
index 24fedb1c1186..aa3826881c15 100644
--- a/contrib/ntp/config.h.in
+++ b/contrib/ntp/config.h.in
@@ -1,67 +1,4 @@
/* config.h.in. Generated automatically from configure.in by autoheader. */
-
-/* Define if on AIX 3.
- System headers sometimes define this.
- We just want to avoid a redefinition error message. */
-#ifndef _ALL_SOURCE
-#undef _ALL_SOURCE
-#endif
-
-/* Define if type char is unsigned and you are not using gcc. */
-#ifndef __CHAR_UNSIGNED__
-#undef __CHAR_UNSIGNED__
-#endif
-
-/* Define to empty if the keyword does not work. */
-#undef const
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef gid_t
-
-/* Define as __inline if that's what the C compiler calls it. */
-#undef inline
-
-/* Define if on MINIX. */
-#undef _MINIX
-
-/* Define if your struct nlist has an n_un member. */
-#undef NLIST_NAME_UNION
-
-/* Define if you have <nlist.h>. */
-#undef NLIST_STRUCT
-
-/* Define to `long' if <sys/types.h> doesn't define. */
-#undef off_t
-
-/* Define if the system does not provide POSIX.1 features except
- with this defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define if you need to in order for stat and other things to work. */
-#undef _POSIX_SOURCE
-
-/* Define as the return type of signal handlers (int or void). */
-#undef RETSIGTYPE
-
-/* Define to `unsigned' if <sys/types.h> doesn't define. */
-#undef size_t
-
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
-
-/* Define if your <sys/time.h> declares struct tm. */
-#undef TM_IN_SYS_TIME
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef uid_t
-
-/* Define if your processor stores words with the most significant
- byte first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
-
/* debugging code */
#undef DEBUG
@@ -134,6 +71,12 @@
/* 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
@@ -326,6 +269,9 @@
/* 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
@@ -353,6 +299,9 @@
/* 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
@@ -426,9 +375,6 @@
/* 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 use struct timespec rather than struct timeval (time in ns rather than us) */
-#undef HAVE_TIMESPEC
-
/* Define if you have the interface in the Draft RFC */
#undef HAVE_PPSAPI
@@ -438,6 +384,10 @@
/* Do we have support for SHMEM_STATUS? */
#undef ONCORE_SHMEM_STATUS
+/***/
+
+/* Which way should we declare... */
+
/* adjtime()? */
#undef DECL_ADJTIME_0
@@ -450,6 +400,9 @@
/* cfset[io]speed()? */
#undef DECL_CFSETISPEED_0
+/* hstrerror()? */
+#undef DECL_HSTRERROR_0
+
/* ioctl()? */
#undef DECL_IOCTL_0
@@ -459,6 +412,9 @@
/* memmove()? */
#undef DECL_MEMMOVE_0
+/* memset()? */
+#undef DECL_MEMSET_0
+
/* mkstemp()? */
#undef DECL_MKSTEMP_0
@@ -518,387 +474,511 @@
/* toupper()? */
#undef DECL_TOUPPER_0
-/* The number of bytes in a int. */
-#undef SIZEOF_INT
+/* strerror()? */
+#undef DECL_STRERROR_0
-/* The number of bytes in a long. */
-#undef SIZEOF_LONG
+#undef ULONG_CONST
-/* The number of bytes in a signed char. */
-#undef SIZEOF_SIGNED_CHAR
+/* Autokey? */
+#undef AUTOKEY
-/* Define if you have the K_open function. */
-#undef HAVE_K_OPEN
+/* Define if you have the <arpa/nameser.h> header file. */
+#undef HAVE_ARPA_NAMESER_H
-/* Define if you have the __adjtimex function. */
-#undef HAVE___ADJTIMEX
+/* Do we have audio support? */
+#undef HAVE_AUDIO
-/* Define if you have the __ntp_gettime function. */
-#undef HAVE___NTP_GETTIME
+/* Define if you have the <bstring.h> header file. */
+#undef HAVE_BSTRING_H
-/* Define if you have the clock_settime function. */
+/* Define if you have the `clock_settime' function. */
#undef HAVE_CLOCK_SETTIME
-/* Define if you have the daemon function. */
+/* Define if you have the `daemon' function. */
#undef HAVE_DAEMON
-/* Define if you have the getbootfile function. */
+/* Define if you have the <errno.h> header file. */
+#undef HAVE_ERRNO_H
+
+/* Define if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
+
+/* Define if you have the `finite' function. */
+#undef HAVE_FINITE
+
+/* Define if you have the `getbootfile' function. */
#undef HAVE_GETBOOTFILE
-/* Define if you have the getdtablesize function. */
+/* Define if you have the `getclock' function. */
+#undef HAVE_GETCLOCK
+
+/* Define if you have the `getdtablesize' function. */
#undef HAVE_GETDTABLESIZE
-/* Define if you have the getrusage function. */
+/* Define if you have the `getrusage' function. */
#undef HAVE_GETRUSAGE
-/* Define if you have the gettimeofday function. */
+/* Define if you have the `gettimeofday' function. */
#undef HAVE_GETTIMEOFDAY
-/* Define if you have the getuid function. */
+/* Define if you have the `getuid' function. */
#undef HAVE_GETUID
-/* Define if you have the kvm_open function. */
+/* Define if you have the `hstrerror' function. */
+#undef HAVE_HSTRERROR
+
+/* Define if you have the <ieeefp.h> header file. */
+#undef HAVE_IEEEFP_H
+
+/* Define if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define if you have the `isfinite' function. */
+#undef HAVE_ISFINITE
+
+/* Define if you have the `kvm_open' function. */
#undef HAVE_KVM_OPEN
-/* Define if you have the memcpy function. */
+/* Define if you have the `K_open' function. */
+#undef HAVE_K_OPEN
+
+/* Define if you have the `advapi32' library (-ladvapi32). */
+#undef HAVE_LIBADVAPI32
+
+/* Define if you have the `elf' library (-lelf). */
+#undef HAVE_LIBELF
+
+/* Define if you have the `gen' library (-lgen). */
+#undef HAVE_LIBGEN
+
+/* Define if you have the `kvm' library (-lkvm). */
+#undef HAVE_LIBKVM
+
+/* Define if you have the `ld' library (-lld). */
+#undef HAVE_LIBLD
+
+/* Define if you have the `mld' library (-lmld). */
+#undef HAVE_LIBMLD
+
+/* Define if you have the `nsl' library (-lnsl). */
+#undef HAVE_LIBNSL
+
+/* Define if you have the `posix4' library (-lposix4). */
+#undef HAVE_LIBPOSIX4
+
+/* Define if you have the `readline' library (-lreadline). */
+#undef HAVE_LIBREADLINE
+
+/* Define if you have the `rt' library (-lrt). */
+#undef HAVE_LIBRT
+
+/* Define if you have the `socket' library (-lsocket). */
+#undef HAVE_LIBSOCKET
+
+/* Define if you have the <machine/inline.h> header file. */
+#undef HAVE_MACHINE_INLINE_H
+
+/* Define if you have the <math.h> header file. */
+#undef HAVE_MATH_H
+
+/* Define if you have the `memcpy' function. */
#undef HAVE_MEMCPY
-/* Define if you have the memlk function. */
+/* Define if you have the `memlk' function. */
#undef HAVE_MEMLK
-/* Define if you have the memmove function. */
+/* Define if you have the `memmove' function. */
#undef HAVE_MEMMOVE
-/* Define if you have the memset function. */
+/* Define if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define if you have the `memset' function. */
#undef HAVE_MEMSET
-/* Define if you have the mkstemp function. */
+/* Define if you have the `mkstemp' function. */
#undef HAVE_MKSTEMP
-/* Define if you have the mktime function. */
+/* Define if you have the `mktime' function. */
#undef HAVE_MKTIME
-/* Define if you have the mlockall function. */
+/* Define if you have the `mlockall' function. */
#undef HAVE_MLOCKALL
-/* Define if you have the mrand48 function. */
+/* Define if you have the `mrand48' function. */
#undef HAVE_MRAND48
-/* Define if you have the nice function. */
+/* Define if you have the <netdb.h> header file. */
+#undef HAVE_NETDB_H
+
+/* Define if you have the <netinet/in.h> header file. */
+#undef HAVE_NETINET_IN_H
+
+/* Define if you have the <netinet/in_systm.h> header file. */
+#undef HAVE_NETINET_IN_SYSTM_H
+
+/* Define if you have the <netinfo/ni.h> header file. */
+#undef HAVE_NETINFO_NI_H
+
+/* Define if you have the <net/if.h> header file. */
+#undef HAVE_NET_IF_H
+
+/* Define if you have the `nice' function. */
#undef HAVE_NICE
-/* Define if you have the nlist function. */
+/* Define if you have the `nlist' function. */
#undef HAVE_NLIST
-/* Define if you have the ntp_adjtime function. */
+/* Define if you have the `ntp_adjtime' function. */
#undef HAVE_NTP_ADJTIME
-/* Define if you have the ntp_gettime function. */
+/* Define if you have the `ntp_gettime' function. */
#undef HAVE_NTP_GETTIME
-/* Define if you have the plock function. */
+/* Define if you have the `plock' function. */
#undef HAVE_PLOCK
-/* Define if you have the pututline function. */
+/* Define if you have the <poll.h> header file. */
+#undef HAVE_POLL_H
+
+/* Define if you have the `pututline' function. */
#undef HAVE_PUTUTLINE
-/* Define if you have the pututxline function. */
+/* Define if you have the `pututxline' function. */
#undef HAVE_PUTUTXLINE
-/* Define if you have the random function. */
+/* Define if you have the `random' function. */
#undef HAVE_RANDOM
-/* Define if you have the rtprio function. */
+/* Define if you have the `readlink' function. */
+#undef HAVE_READLINK
+
+/* Define if you have the <resolv.h> header file. */
+#undef HAVE_RESOLV_H
+
+/* Define if you have the `rtprio' function. */
#undef HAVE_RTPRIO
-/* Define if you have the sched_setscheduler function. */
+/* Define if you have the <sched.h> header file. */
+#undef HAVE_SCHED_H
+
+/* Define if you have the `sched_setscheduler' function. */
#undef HAVE_SCHED_SETSCHEDULER
-/* Define if you have the setlinebuf function. */
+/* Define if you have the `setlinebuf' function. */
#undef HAVE_SETLINEBUF
-/* Define if you have the setpgid function. */
+/* Define if you have the `setpgid' function. */
#undef HAVE_SETPGID
-/* Define if you have the setpriority function. */
+/* Define if you have the `setpriority' function. */
#undef HAVE_SETPRIORITY
-/* Define if you have the setsid function. */
+/* Define if you have the `setsid' function. */
#undef HAVE_SETSID
-/* Define if you have the settimeofday function. */
+/* Define if you have the `settimeofday' function. */
#undef HAVE_SETTIMEOFDAY
-/* Define if you have the setvbuf function. */
+/* Define if you have the `setvbuf' function. */
#undef HAVE_SETVBUF
-/* Define if you have the sigaction function. */
+/* Define if you have the <sgtty.h> header file. */
+#undef HAVE_SGTTY_H
+
+/* Define if you have the `sigaction' function. */
#undef HAVE_SIGACTION
-/* Define if you have the sigset function. */
+/* Define if you have the `sigset' function. */
#undef HAVE_SIGSET
-/* Define if you have the sigsuspend function. */
+/* Define if you have the `sigsuspend' function. */
#undef HAVE_SIGSUSPEND
-/* Define if you have the sigvec function. */
+/* Define if you have the `sigvec' function. */
#undef HAVE_SIGVEC
-/* Define if you have the srand48 function. */
+/* Define if you have the `snprintf' function. */
+#undef HAVE_SNPRINTF
+
+/* Define if you have the `srand48' function. */
#undef HAVE_SRAND48
-/* Define if you have the srandom function. */
-#undef HAVE_SRANDOM
+/* Define if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
-/* Define if you have the stime function. */
+/* Define if you have the `stime' function. */
#undef HAVE_STIME
-/* Define if you have the strchr function. */
+/* Define if you have the `strchr' function. */
#undef HAVE_STRCHR
-/* Define if you have the strerror function. */
-#undef HAVE_STRERROR
-
-/* Define if you have the sysconf function. */
-#undef HAVE_SYSCONF
-
-/* Define if you have the sysctl function. */
-#undef HAVE_SYSCTL
-
-/* Define if you have the timer_create function. */
-#undef HAVE_TIMER_CREATE
-
-/* Define if you have the timer_settime function. */
-#undef HAVE_TIMER_SETTIME
-
-/* Define if you have the umask function. */
-#undef HAVE_UMASK
-
-/* Define if you have the uname function. */
-#undef HAVE_UNAME
+/* Define if you have the `strdup' function. */
+#undef HAVE_STRDUP
-/* Define if you have the updwtmp function. */
-#undef HAVE_UPDWTMP
-
-/* Define if you have the updwtmpx function. */
-#undef HAVE_UPDWTMPX
-
-/* Define if you have the vsprintf function. */
-#undef HAVE_VSPRINTF
-
-/* Define if you have the </sys/sync/queue.h> header file. */
-#undef HAVE__SYS_SYNC_QUEUE_H
-
-/* Define if you have the </sys/sync/sema.h> header file. */
-#undef HAVE__SYS_SYNC_SEMA_H
-
-/* Define if you have the <arpa/nameser.h> header file. */
-#undef HAVE_ARPA_NAMESER_H
-
-/* Define if you have the <bstring.h> header file. */
-#undef HAVE_BSTRING_H
-
-/* Define if you have the <errno.h> header file. */
-#undef HAVE_ERRNO_H
-
-/* Define if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
-
-/* Define if you have the <machine/inline.h> header file. */
-#undef HAVE_MACHINE_INLINE_H
-
-/* Define if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define if you have the <net/if.h> header file. */
-#undef HAVE_NET_IF_H
-
-/* Define if you have the <netdb.h> header file. */
-#undef HAVE_NETDB_H
-
-/* Define if you have the <netinet/in.h> header file. */
-#undef HAVE_NETINET_IN_H
-
-/* Define if you have the <netinet/in_systm.h> header file. */
-#undef HAVE_NETINET_IN_SYSTM_H
+/* Define if you have the `strerror' function. */
+#undef HAVE_STRERROR
-/* Define if you have the <netinfo/ni.h> header file. */
-#undef HAVE_NETINFO_NI_H
+/* Define if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
-/* Define if you have the <poll.h> header file. */
-#undef HAVE_POLL_H
+/* Define if you have the <string.h> header file. */
+#undef HAVE_STRING_H
-/* Define if you have the <resolv.h> header file. */
-#undef HAVE_RESOLV_H
+/* Do we have struct ntptimeval? */
+#undef HAVE_STRUCT_NTPTIMEVAL
-/* Define if you have the <sched.h> header file. */
-#undef HAVE_SCHED_H
+/* Define if `time.tv_nsec' is member of `struct ntptimeval'. */
+#undef HAVE_STRUCT_NTPTIMEVAL_TIME_TV_NSEC
-/* Define if you have the <sgtty.h> header file. */
-#undef HAVE_SGTTY_H
+/* Do we have struct timespec? */
+#undef HAVE_STRUCT_TIMESPEC
-/* Define if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
+/* Define if you have the <sun/audioio.h> header file. */
+#undef HAVE_SUN_AUDIOIO_H
-/* Define if you have the <string.h> header file. */
-#undef HAVE_STRING_H
+/* Define if you have the `sysconf' function. */
+#undef HAVE_SYSCONF
-/* Define if you have the <sun/audioio.h> header file. */
-#undef HAVE_SUN_AUDIOIO_H
+/* Define if you have the `sysctl' function. */
+#undef HAVE_SYSCTL
-/* Define if you have the <sys/audioio.h> header file. */
+/* Define if you have the <sys/audioio.h> header file. */
#undef HAVE_SYS_AUDIOIO_H
-/* Define if you have the <sys/clkdefs.h> header file. */
+/* Define if you have the <sys/clkdefs.h> header file. */
#undef HAVE_SYS_CLKDEFS_H
-/* Define if you have the <sys/file.h> header file. */
+/* Define if you have the <sys/file.h> header file. */
#undef HAVE_SYS_FILE_H
-/* Define if you have the <sys/i8253.h> header file. */
+/* Define if you have the <sys/i8253.h> header file. */
#undef HAVE_SYS_I8253_H
-/* Define if you have the <sys/ioctl.h> header file. */
+/* Define if you have the <sys/ioctl.h> header file. */
#undef HAVE_SYS_IOCTL_H
-/* Define if you have the <sys/lock.h> header file. */
+/* Define if you have the <sys/lock.h> header file. */
#undef HAVE_SYS_LOCK_H
-/* Define if you have the <sys/mman.h> header file. */
+/* Define if you have the <sys/mman.h> header file. */
#undef HAVE_SYS_MMAN_H
-/* Define if you have the <sys/modem.h> header file. */
+/* Define if you have the <sys/modem.h> header file. */
#undef HAVE_SYS_MODEM_H
-/* Define if you have the <sys/param.h> header file. */
+/* Define if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
-/* Define if you have the <sys/pcl720.h> header file. */
+/* Define if you have the <sys/pcl720.h> header file. */
#undef HAVE_SYS_PCL720_H
-/* Define if you have the <sys/ppsclock.h> header file. */
+/* Define if you have the <sys/ppsclock.h> header file. */
#undef HAVE_SYS_PPSCLOCK_H
-/* Define if you have the <sys/ppstime.h> header file. */
+/* Define if you have the <sys/ppstime.h> header file. */
#undef HAVE_SYS_PPSTIME_H
-/* Define if you have the <sys/proc.h> header file. */
+/* Define if you have the <sys/proc.h> header file. */
#undef HAVE_SYS_PROC_H
-/* Define if you have the <sys/resource.h> header file. */
+/* Define if you have the <sys/resource.h> header file. */
#undef HAVE_SYS_RESOURCE_H
-/* Define if you have the <sys/sched.h> header file. */
+/* Define if you have the <sys/sched.h> header file. */
#undef HAVE_SYS_SCHED_H
-/* Define if you have the <sys/select.h> header file. */
+/* Define if you have the <sys/select.h> header file. */
#undef HAVE_SYS_SELECT_H
-/* Define if you have the <sys/sio.h> header file. */
+/* Define if you have the <sys/sio.h> header file. */
#undef HAVE_SYS_SIO_H
-/* Define if you have the <sys/sockio.h> header file. */
+/* Define if you have the <sys/sockio.h> header file. */
#undef HAVE_SYS_SOCKIO_H
-/* Define if you have the <sys/stat.h> header file. */
+/* Define if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
-/* Define if you have the <sys/stream.h> header file. */
+/* Define if you have the <sys/stream.h> header file. */
#undef HAVE_SYS_STREAM_H
-/* Define if you have the <sys/stropts.h> header file. */
+/* Define if you have the <sys/stropts.h> header file. */
#undef HAVE_SYS_STROPTS_H
-/* Define if you have the <sys/sysctl.h> header file. */
+/* Define if you have the <sys/sysctl.h> header file. */
#undef HAVE_SYS_SYSCTL_H
-/* Define if you have the <sys/syssgi.h> header file. */
+/* Define if you have the <sys/syssgi.h> header file. */
#undef HAVE_SYS_SYSSGI_H
-/* Define if you have the <sys/termios.h> header file. */
+/* Define if you have the <sys/termios.h> header file. */
#undef HAVE_SYS_TERMIOS_H
-/* Define if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
-
-/* Define if you have the <sys/timepps.h> header file. */
+/* Define if you have the <sys/timepps.h> header file. */
#undef HAVE_SYS_TIMEPPS_H
-/* Define if you have the <sys/timers.h> header file. */
+/* Define if you have the <sys/timers.h> header file. */
#undef HAVE_SYS_TIMERS_H
-/* Define if you have the <sys/timex.h> header file. */
+/* Define if you have the <sys/timex.h> header file. */
#undef HAVE_SYS_TIMEX_H
-/* Define if you have the <sys/tpro.h> header file. */
+/* Define if you have the <sys/time.h> header file. */
+#undef HAVE_SYS_TIME_H
+
+/* Define if you have the <sys/tpro.h> header file. */
#undef HAVE_SYS_TPRO_H
-/* Define if you have the <sys/types.h> header file. */
+/* Define if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
-/* Define if you have the <sys/wait.h> header file. */
+/* Define if you have the <sys/wait.h> header file. */
#undef HAVE_SYS_WAIT_H
-/* Define if you have the <termio.h> header file. */
-#undef HAVE_TERMIO_H
+/* Define if the system has the type `s_char'. */
+#undef HAVE_S_CHAR
-/* Define if you have the <termios.h> header file. */
+/* Define if you have the <termios.h> header file. */
#undef HAVE_TERMIOS_H
-/* Define if you have the <timepps.h> header file. */
+/* Define if you have the <termio.h> header file. */
+#undef HAVE_TERMIO_H
+
+/* Define if you have the <timepps.h> header file. */
#undef HAVE_TIMEPPS_H
-/* Define if you have the <timex.h> header file. */
+/* Define if you have the `timer_create' function. */
+#undef HAVE_TIMER_CREATE
+
+/* Define if you have the `timer_settime' function. */
+#undef HAVE_TIMER_SETTIME
+
+/* Define if you have the <timex.h> header file. */
#undef HAVE_TIMEX_H
-/* Define if you have the <unistd.h> header file. */
+/* Define if you have the `umask' function. */
+#undef HAVE_UMASK
+
+/* Define if you have the `uname' function. */
+#undef HAVE_UNAME
+
+/* Define if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
-/* Define if you have the <utmp.h> header file. */
-#undef HAVE_UTMP_H
+/* Define if you have the `updwtmp' function. */
+#undef HAVE_UPDWTMP
-/* Define if you have the <utmpx.h> header file. */
-#undef HAVE_UTMPX_H
+/* Define if you have the `updwtmpx' function. */
+#undef HAVE_UPDWTMPX
-/* Define if you have the advapi32 library (-ladvapi32). */
-#undef HAVE_LIBADVAPI32
+/* Define if you have the <utmpx.h> header file. */
+#undef HAVE_UTMPX_H
-/* Define if you have the elf library (-lelf). */
-#undef HAVE_LIBELF
+/* Define if you have the <utmp.h> header file. */
+#undef HAVE_UTMP_H
-/* Define if you have the gen library (-lgen). */
-#undef HAVE_LIBGEN
+/* Define if you have the `vsprintf' function. */
+#undef HAVE_VSPRINTF
-/* Define if you have the kvm library (-lkvm). */
-#undef HAVE_LIBKVM
+/* Define if you have the </sys/sync/queue.h> header file. */
+#undef HAVE__SYS_SYNC_QUEUE_H
-/* Define if you have the ld library (-lld). */
-#undef HAVE_LIBLD
+/* Define if you have the </sys/sync/sema.h> header file. */
+#undef HAVE__SYS_SYNC_SEMA_H
-/* Define if you have the mld library (-lmld). */
-#undef HAVE_LIBMLD
+/* Define if you have the `__adjtimex' function. */
+#undef HAVE___ADJTIMEX
-/* Define if you have the nsl library (-lnsl). */
-#undef HAVE_LIBNSL
+/* Define if you have the `__ntp_gettime' function. */
+#undef HAVE___NTP_GETTIME
-/* Define if you have the rt library (-lrt). */
-#undef HAVE_LIBRT
+/* Default location of crypto key info */
+#undef NTP_KEYSDIR
-/* Define if you have the socket library (-lsocket). */
-#undef HAVE_LIBSOCKET
+/* Use OpenSSL? */
+#undef OPENSSL
/* Name of package */
#undef PACKAGE
+/* Define if compiler has function prototypes */
+#undef PROTOTYPES
+
+/* Public key? */
+#undef PUBKEY
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#undef RETSIGTYPE
+
+/* Use RSAREF? */
+#undef RSAREF
+
+/* The size of a `int', as computed by sizeof. */
+#undef SIZEOF_INT
+
+/* The size of a `long', as computed by sizeof. */
+#undef SIZEOF_LONG
+
+/* The size of a `signed char', as computed by sizeof. */
+#undef SIZEOF_SIGNED_CHAR
+
+/* Define if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define if you can safely include both <sys/time.h> and <time.h>. */
+#undef TIME_WITH_SYS_TIME
+
+/* Define if your <sys/time.h> declares `struct tm'. */
+#undef TM_IN_SYS_TIME
+
/* Version number of package */
#undef VERSION
-/* Define if compiler has function prototypes */
-#undef PROTOTYPES
+/* Define if your processor stores words with the most significant byte first
+ (like Motorola and SPARC, unlike Intel and VAX). */
+#undef WORDS_BIGENDIAN
-/* Do we have struct ntptimeval? */
-#undef HAVE_STRUCT_NTPTIMEVAL
+/* Define if on AIX 3.
+ System headers sometimes define this.
+ We just want to avoid a redefinition error message. */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+
+/* Define if on MINIX. */
+#undef _MINIX
+
+/* Define if the system does not provide POSIX.1 features except with this
+ defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define if you need to in order for stat and other things to work. */
+#undef _POSIX_SOURCE
+
+/* Define if type `char' is unsigned and you are not using gcc. */
+#ifndef __CHAR_UNSIGNED__
+# undef __CHAR_UNSIGNED__
+#endif
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#undef gid_t
-/* Does ntptimeval use struct timespec? */
-#undef TIMESPEC_IN_NTPTIMEVAL
+/* Define as `__inline' if that's what the C compiler calls it, or to nothing
+ if it is not supported. */
+#undef inline
+
+/* Define to `long' if <sys/types.h> does not define. */
+#undef off_t
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+#undef size_t
+
+/* Define to `long' if <sys/types.h> does not define. */
+#undef time_t
+/* Define to `int' if <sys/types.h> doesn't define. */
+#undef uid_t
diff --git a/contrib/ntp/config.sub b/contrib/ntp/config.sub
index e4944414bf64..578b302738e7 100755
--- a/contrib/ntp/config.sub
+++ b/contrib/ntp/config.sub
@@ -1,6 +1,10 @@
#! /bin/sh
-# Configuration validation subroutine script, version 1.1.
-# Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
+# Configuration validation subroutine script.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
+
+timestamp='2001-06-08'
+
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
# can handle that machine. It does not imply ALL GNU software can.
@@ -25,6 +29,8 @@
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
+# Please send patches to <config-patches@gnu.org>.
+#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
# If it is invalid, we print an error message on stderr and exit with code 1.
@@ -45,30 +51,73 @@
# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
# It is wrong to echo any other type of specification.
-if [ x$1 = x ]
-then
- echo Configuration name missing. 1>&2
- echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
- echo "or $0 ALIAS" 1>&2
- echo where ALIAS is a recognized configuration type. 1>&2
- exit 1
-fi
+me=`echo "$0" | sed -e 's,.*/,,'`
-# First pass through any local machine types.
-case $1 in
- *local*)
- echo $1
- exit 0
- ;;
- *)
- ;;
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+ $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+ -h, --help print this help, then exit
+ -t, --time-stamp print date of last modification, then exit
+ -v, --version print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+ case $1 in
+ --time-stamp | --time* | -t )
+ echo "$timestamp" ; exit 0 ;;
+ --version | -v )
+ echo "$version" ; exit 0 ;;
+ --help | --h* | -h )
+ echo "$usage"; exit 0 ;;
+ -- ) # Stop option processing
+ shift; break ;;
+ - ) # Use stdin as input.
+ break ;;
+ -* )
+ echo "$me: invalid option $1$help"
+ exit 1 ;;
+
+ *local*)
+ # First pass through any local machine types.
+ echo $1
+ exit 0;;
+
+ * )
+ break ;;
+ esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+ exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+ exit 1;;
esac
# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- linux-gnu*)
+ nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
@@ -94,7 +143,7 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple)
+ -apple | -axis)
os=
basic_machine=$1
;;
@@ -105,9 +154,17 @@ case $os in
-scout)
;;
-wrs)
- os=vxworks
+ os=-vxworks
+ basic_machine=$1
+ ;;
+ -chorusos*)
+ os=-chorusos
basic_machine=$1
;;
+ -chorusrdb)
+ os=-chorusrdb
+ basic_machine=$1
+ ;;
-hiux*)
os=-hiuxwe2
;;
@@ -156,33 +213,50 @@ case $os in
-psos*)
os=-psos
;;
+ -mint | -mint[0-9]*)
+ basic_machine=m68k-atari
+ os=-mint
+ ;;
esac
# Decode aliases for certain CPU-COMPANY combinations.
case $basic_machine in
# Recognize the basic CPU types without company name.
# Some are omitted here because they have special meanings below.
- tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
- | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+ tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
+ | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
+ | pyramid | mn10200 | mn10300 | tron | a29k \
| 580 | i960 | h8300 \
+ | x86 | ppcbe | mipsbe | mipsle | shbe | shle \
| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
- | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
- | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
- | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
+ | hppa64 \
+ | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
+ | alphaev6[78] \
+ | we32k | ns16k | clipper | i370 | sh | sh[34] \
+ | powerpc | powerpcle \
+ | 1750a | dsp16xx | pdp10 | pdp11 \
+ | mips16 | mips64 | mipsel | mips64el \
| mips64orion | mips64orionel | mipstx39 | mipstx39el \
| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
- | mips64vr5000 | miprs64vr5000el | mcore \
- | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
- | thumb | d10v)
+ | mips64vr5000 | mips64vr5000el | mcore | s390 | s390x \
+ | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
+ | v850 | c4x \
+ | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
+ | pj | pjl | h8500 | z8k)
basic_machine=$basic_machine-unknown
;;
- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
+ m6811 | m68hc11 | m6812 | m68hc12)
+ # Motorola 68HC11/12.
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
;;
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
- i[34567]86)
+ i*86 | x86_64)
basic_machine=$basic_machine-pc
;;
# Object if more than one company name word.
@@ -192,23 +266,30 @@ case $basic_machine in
;;
# Recognize the basic CPU types with company name.
# FIXME: clean up the formatting here.
- vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
- | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+ vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
+ | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
+ | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
| mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
| power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
| xmp-* | ymp-* \
- | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
- | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
+ | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
+ | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
+ | hppa2.0n-* | hppa64-* \
+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
+ | alphaev6[78]-* \
| we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
| clipper-* | orion-* \
- | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
- | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
+ | sparclite-* | pdp10-* | pdp11-* | sh-* | sh[34]-* | sh[34]eb-* \
+ | powerpc-* | powerpcle-* | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
+ | mips16-* | mips64-* | mipsel-* \
| mips64el-* | mips64orion-* | mips64orionel-* \
| mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
| mipstx39-* | mipstx39el-* | mcore-* \
- | f301-* | armv*-* | t3e-* \
+ | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
+ | [cjt]90-* \
| m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
- | thumb-* | v850-* | d30v-* | tic30-* | c30-* )
+ | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
+ | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
@@ -245,14 +326,14 @@ case $basic_machine in
os=-sysv
;;
amiga | amiga-*)
- basic_machine=m68k-cbm
+ basic_machine=m68k-unknown
;;
amigaos | amigados)
- basic_machine=m68k-cbm
+ basic_machine=m68k-unknown
os=-amigaos
;;
amigaunix | amix)
- basic_machine=m68k-cbm
+ basic_machine=m68k-unknown
os=-sysv4
;;
apollo68)
@@ -299,13 +380,16 @@ case $basic_machine in
basic_machine=cray2-cray
os=-unicos
;;
- [ctj]90-cray)
- basic_machine=c90-cray
+ [cjt]90)
+ basic_machine=${basic_machine}-cray
os=-unicos
;;
crds | unos)
basic_machine=m68k-crds
;;
+ cris | cris-* | etrax*)
+ basic_machine=cris-axis
+ ;;
da30 | da30-*)
basic_machine=m68k-da30
;;
@@ -353,6 +437,10 @@ case $basic_machine in
basic_machine=tron-gmicro
os=-sysv
;;
+ go32)
+ basic_machine=i386-pc
+ os=-go32
+ ;;
h3050r* | hiux*)
basic_machine=hppa1.1-hitachi
os=-hiuxwe2
@@ -426,22 +514,21 @@ case $basic_machine in
;;
i370-ibm* | ibm*)
basic_machine=i370-ibm
- os=-mvs
;;
# I'm not sure what "Sysv32" means. Should this be sysv3.2?
- i[34567]86v32)
+ i*86v32)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv32
;;
- i[34567]86v4*)
+ i*86v4*)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv4
;;
- i[34567]86v)
+ i*86v)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv
;;
- i[34567]86sol2)
+ i*86sol2)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-solaris2
;;
@@ -453,14 +540,6 @@ case $basic_machine in
basic_machine=i386-unknown
os=-vsta
;;
- i386-go32 | go32)
- basic_machine=i386-unknown
- os=-go32
- ;;
- i386-mingw32 | mingw32)
- basic_machine=i386-unknown
- os=-mingw32
- ;;
iris | iris4d)
basic_machine=mips-sgi
case $os in
@@ -486,10 +565,14 @@ case $basic_machine in
basic_machine=ns32k-utek
os=-sysv
;;
+ mingw32)
+ basic_machine=i386-pc
+ os=-mingw32
+ ;;
miniframe)
basic_machine=m68000-convergent
;;
- *mint | *MiNT)
+ *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
basic_machine=m68k-atari
os=-mint
;;
@@ -507,14 +590,22 @@ case $basic_machine in
mips3*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
;;
+ mmix*)
+ basic_machine=mmix-knuth
+ os=-mmixware
+ ;;
monitor)
basic_machine=m68k-rom68k
os=-coff
;;
msdos)
- basic_machine=i386-unknown
+ basic_machine=i386-pc
os=-msdos
;;
+ mvs)
+ basic_machine=i370-ibm
+ os=-mvs
+ ;;
ncr3000)
basic_machine=i486-ncr
os=-sysv4
@@ -524,7 +615,7 @@ case $basic_machine in
os=-netbsd
;;
netwinder)
- basic_machine=armv4l-corel
+ basic_machine=armv4l-rebel
os=-linux
;;
news | news700 | news800 | news900)
@@ -572,9 +663,16 @@ case $basic_machine in
basic_machine=i960-intel
os=-mon960
;;
+ nonstopux)
+ basic_machine=mips-compaq
+ os=-nonstopux
+ ;;
np1)
basic_machine=np1-gould
;;
+ nsr-tandem)
+ basic_machine=nsr-tandem
+ ;;
op50n-* | op60c-*)
basic_machine=hppa1.1-oki
os=-proelf
@@ -604,28 +702,28 @@ case $basic_machine in
pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
- pentium | p5 | k5 | k6 | nexen)
+ pentium | p5 | k5 | k6 | nexgen)
basic_machine=i586-pc
;;
- pentiumpro | p6 | 6x86)
+ pentiumpro | p6 | 6x86 | athlon)
basic_machine=i686-pc
;;
pentiumii | pentium2)
- basic_machine=i786-pc
+ basic_machine=i686-pc
;;
- pentium-* | p5-* | k5-* | k6-* | nexen-*)
+ pentium-* | p5-* | k5-* | k6-* | nexgen-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- pentiumpro-* | p6-* | 6x86-*)
+ pentiumpro-* | p6-* | 6x86-* | athlon-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pentiumii-* | pentium2-*)
- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pn)
basic_machine=pn-gould
;;
- power) basic_machine=rs6000-ibm
+ power) basic_machine=power-ibm
;;
ppc) basic_machine=powerpc-unknown
;;
@@ -640,6 +738,10 @@ case $basic_machine in
ps2)
basic_machine=i386-ibm
;;
+ pw32)
+ basic_machine=i586-unknown
+ os=-pw32
+ ;;
rom68k)
basic_machine=m68k-rom68k
os=-coff
@@ -719,6 +821,10 @@ case $basic_machine in
sun386 | sun386i | roadrunner)
basic_machine=i386-sun
;;
+ sv1)
+ basic_machine=sv1-cray
+ os=-unicos
+ ;;
symmetry)
basic_machine=i386-sequent
os=-dynix
@@ -727,6 +833,10 @@ case $basic_machine in
basic_machine=t3e-cray
os=-unicos
;;
+ tic54x | c54x*)
+ basic_machine=tic54x-unknown
+ os=-coff
+ ;;
tx39)
basic_machine=mipstx39-unknown
;;
@@ -779,6 +889,10 @@ case $basic_machine in
basic_machine=hppa1.1-winbond
os=-proelf
;;
+ windows32)
+ basic_machine=i386-pc
+ os=-windows32-msvcrt
+ ;;
xmp)
basic_machine=xmp-cray
os=-unicos
@@ -822,13 +936,20 @@ case $basic_machine in
vax)
basic_machine=vax-dec
;;
+ pdp10)
+ # there are many clones, so DEC is not a safe bet
+ basic_machine=pdp10-unknown
+ ;;
pdp11)
basic_machine=pdp11-dec
;;
we32k)
basic_machine=we32k-att
;;
- sparc | sparcv9)
+ sh3 | sh4)
+ basic_machine=sh-unknown
+ ;;
+ sparc | sparcv9 | sparcv9b)
basic_machine=sparc-sun
;;
cydra)
@@ -850,6 +971,9 @@ case $basic_machine in
basic_machine=c4x-none
os=-coff
;;
+ *-unknown)
+ # Make sure to match an already-canonicalized machine name.
+ ;;
*)
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
exit 1
@@ -906,14 +1030,29 @@ case $os in
| -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
+ | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
+ -qnx*)
+ case $basic_machine in
+ x86-* | i*86-*)
+ ;;
+ *)
+ os=-nto$os
+ ;;
+ esac
+ ;;
+ -nto*)
+ os=-nto-qnx
+ ;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
| -windows* | -osx | -abug | -netware* | -os9* | -beos* \
- | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
+ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
os=`echo $os | sed -e 's|mac|macos|'`
@@ -927,6 +1066,12 @@ case $os in
-sunos6*)
os=`echo $os | sed -e 's|sunos6|solaris3|'`
;;
+ -opened*)
+ os=-openedition
+ ;;
+ -wince*)
+ os=-wince
+ ;;
-osfrose*)
os=-osfrose
;;
@@ -951,6 +1096,9 @@ case $os in
-ns2 )
os=-nextstep2
;;
+ -nsk*)
+ os=-nsk
+ ;;
# Preserve the version number of sinix5.
-sinix5.*)
os=`echo $os | sed -e 's|sinix|sysv|'`
@@ -985,7 +1133,7 @@ case $os in
-xenix)
os=-xenix
;;
- -*mint | -*MiNT)
+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
os=-mint
;;
-none)
@@ -1013,12 +1161,15 @@ case $basic_machine in
*-acorn)
os=-riscix1.2
;;
- arm*-corel)
+ arm*-rebel)
os=-linux
;;
arm*-semi)
os=-aout
;;
+ pdp10-*)
+ os=-tops20
+ ;;
pdp11-*)
os=-none
;;
@@ -1127,7 +1278,7 @@ case $basic_machine in
*-masscomp)
os=-rtu
;;
- f301-fujitsu)
+ f30[01]-fujitsu | f700-fujitsu)
os=-uxpv
;;
*-rom68k)
@@ -1187,7 +1338,7 @@ case $basic_machine in
-genix*)
vendor=ns
;;
- -mvs*)
+ -mvs* | -opened*)
vendor=ibm
;;
-ptx*)
@@ -1205,7 +1356,7 @@ case $basic_machine in
-mpw* | -macos*)
vendor=apple
;;
- -*mint | -*MiNT)
+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
vendor=atari
;;
esac
@@ -1214,3 +1365,11 @@ case $basic_machine in
esac
echo $basic_machine$os
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/contrib/ntp/configure b/contrib/ntp/configure
index fd25f498acdf..913f33107683 100755
--- a/contrib/ntp/configure
+++ b/contrib/ntp/configure
@@ -1,153 +1,145 @@
#! /bin/sh
-
# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+# Generated by Autoconf 2.50.
#
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
-# Defaults:
-ac_help=
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+ set -o posix
+fi
+
+# Name of the executable.
+as_me=`echo "$0" |sed 's,.*[\\/],,'`
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+ as_expr=expr
+else
+ as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+ # We could just check for DJGPP; but this test a) works b) is more generic
+ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+ if test -f conf$$.exe; then
+ # Don't use ln at all; we don't have any links
+ as_ln_s='cp -p'
+ else
+ as_ln_s='ln -s'
+ fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+else
+ as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+as_executable_p="test -f"
+
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+ as_unset=unset
+else
+ as_unset=false
+fi
+
+# NLS nuisances.
+$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
+$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
+$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
+$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
+$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
+$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
+$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
+$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" $as_nl"
+
+# CDPATH.
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+exec 6>&1
+
+#
+# Initializations.
+#
ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
- --disable-dependency-tracking Speeds up one-time builds
- --enable-dependency-tracking Do not reject slow dependency extractors"
-ac_help="$ac_help
- --enable-debugging + include debugging code"
-ac_help="$ac_help
- --enable-dst-minutes=60 + minutes per DST adjustment"
-ac_help="$ac_help
- --enable-md5 + include support for MD5 keys"
-ac_help="$ac_help
- --enable-BANCOMM - Datum/Bancomm bc635/VME interface"
-ac_help="$ac_help
- --enable-GPSVME - TrueTime GPS receiver/VME interface"
-ac_help="$ac_help
- --enable-SHM - SHM clock attached thru shared memory"
-ac_help="$ac_help
- --enable-all-clocks + include all suitable non-PARSE clocks:"
-ac_help="$ac_help
- --enable-ACTS + ACTS modem service"
-ac_help="$ac_help
- --enable-ARBITER + Arbiter 1088A/B GPS receiver"
-ac_help="$ac_help
- --enable-ARCRON-MSF + Arcron MSF receiver"
-ac_help="$ac_help
- --enable-AS2201 + Austron 2200A/2201A GPS receiver"
-ac_help="$ac_help
- --enable-ATOM + PPS interface"
-ac_help="$ac_help
- --enable-CHU - CHU modem/decoder"
-ac_help="$ac_help
- --enable-AUDIO-CHU s CHU audio/decoder"
-ac_help="$ac_help
- --enable-DATUM s Datum Programmable Time System"
-ac_help="$ac_help
- --enable-FG + Forum Graphic GPS"
-ac_help="$ac_help
- --enable-HEATH s Heath GC-1000 WWV/WWVH receiver"
-ac_help="$ac_help
- --enable-HPGPS + HP 58503A GPS receiver"
-ac_help="$ac_help
- --enable-IRIG s Sun IRIG audio decoder"
-ac_help="$ac_help
- --enable-LEITCH + Leitch CSD 5300 Master Clock System Driver"
-ac_help="$ac_help
- --enable-LOCAL-CLOCK + local clock reference"
-ac_help="$ac_help
- --enable-MSFEES + EES M201 MSF receiver"
-ac_help="$ac_help
- --enable-MX4200 s Magnavox MX4200 GPS receiver"
-ac_help="$ac_help
- --enable-NMEA + NMEA GPS receiver"
-ac_help="$ac_help
- --enable-ONCORE + Motorola VP/UT Oncore GPS receiver"
-ac_help="$ac_help
- --enable-PALISADE + Palisade clock"
-ac_help="$ac_help
- --enable-PST + PST/Traconex 1020 WWV/WWVH receiver"
-ac_help="$ac_help
- --enable-JUPITER s Rockwell Jupiter GPS receiver"
-ac_help="$ac_help
- --enable-PTBACTS s PTB modem service"
-ac_help="$ac_help
- --enable-TPRO s KSI/Odetics TPRO/S GPS receiver/IRIG interface"
-ac_help="$ac_help
- --enable-TRAK + TRAK 8810 GPS receiver"
-ac_help="$ac_help
- --enable-CHRONOLOG + Chrono-log K-series WWVB receiver"
-ac_help="$ac_help
- --enable-DUMBCLOCK + Dumb generic hh:mm:ss local clock"
-ac_help="$ac_help
- --enable-PCF + Conrad parallel port radio clock"
-ac_help="$ac_help
- --enable-SPECTRACOM + Spectracom 8170/Netclock/2 WWVB receiver"
-ac_help="$ac_help
- --enable-TRUETIME s Kinemetrics/TrueTime receivers"
-ac_help="$ac_help
- --enable-ULINK + Ultralink WWVB receiver"
-ac_help="$ac_help
- --enable-WWV + WWV Audio receiver"
-ac_help="$ac_help
- --enable-USNO s USNO modem service"
-ac_help="$ac_help
- --enable-parse-clocks - include all suitable PARSE clocks:"
-ac_help="$ac_help
- --enable-COMPUTIME s Diem Computime Radio Clock"
-ac_help="$ac_help
- --enable-DCF7000 s ELV/DCF7000 clock"
-ac_help="$ac_help
- --enable-HOPF6021 s HOPF 6021 clock"
-ac_help="$ac_help
- --enable-MEINBERG s Meinberg clocks"
-ac_help="$ac_help
- --enable-RAWDCF s DCF77 raw time code"
-ac_help="$ac_help
- --enable-RCC8000 s RCC 8000 clock"
-ac_help="$ac_help
- --enable-SCHMID s Schmid DCF77 clock"
-ac_help="$ac_help
- --enable-TRIMTAIP s Trimble GPS receiver/TAIP protocol"
-ac_help="$ac_help
- --enable-TRIMTSIP s Trimble GPS receiver/TSIP protocol"
-ac_help="$ac_help
- --enable-WHARTON s WHARTON 400A Series clock"
-ac_help="$ac_help
- --enable-VARITEXT s VARITEXT clock"
-ac_help="$ac_help
- --enable-kmem s read /dev/kmem for tick and/or tickadj"
-ac_help="$ac_help
- --enable-accurate-adjtime
- s the adjtime() call is accurate"
-ac_help="$ac_help
- --enable-tick=VALUE s force a value for 'tick'"
-ac_help="$ac_help
- --enable-tickadj=VALUE s force a value for 'tickadj'"
-ac_help="$ac_help
- --enable-udp-wildcard s use UDP wildcard delivery"
-ac_help="$ac_help
- --enable-slew-always s always slew the time"
-ac_help="$ac_help
- --enable-step-slew s step and slew the time"
-ac_help="$ac_help
- --enable-ntpdate-step s if ntpdate should step the time"
-ac_help="$ac_help
- --enable-hourly-todr-sync
- s if we should sync TODR hourly"
-ac_help="$ac_help
- --enable-kernel-fll-bug s if we should avoid a kernel FLL bug"
+cross_compiling=no
+subdirs=
+MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# Maximum number of lines to put in a shell here document.
+# This variable seems obsolete. It should probably be removed, and
+# only ac_max_sed_lines should be used.
+: ${ac_max_here_lines=38}
+
+# Avoid depending upon Character Ranges.
+ac_cr_az='abcdefghijklmnopqrstuvwxyz'
+ac_cr_AZ='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+ac_cr_09='0123456789'
+ac_cr_alnum=$ac_cr_az$ac_cr_AZ$ac_cr_09
+
+# Sed expression to map a string onto a valid sh and CPP variable names.
+ac_tr_sh="sed y%*+%pp%;s%[^_$ac_cr_alnum]%_%g"
+ac_tr_cpp="sed y%*$ac_cr_az%P$ac_cr_AZ%;s%[^_$ac_cr_alnum]%_%g"
+
+ac_unique_file="ntpd/ntp_refclock.c"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# if HAVE_STDLIB_H
+# include <stdlib.h>
+# endif
+#endif
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+# include <memory.h>
+# endif
+# include <string.h>
+#else
+# if HAVE_STRINGS_H
+# include <strings.h>
+# endif
+#endif
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
# The variables have the same names as the options, with
# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
+cache_file=/dev/null
exec_prefix=NONE
-host=NONE
no_create=
-nonopt=NONE
no_recursion=
prefix=NONE
program_prefix=NONE
@@ -156,10 +148,15 @@ program_transform_name=s,x,x,
silent=
site=
srcdir=
-target=NONE
verbose=
x_includes=NONE
x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
bindir='${exec_prefix}/bin'
sbindir='${exec_prefix}/sbin'
libexecdir='${exec_prefix}/libexec'
@@ -173,17 +170,16 @@ oldincludedir='/usr/include'
infodir='${prefix}/info'
mandir='${prefix}/man'
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
+# Identity of this package.
+PACKAGE_NAME=
+PACKAGE_TARNAME=
+PACKAGE_VERSION=
+PACKAGE_STRING=
+PACKAGE_BUGREPORT=
ac_prev=
for ac_option
do
-
# If the previous option needs an argument, assign it.
if test -n "$ac_prev"; then
eval "$ac_prev=\$ac_option"
@@ -191,59 +187,59 @@ do
continue
fi
- case "$ac_option" in
- -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
- *) ac_optarg= ;;
- esac
+ ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
# Accept the important Cygnus configure options, so we can diagnose typos.
- case "$ac_option" in
+ case $ac_option in
-bindir | --bindir | --bindi | --bind | --bin | --bi)
ac_prev=bindir ;;
-bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
- bindir="$ac_optarg" ;;
+ bindir=$ac_optarg ;;
-build | --build | --buil | --bui | --bu)
- ac_prev=build ;;
+ ac_prev=build_alias ;;
-build=* | --build=* | --buil=* | --bui=* | --bu=*)
- build="$ac_optarg" ;;
+ build_alias=$ac_optarg ;;
-cache-file | --cache-file | --cache-fil | --cache-fi \
| --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
ac_prev=cache_file ;;
-cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
| --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
- cache_file="$ac_optarg" ;;
+ cache_file=$ac_optarg ;;
+
+ --config-cache | -C)
+ cache_file=config.cache ;;
-datadir | --datadir | --datadi | --datad | --data | --dat | --da)
ac_prev=datadir ;;
-datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
| --da=*)
- datadir="$ac_optarg" ;;
+ datadir=$ac_optarg ;;
-disable-* | --disable-*)
- ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
- fi
- ac_feature=`echo $ac_feature| sed 's/-/_/g'`
- eval "enable_${ac_feature}=no" ;;
+ expr "x$ac_feature" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ { (exit 1); exit 1; }; }
+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+ eval "enable_$ac_feature=no" ;;
-enable-* | --enable-*)
- ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
+ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
- fi
- ac_feature=`echo $ac_feature| sed 's/-/_/g'`
- case "$ac_option" in
- *=*) ;;
+ expr "x$ac_feature" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ { (exit 1); exit 1; }; }
+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+ case $ac_option in
+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
*) ac_optarg=yes ;;
esac
- eval "enable_${ac_feature}='$ac_optarg'" ;;
+ eval "enable_$ac_feature='$ac_optarg'" ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -252,95 +248,47 @@ do
-exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
| --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
| --exec=* | --exe=* | --ex=*)
- exec_prefix="$ac_optarg" ;;
+ exec_prefix=$ac_optarg ;;
-gas | --gas | --ga | --g)
# Obsolete; use --with-gas.
with_gas=yes ;;
- -help | --help | --hel | --he)
- # Omit some internal or obsolete options to make the list less imposing.
- # This message is too long to be a string in the A/UX 3.1 sh.
- cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
- --cache-file=FILE cache test results in FILE
- --help print this message
- --no-create do not create output files
- --quiet, --silent do not print \`checking...' messages
- --version print the version of autoconf that created configure
-Directory and file names:
- --prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [same as prefix]
- --bindir=DIR user executables in DIR [EPREFIX/bin]
- --sbindir=DIR system admin executables in DIR [EPREFIX/sbin]
- --libexecdir=DIR program executables in DIR [EPREFIX/libexec]
- --datadir=DIR read-only architecture-independent data in DIR
- [PREFIX/share]
- --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data in DIR
- [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var]
- --libdir=DIR object code libraries in DIR [EPREFIX/lib]
- --includedir=DIR C header files in DIR [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include]
- --infodir=DIR info documentation in DIR [PREFIX/info]
- --mandir=DIR man documentation in DIR [PREFIX/man]
- --srcdir=DIR find the sources in DIR [configure dir or ..]
- --program-prefix=PREFIX prepend PREFIX to installed program names
- --program-suffix=SUFFIX append SUFFIX to installed program names
- --program-transform-name=PROGRAM
- run sed PROGRAM on installed program names
-EOF
- cat << EOF
-Host type:
- --build=BUILD configure for building on BUILD [BUILD=HOST]
- --host=HOST configure for HOST [guessed]
- --target=TARGET configure for TARGET [TARGET=HOST]
-Features and packages:
- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --x-includes=DIR X include files are in DIR
- --x-libraries=DIR X library files are in DIR
-EOF
- if test -n "$ac_help"; then
- echo "--enable and --with options recognized:$ac_help"
- fi
- exit 0 ;;
+ -help | --help | --hel | --he | -h)
+ ac_init_help=long ;;
+ -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+ ac_init_help=recursive ;;
+ -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+ ac_init_help=short ;;
-host | --host | --hos | --ho)
- ac_prev=host ;;
+ ac_prev=host_alias ;;
-host=* | --host=* | --hos=* | --ho=*)
- host="$ac_optarg" ;;
+ host_alias=$ac_optarg ;;
-includedir | --includedir | --includedi | --included | --include \
| --includ | --inclu | --incl | --inc)
ac_prev=includedir ;;
-includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
| --includ=* | --inclu=* | --incl=* | --inc=*)
- includedir="$ac_optarg" ;;
+ includedir=$ac_optarg ;;
-infodir | --infodir | --infodi | --infod | --info | --inf)
ac_prev=infodir ;;
-infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
- infodir="$ac_optarg" ;;
+ infodir=$ac_optarg ;;
-libdir | --libdir | --libdi | --libd)
ac_prev=libdir ;;
-libdir=* | --libdir=* | --libdi=* | --libd=*)
- libdir="$ac_optarg" ;;
+ libdir=$ac_optarg ;;
-libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
| --libexe | --libex | --libe)
ac_prev=libexecdir ;;
-libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
| --libexe=* | --libex=* | --libe=*)
- libexecdir="$ac_optarg" ;;
+ libexecdir=$ac_optarg ;;
-localstatedir | --localstatedir | --localstatedi | --localstated \
| --localstate | --localstat | --localsta | --localst \
@@ -349,12 +297,12 @@ EOF
-localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
| --localstate=* | --localstat=* | --localsta=* | --localst=* \
| --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
- localstatedir="$ac_optarg" ;;
+ localstatedir=$ac_optarg ;;
-mandir | --mandir | --mandi | --mand | --man | --ma | --m)
ac_prev=mandir ;;
-mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
- mandir="$ac_optarg" ;;
+ mandir=$ac_optarg ;;
-nfp | --nfp | --nf)
# Obsolete; use --without-fp.
@@ -375,26 +323,26 @@ EOF
-oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
| --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
| --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
- oldincludedir="$ac_optarg" ;;
+ oldincludedir=$ac_optarg ;;
-prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
ac_prev=prefix ;;
-prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
- prefix="$ac_optarg" ;;
+ prefix=$ac_optarg ;;
-program-prefix | --program-prefix | --program-prefi | --program-pref \
| --program-pre | --program-pr | --program-p)
ac_prev=program_prefix ;;
-program-prefix=* | --program-prefix=* | --program-prefi=* \
| --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
- program_prefix="$ac_optarg" ;;
+ program_prefix=$ac_optarg ;;
-program-suffix | --program-suffix | --program-suffi | --program-suff \
| --program-suf | --program-su | --program-s)
ac_prev=program_suffix ;;
-program-suffix=* | --program-suffix=* | --program-suffi=* \
| --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
- program_suffix="$ac_optarg" ;;
+ program_suffix=$ac_optarg ;;
-program-transform-name | --program-transform-name \
| --program-transform-nam | --program-transform-na \
@@ -411,7 +359,7 @@ EOF
| --program-transfo=* | --program-transf=* \
| --program-trans=* | --program-tran=* \
| --progr-tra=* | --program-tr=* | --program-t=*)
- program_transform_name="$ac_optarg" ;;
+ program_transform_name=$ac_optarg ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
@@ -421,7 +369,7 @@ EOF
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
| --sbi=* | --sb=*)
- sbindir="$ac_optarg" ;;
+ sbindir=$ac_optarg ;;
-sharedstatedir | --sharedstatedir | --sharedstatedi \
| --sharedstated | --sharedstate | --sharedstat | --sharedsta \
@@ -432,58 +380,57 @@ EOF
| --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
| --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
| --sha=* | --sh=*)
- sharedstatedir="$ac_optarg" ;;
+ sharedstatedir=$ac_optarg ;;
-site | --site | --sit)
ac_prev=site ;;
-site=* | --site=* | --sit=*)
- site="$ac_optarg" ;;
+ site=$ac_optarg ;;
-srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
ac_prev=srcdir ;;
-srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
- srcdir="$ac_optarg" ;;
+ srcdir=$ac_optarg ;;
-sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
| --syscon | --sysco | --sysc | --sys | --sy)
ac_prev=sysconfdir ;;
-sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
| --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
- sysconfdir="$ac_optarg" ;;
+ sysconfdir=$ac_optarg ;;
-target | --target | --targe | --targ | --tar | --ta | --t)
- ac_prev=target ;;
+ ac_prev=target_alias ;;
-target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
- target="$ac_optarg" ;;
+ target_alias=$ac_optarg ;;
-v | -verbose | --verbose | --verbos | --verbo | --verb)
verbose=yes ;;
- -version | --version | --versio | --versi | --vers)
- echo "configure generated by autoconf version 2.13"
- exit 0 ;;
+ -version | --version | --versio | --versi | --vers | -V)
+ ac_init_version=: ;;
-with-* | --with-*)
- ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
+ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
- fi
+ expr "x$ac_package" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid package name: $ac_package" >&2
+ { (exit 1); exit 1; }; }
ac_package=`echo $ac_package| sed 's/-/_/g'`
- case "$ac_option" in
- *=*) ;;
+ case $ac_option in
+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
*) ac_optarg=yes ;;
esac
- eval "with_${ac_package}='$ac_optarg'" ;;
+ eval "with_$ac_package='$ac_optarg'" ;;
-without-* | --without-*)
- ac_package=`echo $ac_option|sed -e 's/-*without-//'`
+ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
- if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
- fi
- ac_package=`echo $ac_package| sed 's/-/_/g'`
- eval "with_${ac_package}=no" ;;
+ expr "x$ac_package" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid package name: $ac_package" >&2
+ { (exit 1); exit 1; }; }
+ ac_package=`echo $ac_package | sed 's/-/_/g'`
+ eval "with_$ac_package=no" ;;
--x)
# Obsolete; use --with-x.
@@ -494,98 +441,89 @@ EOF
ac_prev=x_includes ;;
-x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
| --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
- x_includes="$ac_optarg" ;;
+ x_includes=$ac_optarg ;;
-x-libraries | --x-libraries | --x-librarie | --x-librari \
| --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
ac_prev=x_libraries ;;
-x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
- x_libraries="$ac_optarg" ;;
+ x_libraries=$ac_optarg ;;
- -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+ -*) { echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; }
;;
+ *=*)
+ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_envvar" : ".*[^_$ac_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+ { (exit 1); exit 1; }; }
+ ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+ eval "$ac_envvar='$ac_optarg'"
+ export $ac_envvar ;;
+
*)
- if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
- echo "configure: warning: $ac_option: invalid host type" 1>&2
- fi
- if test "x$nonopt" != xNONE; then
- { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
- fi
- nonopt="$ac_option"
+ # FIXME: should be removed in autoconf 3.0.
+ echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ expr "x$ac_option" : ".*[^-._$ac_cr_alnum]" >/dev/null &&
+ echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
;;
esac
done
if test -n "$ac_prev"; then
- { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
+ ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+ { echo "$as_me: error: missing argument to $ac_option" >&2
+ { (exit 1); exit 1; }; }
fi
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
- exec 6>/dev/null
-else
- exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+ localstatedir libdir includedir oldincludedir infodir mandir \
+ exec_prefix prefix
do
- case "$ac_arg" in
- -no-create | --no-create | --no-creat | --no-crea | --no-cre \
- | --no-cr | --no-c) ;;
- -no-recursion | --no-recursion | --no-recursio | --no-recursi \
- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
- ac_configure_args="$ac_configure_args '$ac_arg'" ;;
- *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+ eval ac_val=$`echo $ac_var`
+ case $ac_val in
+ [\\/$]* | ?:[\\/]* ) ;;
+ NONE ) ;;
+ *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
+ { (exit 1); exit 1; }; };;
esac
done
-# NLS nuisances.
-# Only set these to C if already set. These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}" = set; then LANG=C; export LANG; fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: should be removed in autoconf 3.0.
+if test "x$host_alias" != x; then
+ if test "x$build_alias" = x; then
+ cross_compiling=maybe
+ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+ If a cross compiler is detected then cross compile mode will be used." >&2
+ elif test "x$build_alias" != "x$host_alias"; then
+ cross_compiling=yes
+ fi
+fi
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=ntpd/ntp_refclock.c
+test "$silent" = yes && exec 6>/dev/null
# Find the source files, if location was not specified.
if test -z "$srcdir"; then
ac_srcdir_defaulted=yes
# Try the directory containing this script, then its parent.
ac_prog=$0
- ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
+ ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'`
test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
srcdir=$ac_confdir
if test ! -r $srcdir/$ac_unique_file; then
@@ -596,13 +534,383 @@ else
fi
if test ! -r $srcdir/$ac_unique_file; then
if test "$ac_srcdir_defaulted" = yes; then
- { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
+ { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2
+ { (exit 1); exit 1; }; }
else
- { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+ { echo "$as_me: error: cannot find sources in $srcdir" >&2
+ { (exit 1); exit 1; }; }
fi
fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ac_env_build_alias_set=${build_alias+set}
+ac_env_build_alias_value=$build_alias
+ac_cv_env_build_alias_set=${build_alias+set}
+ac_cv_env_build_alias_value=$build_alias
+ac_env_host_alias_set=${host_alias+set}
+ac_env_host_alias_value=$host_alias
+ac_cv_env_host_alias_set=${host_alias+set}
+ac_cv_env_host_alias_value=$host_alias
+ac_env_target_alias_set=${target_alias+set}
+ac_env_target_alias_value=$target_alias
+ac_cv_env_target_alias_set=${target_alias+set}
+ac_cv_env_target_alias_value=$target_alias
+ac_env_CC_set=${CC+set}
+ac_env_CC_value=$CC
+ac_cv_env_CC_set=${CC+set}
+ac_cv_env_CC_value=$CC
+ac_env_CFLAGS_set=${CFLAGS+set}
+ac_env_CFLAGS_value=$CFLAGS
+ac_cv_env_CFLAGS_set=${CFLAGS+set}
+ac_cv_env_CFLAGS_value=$CFLAGS
+ac_env_LDFLAGS_set=${LDFLAGS+set}
+ac_env_LDFLAGS_value=$LDFLAGS
+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+ac_cv_env_LDFLAGS_value=$LDFLAGS
+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_env_CPPFLAGS_value=$CPPFLAGS
+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ac_env_CPP_set=${CPP+set}
+ac_env_CPP_value=$CPP
+ac_cv_env_CPP_set=${CPP+set}
+ac_cv_env_CPP_value=$CPP
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+ # Omit some internal or obsolete options to make the list less imposing.
+ # This message is too long to be a string in the A/UX 3.1 sh.
+ cat <<EOF
+\`configure' configures this package to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE. See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+ -h, --help display this help and exit
+ --help=short display options specific to this package
+ --help=recursive display the short help of all the included packages
+ -V, --version display version information and exit
+ -q, --quiet, --silent do not print \`checking...' messages
+ --cache-file=FILE cache test results in FILE [disabled]
+ -C, --config-cache alias for \`--cache-file=config.cache'
+ -n, --no-create do not create output files
+ --srcdir=DIR find the sources in DIR [configure dir or \`..']
+
+EOF
+
+ cat <<EOF
+Installation directories:
+ --prefix=PREFIX install architecture-independent files in PREFIX
+ [$ac_default_prefix]
+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
+ [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+ --bindir=DIR user executables [EPREFIX/bin]
+ --sbindir=DIR system admin executables [EPREFIX/sbin]
+ --libexecdir=DIR program executables [EPREFIX/libexec]
+ --datadir=DIR read-only architecture-independent data [PREFIX/share]
+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --libdir=DIR object code libraries [EPREFIX/lib]
+ --includedir=DIR C header files [PREFIX/include]
+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
+ --infodir=DIR info documentation [PREFIX/info]
+ --mandir=DIR man documentation [PREFIX/man]
+EOF
+
+ cat <<\EOF
+
+Program names:
+ --program-prefix=PREFIX prepend PREFIX to installed program names
+ --program-suffix=SUFFIX append SUFFIX to installed program names
+ --program-transform-name=PROGRAM run sed PROGRAM on installed program names
+
+System types:
+ --build=BUILD configure for building on BUILD [guessed]
+ --host=HOST build programs to run on HOST [BUILD]
+ --target=TARGET configure for building compilers for TARGET [HOST]
+EOF
+fi
+
+if test -n "$ac_init_help"; then
+
+ cat <<\EOF
+
+Optional Features:
+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --disable-dependency-tracking Speeds up one-time builds
+ --enable-dependency-tracking Do not reject slow dependency extractors
+ --enable-debugging + include debugging code
+ --enable-dst-minutes=60 + minutes per DST adjustment
+ --enable-HOPFSERIAL + hopf serial clock device
+ --enable-HOPFPCI + hopf 6039 PCI board
+ --enable-BANCOMM - Datum/Bancomm bc635/VME interface
+ --enable-GPSVME - TrueTime GPS receiver/VME interface
+ --enable-SHM - SHM clock attached thru shared memory
+ --enable-all-clocks + include all suitable non-PARSE clocks:
+ --enable-ACTS + ACTS modem service
+ --enable-ARBITER + Arbiter 1088A/B GPS receiver
+ --enable-ARCRON-MSF + Arcron MSF receiver
+ --enable-ATOM s ATOM PPS interface
+ --enable-AS2201 + Austron 2200A/2201A GPS receiver
+ --enable-CHU - CHU modem/decoder
+ --enable-AUDIO-CHU s CHU audio/decoder
+ --enable-DATUM s Datum Programmable Time System
+ --enable-FG + Forum Graphic GPS
+ --enable-HEATH s Heath GC-1000 WWV/WWVH receiver
+ --enable-HPGPS + HP 58503A GPS receiver
+ --enable-IRIG s Sun IRIG audio decoder
+ --enable-LEITCH + Leitch CSD 5300 Master Clock System Driver
+ --enable-LOCAL-CLOCK + local clock reference
+ --enable-MSFEES + EES M201 MSF receiver
+ --enable-MX4200 s Magnavox MX4200 GPS receiver
+ --enable-NMEA + NMEA GPS receiver
+ --enable-ONCORE s Motorola VP/UT Oncore GPS receiver
+ --enable-PALISADE + Palisade clock
+ --enable-PST + PST/Traconex 1020 WWV/WWVH receiver
+ --enable-JUPITER s Rockwell Jupiter GPS receiver
+ --enable-PTBACTS s PTB modem service
+ --enable-TPRO s KSI/Odetics TPRO/S GPS receiver/IRIG interface
+ --enable-TRAK + TRAK 8810 GPS receiver
+ --enable-CHRONOLOG + Chrono-log K-series WWVB receiver
+ --enable-DUMBCLOCK + Dumb generic hh:mm:ss local clock
+ --enable-PCF + Conrad parallel port radio clock
+ --enable-SPECTRACOM + Spectracom 8170/Netclock/2 WWVB receiver
+ --enable-TRUETIME s Kinemetrics/TrueTime receivers
+ --enable-ULINK + Ultralink WWVB receiver
+ --enable-WWV + WWV Audio receiver
+ --enable-USNO s USNO modem service
+ --enable-parse-clocks - include all suitable PARSE clocks:
+ --enable-COMPUTIME s Diem Computime Radio Clock
+ --enable-DCF7000 s ELV/DCF7000 clock
+ --enable-HOPF6021 s HOPF 6021 clock
+ --enable-MEINBERG s Meinberg clocks
+ --enable-RAWDCF s DCF77 raw time code
+ --enable-RCC8000 s RCC 8000 clock
+ --enable-SCHMID s Schmid DCF77 clock
+ --enable-TRIMTAIP s Trimble GPS receiver/TAIP protocol
+ --enable-TRIMTSIP s Trimble GPS receiver/TSIP protocol
+ --enable-WHARTON s WHARTON 400A Series clock
+ --enable-VARITEXT s VARITEXT clock
+ --enable-kmem s read /dev/kmem for tick and/or tickadj
+ --enable-accurate-adjtime
+ s the adjtime() call is accurate
+ --enable-tick=VALUE s force a value for 'tick'
+ --enable-tickadj=VALUE s force a value for 'tickadj'
+ --enable-udp-wildcard s use UDP wildcard delivery
+ --enable-slew-always s always slew the time
+ --enable-step-slew s step and slew the time
+ --enable-ntpdate-step s if ntpdate should step the time
+ --enable-hourly-todr-sync
+ s if we should sync TODR hourly
+ --enable-kernel-fll-bug s if we should avoid a kernel FLL bug
+
+Optional Packages:
+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-openssl-libdir + =/something/reasonable
+ --with-openssl-incdir + =/something/reasonable
+ --with-crypto + ={autokey,rsaref}
+ --with-electricfence - compile with ElectricFence malloc debugger
+
+Some influential environment variables:
+ CC C compiler command
+ CFLAGS C compiler flags
+ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
+ nonstandard directory <lib dir>
+ CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
+ headers in a nonstandard directory <include dir>
+ CPP C preprocessor
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+EOF
+fi
+
+if test "$ac_init_help" = "recursive"; then
+ # If there are subdirs, report their specific --help.
+ ac_popdir=`pwd`
+ for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue
+ cd $ac_subdir
+ # A "../" for each directory in /$ac_subdir.
+ ac_dots=`echo $ac_subdir |
+ sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
+
+ case $srcdir in
+ .) # No --srcdir option. We are building in place.
+ ac_sub_srcdir=$srcdir ;;
+ [\\/]* | ?:[\\/]* ) # Absolute path.
+ ac_sub_srcdir=$srcdir/$ac_subdir ;;
+ *) # Relative path.
+ ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
+ esac
+
+ # Check for guested configure; otherwise get Cygnus style configure.
+ if test -f $ac_sub_srcdir/configure.gnu; then
+ echo
+ $SHELL $ac_sub_srcdir/configure.gnu --help=recursive
+ elif test -f $ac_sub_srcdir/configure; then
+ echo
+ $SHELL $ac_sub_srcdir/configure --help=recursive
+ elif test -f $ac_sub_srcdir/configure.ac ||
+ test -f $ac_sub_srcdir/configure.in; then
+ echo
+ $ac_configure --help
+ else
+ echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2
+ fi
+ cd $ac_popdir
+ done
+fi
+
+test -n "$ac_init_help" && exit 0
+if $ac_init_version; then
+ cat <<\EOF
+
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+EOF
+ exit 0
+fi
+exec 5>config.log
+cat >&5 <<EOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by $as_me, which was
+generated by GNU Autoconf 2.50. Invocation command line was
+
+ $ $0 $@
+
+EOF
+{
+cat <<_ASUNAME
+## ---------- ##
+## Platform. ##
+## ---------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
+
+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
+
+PATH = $PATH
+
+_ASUNAME
+} >&5
+
+cat >&5 <<EOF
+## ------------ ##
+## Core tests. ##
+## ------------ ##
+
+EOF
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Also quote any args containing shell meta-characters.
+ac_configure_args=
+ac_sep=
+for ac_arg
+do
+ case $ac_arg in
+ -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+ | --no-cr | --no-c) ;;
+ -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
+ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+ ac_sep=" " ;;
+ *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg"
+ ac_sep=" " ;;
+ esac
+ # Get rid of the leading space.
+done
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log. We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+trap 'exit_status=$?
+ # Save into config.log some information that might help in debugging.
+ echo >&5
+ echo "## ----------------- ##" >&5
+ echo "## Cache variables. ##" >&5
+ echo "## ----------------- ##" >&5
+ echo >&5
+ # The following way of writing the cache mishandles newlines in values,
+{
+ (set) 2>&1 |
+ case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+ *ac_space=\ *)
+ sed -n \
+ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+ s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+ ;;
+ *)
+ sed -n \
+ "s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ ;;
+ esac;
+} >&5
+ sed "/^$/d" confdefs.h >conftest.log
+ if test -s conftest.log; then
+ echo >&5
+ echo "## ------------ ##" >&5
+ echo "## confdefs.h. ##" >&5
+ echo "## ------------ ##" >&5
+ echo >&5
+ cat conftest.log >&5
+ fi
+ (echo; echo) >&5
+ test "$ac_signal" != 0 &&
+ echo "$as_me: caught signal $ac_signal" >&5
+ echo "$as_me: exit $exit_status" >&5
+ rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files &&
+ exit $exit_status
+ ' 0
+for ac_signal in 1 2 13 15; do
+ trap 'ac_status=$?; ac_signal='$ac_signal'; { (exit $ac_status); exit $ac_status; }' $ac_signal
+done
+ac_signal=0
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo >confdefs.h
+
+# Let the site file select an alternate cache file if it wants to.
# Prefer explicitly selected file to automatically selected ones.
if test -z "$CONFIG_SITE"; then
if test "x$prefix" != xNONE; then
@@ -613,40 +921,94 @@ if test -z "$CONFIG_SITE"; then
fi
for ac_site_file in $CONFIG_SITE; do
if test -r "$ac_site_file"; then
- echo "loading site script $ac_site_file"
+ { echo "$as_me:924: loading site script $ac_site_file" >&5
+echo "$as_me: loading site script $ac_site_file" >&6;}
+ cat "$ac_site_file" >&5
. "$ac_site_file"
fi
done
if test -r "$cache_file"; then
- echo "loading cache $cache_file"
- . $cache_file
+ # Some versions of bash will fail to source /dev/null (special
+ # files actually), so we avoid doing that.
+ if test -f "$cache_file"; then
+ { echo "$as_me:935: loading cache $cache_file" >&5
+echo "$as_me: loading cache $cache_file" >&6;}
+ case $cache_file in
+ [\\/]* | ?:[\\/]* ) . $cache_file;;
+ *) . ./$cache_file;;
+ esac
+ fi
else
- echo "creating cache $cache_file"
- > $cache_file
+ { echo "$as_me:943: creating cache $cache_file" >&5
+echo "$as_me: creating cache $cache_file" >&6;}
+ >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_suggest_removing_cache=false
+for ac_var in `(set) 2>&1 |
+ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+ eval ac_old_set=\$ac_cv_env_${ac_var}_set
+ eval ac_new_set=\$ac_env_${ac_var}_set
+ eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+ eval ac_new_val="\$ac_env_${ac_var}_value"
+ case $ac_old_set,$ac_new_set in
+ set,)
+ { echo "$as_me:959: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+echo "$as_me: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ ac_suggest_removing_cache=: ;;
+ ,set)
+ { echo "$as_me:963: WARNING: \`$ac_var' was not set in the previous run" >&5
+echo "$as_me: WARNING: \`$ac_var' was not set in the previous run" >&2;}
+ ac_suggest_removing_cache=: ;;
+ ,);;
+ *)
+ if test "x$ac_old_val" != "x$ac_new_val"; then
+ { echo "$as_me:969: WARNING: \`$ac_var' has changed since the previous run:" >&5
+echo "$as_me: WARNING: \`$ac_var' has changed since the previous run:" >&2;}
+ { echo "$as_me:971: WARNING: former value: $ac_old_val" >&5
+echo "$as_me: WARNING: former value: $ac_old_val" >&2;}
+ { echo "$as_me:973: WARNING: current value: $ac_new_val" >&5
+echo "$as_me: WARNING: current value: $ac_new_val" >&2;}
+ ac_suggest_removing_cache=:
+ fi;;
+ esac
+done
+if $ac_suggest_removing_cache; then
+ { echo "$as_me:980: WARNING: changes in the environment can compromise the build" >&5
+echo "$as_me: WARNING: changes in the environment can compromise the build" >&2;}
+ { echo "$as_me:982: WARNING: consider removing $cache_file and starting over" >&5
+echo "$as_me: WARNING: consider removing $cache_file and starting over" >&2;}
fi
ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
- # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
- if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
- ac_n= ac_c='
-' ac_t=' '
- else
- ac_n=-n ac_c= ac_t=
- fi
-else
- ac_n= ac_c='\c' ac_t=
-fi
-
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+ *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T=' ' ;;
+ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+ *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+echo "#! $SHELL" >conftest.sh
+echo "exit 0" >>conftest.sh
+chmod +x conftest.sh
+if { (echo "$as_me:1001: PATH=\".;.\"; conftest.sh") >&5
+ (PATH=".;."; conftest.sh) 2>&5
+ ac_status=$?
+ echo "$as_me:1004: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ ac_path_separator=';'
+else
+ ac_path_separator=:
+fi
+PATH_SEPARATOR="$ac_path_separator"
+rm -f conftest.sh
ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@ -658,129 +1020,126 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install.sh -c"
break
+ elif test -f $ac_dir/shtool; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/shtool install -c"
+ break
fi
done
if test -z "$ac_aux_dir"; then
- { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
+ { { echo "$as_me:1030: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+ { (exit 1); exit 1; }; }
fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-# configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-# same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-# as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
+# Make sure we can run config.sub.
+$ac_config_sub sun4 >/dev/null 2>&1 ||
+ { { echo "$as_me:1040: error: cannot run $ac_config_sub" >&5
+echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+ { (exit 1); exit 1; }; }
+
+echo "$as_me:1044: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6
+if test "${ac_cv_build+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_build_alias=$build_alias
+test -z "$ac_cv_build_alias" &&
+ ac_cv_build_alias=`$ac_config_guess`
+test -z "$ac_cv_build_alias" &&
+ { { echo "$as_me:1053: error: cannot guess build type; you must specify one" >&5
+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+ { (exit 1); exit 1; }; }
+ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+ { { echo "$as_me:1057: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
+ { (exit 1); exit 1; }; }
+
+fi
+echo "$as_me:1062: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6
+build=$ac_cv_build
+build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+echo "$as_me:1069: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6
+if test "${ac_cv_host+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_host_alias=$host_alias
+test -z "$ac_cv_host_alias" &&
+ ac_cv_host_alias=$ac_cv_build_alias
+ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+ { { echo "$as_me:1078: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+
+fi
+echo "$as_me:1083: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6
+host=$ac_cv_host
+host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+echo "$as_me:1090: checking target system type" >&5
+echo $ECHO_N "checking target system type... $ECHO_C" >&6
+if test "${ac_cv_target+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_target_alias=$target_alias
+test "x$ac_cv_target_alias" = "x" &&
+ ac_cv_target_alias=$ac_cv_host_alias
+ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
+ { { echo "$as_me:1099: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+
+fi
+echo "$as_me:1104: result: $ac_cv_target" >&5
+echo "${ECHO_T}$ac_cv_target" >&6
+target=$ac_cv_target
+target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
# The aliases save the names the user supplied, while $host etc.
# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:699: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
- case $nonopt in
- NONE)
- if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
- else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
- fi ;;
- *) host_alias=$nonopt ;;
- esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:720: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
- case $nonopt in
- NONE) target_alias=$host_alias ;;
- *) target_alias=$nonopt ;;
- esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:738: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
- case $nonopt in
- NONE) build_alias=$host_alias ;;
- *) build_alias=$nonopt ;;
- esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
+test -n "$target_alias" &&
test "$program_prefix$program_suffix$program_transform_name" = \
NONENONEs,x,x, &&
program_prefix=${target_alias}-
-
-cat >> confdefs.h <<EOF
+cat >>confdefs.h <<EOF
#define STR_SYSTEM "$target"
EOF
+ac_config_headers="$ac_config_headers config.h"
-
+ ac_config_commands="$ac_config_commands default-1"
if test "$program_transform_name" = s,x,x,; then
program_transform_name=
else
# Double any \ or $. echo might interpret backslashes.
- cat <<\EOF_SED > conftestsed
+ cat <<\EOF >conftest.sed
s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
- program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
- rm -f conftestsed
+EOF
+ program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+ rm -f conftest.sed
fi
test "$program_prefix" != NONE &&
- program_transform_name="s,^,${program_prefix},; $program_transform_name"
+ program_transform_name="s,^,${program_prefix},;$program_transform_name"
# Use a double $ so make ignores it.
test "$program_suffix" != NONE &&
- program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
+ program_transform_name="s,\$\$,${program_suffix},;$program_transform_name"
# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
+test -z "$program_transform_name" && program_transform_name="s,x,x,"
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -789,31 +1148,39 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x,"
# SunOS /usr/etc/install
# IRIX /sbin/install
# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:798: checking for a BSD compatible install" >&5
+echo "$as_me:1156: checking for a BSD compatible install" >&5
+echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+if test "${ac_cv_path_install+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
for ac_dir in $PATH; do
+ IFS=$ac_save_IFS
# Account for people who put trailing slashes in PATH elements.
- case "$ac_dir/" in
- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+ case $ac_dir/ in
+ / | ./ | .// | /cC/* \
+ | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \
+ | /usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
# Don't use installbsd from OSF since it installs stuff as root
# by default.
for ac_prog in ginstall scoinst install; do
- if test -f $ac_dir/$ac_prog; then
+ if $as_executable_p "$ac_dir/$ac_prog"; then
if test $ac_prog = install &&
- grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+ grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
:
+ elif test $ac_prog = install &&
+ grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then
+ # program-specific install script used by HP pwplus--don't use.
+ :
else
ac_cv_path_install="$ac_dir/$ac_prog -c"
break 2
@@ -823,145 +1190,157 @@ else
;;
esac
done
- IFS="$ac_save_IFS"
fi
if test "${ac_cv_path_install+set}" = set; then
- INSTALL="$ac_cv_path_install"
+ INSTALL=$ac_cv_path_install
else
# As a last resort, use the slow shell script. We don't cache a
# path for INSTALL within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the path is relative.
- INSTALL="$ac_install_sh"
+ INSTALL=$ac_install_sh
fi
fi
-echo "$ac_t""$INSTALL" 1>&6
+echo "$as_me:1205: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:851: checking whether build environment is sane" >&5
+echo "$as_me:1216: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
# Just in case
sleep 1
-echo timestamp > conftestfile
+echo timestamp > conftest.file
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
if test "$*" = "X"; then
# -L didn't work.
- set X `ls -t $srcdir/configure conftestfile`
+ set X `ls -t $srcdir/configure conftest.file`
fi
- if test "$*" != "X $srcdir/configure conftestfile" \
- && test "$*" != "X conftestfile $srcdir/configure"; then
+ if test "$*" != "X $srcdir/configure conftest.file" \
+ && test "$*" != "X conftest.file $srcdir/configure"; then
# If neither matched, then we have a broken ls. This can happen
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
- { echo "configure: error: ls -t appears to fail. Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
+ { { echo "$as_me:1239: error: ls -t appears to fail. Make sure there is not a broken
+alias in your environment" >&5
+echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
+alias in your environment" >&2;}
+ { (exit 1); exit 1; }; }
fi
- test "$2" = conftestfile
+ test "$2" = conftest.file
)
then
# Ok.
:
else
- { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
+ { { echo "$as_me:1252: error: newly created file is older than distributed files!
+Check your system clock" >&5
+echo "$as_me: error: newly created file is older than distributed files!
+Check your system clock" >&2;}
+ { (exit 1); exit 1; }; }
fi
rm -f conftest*
-echo "$ac_t""yes" 1>&6
-
-test x"${MISSING+set}" = xset || \
- MISSING="\${SHELL} `CDPATH=: && cd $ac_aux_dir && pwd`/missing"
+echo "$as_me:1259: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+test x"${MISSING+set}" = xset ||
+ MISSING="\${SHELL} `CDPATH=:; cd $ac_aux_dir && pwd`/missing"
+# Use eval to expand $SHELL
if eval "$MISSING --run :"; then
am_missing_run="$MISSING --run "
else
am_missing_run=
- echo "configure: warning: \`missing' script is too old or missing" 1>&2
+ am_backtick='`'
+ { echo "$as_me:1269: WARNING: ${am_backtick}missing' script is too old or missing" >&5
+echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;}
fi
for ac_prog in mawk gawk nawk awk
do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:903: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1277: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AWK+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$AWK"; then
ac_cv_prog_AWK="$AWK" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_AWK="$ac_prog"
- break
- fi
- done
- IFS="$ac_save_ifs"
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_AWK="$ac_prog"
+echo "$as_me:1292: found $ac_dir/$ac_word" >&5
+break
+done
+
fi
fi
-AWK="$ac_cv_prog_AWK"
+AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
- echo "$ac_t""$AWK" 1>&6
+ echo "$as_me:1300: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:1303: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
-test -n "$AWK" && break
+ test -n "$AWK" && break
done
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:933: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1310: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat > conftestmake <<\EOF
+ cat >conftest.make <<\EOF
all:
@echo 'ac_maketemp="${MAKE}"'
EOF
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
if test -n "$ac_maketemp"; then
eval ac_cv_prog_make_${ac_make}_set=yes
else
eval ac_cv_prog_make_${ac_make}_set=no
fi
-rm -f conftestmake
+rm -f conftest.make
fi
if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
- echo "$ac_t""yes" 1>&6
+ echo "$as_me:1330: result: yes" >&5
+echo "${ECHO_T}yes" >&6
SET_MAKE=
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:1334: result: no" >&5
+echo "${ECHO_T}no" >&6
SET_MAKE="MAKE=${MAKE-make}"
fi
-
# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
if test "${enable_dependency_tracking+set}" = set; then
enableval="$enable_dependency_tracking"
- :
-fi
+fi;
if test "x$enable_dependency_tracking" = xno; then
AMDEP="#"
else
@@ -979,293 +1358,648 @@ else
AMDEPBACKSLASH=
fi
-
-
-
-
if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then
DEPDIR=.deps
+ # We redirect because .deps might already exist and be populated.
+ # In this situation we don't want to see an error.
+ rmdir .deps > /dev/null 2>&1
else
DEPDIR=_deps
fi
+# test to see if srcdir already configured
+if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
+ test -f $srcdir/config.status; then
+ { { echo "$as_me:1373: error: source directory already configured; run \"make distclean\" there first" >&5
+echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+ { (exit 1); exit 1; }; }
+fi
-
-
+# Define the identity of the package.
PACKAGE=ntp
+VERSION=4.1.0
-VERSION=4.0.99b
-
-if test "`CDPATH=: && cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
+cat >>confdefs.h <<EOF
#define PACKAGE "$PACKAGE"
EOF
-cat >> confdefs.h <<EOF
+cat >>confdefs.h <<EOF
#define VERSION "$VERSION"
EOF
+# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
+# the ones we care about.
-
-
+# Some tools Automake needs.
ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"}
-
-
AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"}
-
-
AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-
AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-
if test -z "$install_sh"; then
- install_sh="$ac_aux_dir/install-sh"
- test -f "$install_sh" || install_sh="$ac_aux_dir/install.sh"
- test -f "$install_sh" || install_sh="${am_missing_run}${ac_auxdir}/install-sh"
- install_sh="`echo $install_sh | sed -e 's/\${SHELL}//'`"
-fi
-
-
-
-
+ for install_sh in "$ac_aux_dir/install-sh" \
+ "$ac_aux_dir/install.sh" \
+ "${am_missing_run}${ac_auxdir}/install-sh";
+ do
+ test -f "$install_sh" && break
+ done
+ # FIXME: an evil hack: we remove the SHELL invocation from
+ # install_sh because automake adds it back in. Sigh.
+ install_sh=`echo $install_sh | sed -e 's/\${SHELL}//'`
+fi
+
+# We'd like to do this but we can't because it will unconditionally
+# require config.guess. One way would be if autoconf had the capability
+# to let us compile in this code only when config.guess was already
+# a possibility.
+#if test "$cross_compiling" != no; then
+# # since we are cross-compiling, we need to check for a suitable `strip'
+# AM_PROG_STRIP
+# if test -z "$STRIP"; then
+# AC_MSG_WARN([strip missing, install-strip will not strip binaries])
+# fi
+#fi
+
+# If $STRIP is defined (either by the user, or by AM_PROG_STRIP),
+# instruct install-strip to use install-sh and the given $STRIP program.
+# Otherwise, just use ${INSTALL}: the idea is to use the vendor install
+# as much as possible, because it's faster.
+if test -z "$STRIP"; then
+ # The top level make will set INSTALL_PROGRAM=$(INSTALL_STRIP_PROGRAM)
+ # and the double dolard below is there to make sure that ${INSTALL}
+ # is substitued in the sub-makes, not at the top-level; this is
+ # needed if ${INSTALL} is a relative path (ajusted in each subdirectory
+ # by config.status).
+ INSTALL_STRIP_PROGRAM='$${INSTALL} -s'
+ INSTALL_STRIP_PROGRAM_ENV=''
+else
+ _am_dirpart="`echo $install_sh | sed -e 's,//*[^/]*$,,'`"
+ INSTALL_STRIP_PROGRAM="\${SHELL} \`CDPATH=: && cd $_am_dirpart && pwd\`/install-sh -c -s"
+ INSTALL_STRIP_PROGRAM_ENV="STRIPPROG='\$(STRIP)'"
+fi
+
+# We need awk for the "check" target. The system "awk" is bad on
+# some platforms.
+ac_cv_var_oncore_ok=no
+ac_cv_var_atom_ok=no
-
+iCFLAGS="$CFLAGS"
-
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+echo "$as_me:1465: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_CC="${ac_tool_prefix}gcc"
+echo "$as_me:1480: found $ac_dir/$ac_word" >&5
+break
+done
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ echo "$as_me:1488: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+ echo "$as_me:1491: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+fi
+if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+echo "$as_me:1500: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_CC="gcc"
+echo "$as_me:1515: found $ac_dir/$ac_word" >&5
+break
+done
-ac_cv_var_oncore_ok=no
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ echo "$as_me:1523: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+ echo "$as_me:1526: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
-iCFLAGS="$CFLAGS"
+ CC=$ac_ct_CC
+else
+ CC="$ac_cv_prog_CC"
+fi
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1065: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+echo "$as_me:1539: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_CC="gcc"
- break
- fi
- done
- IFS="$ac_save_ifs"
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_CC="${ac_tool_prefix}cc"
+echo "$as_me:1554: found $ac_dir/$ac_word" >&5
+break
+done
+
fi
fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$ac_t""$CC" 1>&6
+ echo "$as_me:1562: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:1565: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
+fi
+if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo "$as_me:1574: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_CC="cc"
+echo "$as_me:1589: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ echo "$as_me:1597: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+ echo "$as_me:1600: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ CC=$ac_ct_CC
+else
+ CC="$ac_cv_prog_CC"
+fi
+
+fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:1613: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
ac_prog_rejected=no
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
- fi
- ac_cv_prog_CC="cc"
- break
- fi
- done
- IFS="$ac_save_ifs"
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+fi
+ac_cv_prog_CC="cc"
+echo "$as_me:1633: found $ac_dir/$ac_word" >&5
+break
+done
+
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
set dummy $ac_cv_prog_CC
shift
- if test $# -gt 0; then
+ if test $# != 0; then
# We chose a different compiler from the bogus one.
# However, it has the same basename, so the bogon will be chosen
# first if we set CC to just the basename; use the full file name.
shift
- set dummy "$ac_dir/$ac_word" "$@"
+ set dummy "$ac_dir/$ac_word" ${1+"$@"}
shift
ac_cv_prog_CC="$@"
fi
fi
fi
fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$ac_t""$CC" 1>&6
+ echo "$as_me:1655: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:1658: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
- if test -z "$CC"; then
- case "`uname -s`" in
- *win32* | *WIN32*)
- # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1146: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+fi
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in cl
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+echo "$as_me:1669: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_CC="cl"
- break
- fi
- done
- IFS="$ac_save_ifs"
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+echo "$as_me:1684: found $ac_dir/$ac_word" >&5
+break
+done
+
fi
fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$ac_t""$CC" 1>&6
+ echo "$as_me:1692: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:1695: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
- ;;
- esac
- fi
- test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+
+ test -n "$CC" && break
+ done
fi
+if test -z "$CC"; then
+ ac_ct_CC=$CC
+ for ac_prog in cl
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:1708: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_CC="$ac_prog"
+echo "$as_me:1723: found $ac_dir/$ac_word" >&5
+break
+done
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1178: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ echo "$as_me:1731: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+ echo "$as_me:1734: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+ test -n "$ac_ct_CC" && break
+done
+
+ CC=$ac_ct_CC
+fi
-cat > conftest.$ac_ext << EOF
+fi
-#line 1189 "configure"
+test -z "$CC" && { { echo "$as_me:1746: error: no acceptable cc found in \$PATH" >&5
+echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
+ { (exit 1); exit 1; }; }
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 1751 "configure"
#include "confdefs.h"
-main(){return(0);}
-EOF
-if { (eval echo configure:1194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- ac_cv_prog_cc_works=yes
- # If we can't run a trivial program, we are probably using a cross compiler.
- if (./conftest; exit) 2>/dev/null; then
- ac_cv_prog_cc_cross=no
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.exe"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compiler, and finding out an intuition
+# of exeext.
+echo "$as_me:1767: checking for C compiler default output" >&5
+echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+if { (eval echo "$as_me:1770: \"$ac_link_default\"") >&5
+ (eval $ac_link_default) 2>&5
+ ac_status=$?
+ echo "$as_me:1773: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ for ac_file in `ls a.exe conftest.exe a.* conftest conftest.* 2>/dev/null`; do
+ case $ac_file in
+ *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
+ a.out ) # We found the default executable, but exeext='' is most
+ # certainly right.
+ break;;
+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ export ac_cv_exeext
+ break;;
+ * ) break;;
+ esac
+done
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+{ { echo "$as_me:1790: error: C compiler cannot create executables" >&5
+echo "$as_me: error: C compiler cannot create executables" >&2;}
+ { (exit 77); exit 77; }; }
+fi
+
+ac_exeext=$ac_cv_exeext
+echo "$as_me:1796: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6
+
+# Check the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
+echo "$as_me:1801: checking whether the C compiler works" >&5
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+# If not cross compiling, check that we can run a simple program.
+if test "$cross_compiling" != yes; then
+ if { ac_try='./$ac_file'
+ { (eval echo "$as_me:1807: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:1810: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cross_compiling=no
else
- ac_cv_prog_cc_cross=yes
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+ { { echo "$as_me:1817: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'." >&5
+echo "$as_me: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
fi
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- ac_cv_prog_cc_works=no
fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
- { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1220: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1225: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.c <<EOF
-#ifdef __GNUC__
- yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1234: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
- ac_cv_prog_gcc=yes
+echo "$as_me:1825: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+rm -f a.out a.exe conftest$ac_cv_exeext
+ac_clean_files=$ac_clean_files_save
+# Check the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
+echo "$as_me:1832: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+echo "$as_me:1834: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6
+
+echo "$as_me:1837: checking for executable suffix" >&5
+echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+if { (eval echo "$as_me:1839: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:1842: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
+ case $ac_file in
+ *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ export ac_cv_exeext
+ break;;
+ * ) break;;
+ esac
+done
else
- ac_cv_prog_gcc=no
-fi
+ { { echo "$as_me:1858: error: cannot compute EXEEXT: cannot compile and link" >&5
+echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
+ { (exit 1); exit 1; }; }
fi
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+rm -f conftest$ac_cv_exeext
+echo "$as_me:1864: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6
-if test $ac_cv_prog_gcc = yes; then
- GCC=yes
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+echo "$as_me:1870: checking for object suffix" >&5
+echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
+if test "${ac_cv_objext+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- GCC=
+ cat >conftest.$ac_ext <<_ACEOF
+#line 1876 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { (eval echo "$as_me:1888: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:1891: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
+ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+ break;;
+ esac
+done
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+{ { echo "$as_me:1903: error: cannot compute OBJEXT: cannot compile" >&5
+echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
+ { (exit 1); exit 1; }; }
fi
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1253: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+echo "$as_me:1910: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+echo "$as_me:1914: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+ cat >conftest.$ac_ext <<_ACEOF
+#line 1920 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+#ifndef __GNUC__
+ choke me
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1935: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:1938: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:1941: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:1944: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_compiler_gnu=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_compiler_gnu=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+echo "$as_me:1956: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+GCC=`test $ac_compiler_gnu = yes && echo yes`
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+CFLAGS="-g"
+echo "$as_me:1962: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_g+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 1968 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1980: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:1983: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:1986: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:1989: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_prog_cc_g=yes
else
- ac_cv_prog_cc_g=no
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_prog_cc_g=no
fi
-rm -f conftest*
-
+rm -f conftest.$ac_objext conftest.$ac_ext
fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+echo "$as_me:1999: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
if test "$ac_test_CFLAGS" = set; then
- CFLAGS="$ac_save_CFLAGS"
+ CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
if test "$GCC" = yes; then
CFLAGS="-g -O2"
@@ -1279,108 +2013,367 @@ else
CFLAGS=
fi
fi
+# Some people use a C++ compiler to compile C. Since we use `exit',
+# in C++ we need to declare it. In case someone uses the same compiler
+# for both compiling C and C++ we need to have the C++ compiler decide
+# the declaration of exit, since it's the most demanding environment.
+cat >conftest.$ac_ext <<_ACEOF
+#ifndef __cplusplus
+ choke me
+#endif
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:2026: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:2029: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:2032: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:2035: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ for ac_declaration in \
+ ''\
+ '#include <stdlib.h>' \
+ 'extern "C" void std::exit (int) throw (); using std::exit;' \
+ 'extern "C" void std::exit (int); using std::exit;' \
+ 'extern "C" void exit (int) throw ();' \
+ 'extern "C" void exit (int);' \
+ 'void exit (int);'
+do
+ cat >conftest.$ac_ext <<_ACEOF
+#line 2047 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+$ac_declaration
+int
+main ()
+{
+exit (42);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:2060: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:2063: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:2066: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:2069: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+continue
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+#line 2079 "configure"
+#include "confdefs.h"
+$ac_declaration
+int
+main ()
+{
+exit (42);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:2091: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:2094: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:2097: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:2100: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ break
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+echo '#ifdef __cplusplus' >>confdefs.h
+echo $ac_declaration >>confdefs.h
+echo '#endif' >>confdefs.h
+
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_config_commands="$ac_config_commands default-2"
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1286: checking how to run the C preprocessor" >&5
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+echo "$as_me:2131: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- # This must be in double quotes, not single quotes, because CPP may get
- # substituted into the Makefile and "${CC-cc}" will confuse make.
- CPP="${CC-cc} -E"
+ if test "${ac_cv_prog_CPP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ # Double quotes because CPP needs to be expanded
+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+ do
+ # break 2 since there is a loop in there.
+ ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
# On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp.
- cat > conftest.$ac_ext <<EOF
-#line 1301 "configure"
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat >conftest.$ac_ext <<_ACEOF
+#line 2153 "configure"
#include "confdefs.h"
#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
+ Syntax error
+_ACEOF
+if { (eval echo "$as_me:2158: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:2164: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
:
else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- CPP="${CC-cc} -E -traditional-cpp"
- cat > conftest.$ac_ext <<EOF
-#line 1318 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- :
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+#line 2187 "configure"
+#include "confdefs.h"
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:2191: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:2197: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ # Broken: success on invalid input.
+continue
+else
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- CPP="${CC-cc} -nologo -E"
- cat > conftest.$ac_ext <<EOF
-#line 1335 "configure"
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ break 2
+fi
+
+ done
+ ac_cv_prog_CPP=$CPP
+
+fi
+ CPP=$ac_cv_prog_CPP
+else
+ ac_cv_prog_CPP=$CPP
+fi
+echo "$as_me:2234: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat >conftest.$ac_ext <<_ACEOF
+#line 2244 "configure"
#include "confdefs.h"
#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
+ Syntax error
+_ACEOF
+if { (eval echo "$as_me:2249: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:2255: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
:
else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-rm -f conftest*
- ac_cv_prog_CPP="$CPP"
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+#line 2278 "configure"
+#include "confdefs.h"
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:2282: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:2288: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
fi
- CPP="$ac_cv_prog_CPP"
+if test -z "$ac_cpp_err"; then
+ # Broken: success on invalid input.
+continue
else
- ac_cv_prog_CPP="$CPP"
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ # Passes both tests.
+ac_preproc_ok=:
+break
fi
-echo "$ac_t""$CPP" 1>&6
-
-
-
+rm -f conftest.err conftest.$ac_ext
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ :
+else
+ { { echo "$as_me:2316: error: C preprocessor \"$CPP\" fails sanity check" >&5
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+am_make=${MAKE-make}
+# BSD make uses .include
+cat > confinc << 'END'
+doit:
+ @echo done
+END
+# If we don't find an include directive, just comment out the code.
+echo "$as_me:2334: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
+_am_include='#'
+for am_inc in include .include; do
+ echo "$am_inc confinc" > confmf
+ if test "`$am_make -f confmf 2> /dev/null`" = "done"; then
+ _am_include=$am_inc
+ break
+ fi
+done
+echo "$as_me:2345: result: $_am_include" >&5
+echo "${ECHO_T}$_am_include" >&6
+rm -f confinc confmf
depcc="$CC"
depcpp="$CPP"
-echo $ac_n "checking dependency style of $depcc""... $ac_c" 1>&6
-echo "configure:1374: checking dependency style of $depcc" >&5
-if eval "test \"`echo '$''{'am_cv_CC_dependencies_compiler_type'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
-
-if test -z "$AMDEP"; then
- echo '#include "conftest.h"' > conftest.c
- echo 'int i;' > conftest.h
+
+echo "$as_me:2352: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -z "$AMDEP"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
+ mkdir confdir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" confdir
+ cd confdir
am_cv_CC_dependencies_compiler_type=none
- for depmode in `sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < "$am_depcomp"`; do
+ for depmode in `sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < "./depcomp"`; do
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ echo '#include "conftest.h"' > conftest.c
+ echo 'int i;' > conftest.h
+
case "$depmode" in
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
@@ -1393,107 +2386,321 @@ if test -z "$AMDEP"; then
;;
none) break ;;
esac
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this.
if depmode="$depmode" \
source=conftest.c object=conftest.o \
depfile=conftest.Po tmpdepfile=conftest.TPo \
- $SHELL $am_depcomp $depcc -c conftest.c 2>/dev/null &&
+ $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
grep conftest.h conftest.Po > /dev/null 2>&1; then
am_cv_CC_dependencies_compiler_type="$depmode"
break
fi
done
- rm -f conftest.*
+ cd ..
+ rm -rf confdir
else
am_cv_CC_dependencies_compiler_type=none
fi
fi
-
-echo "$ac_t""$am_cv_CC_dependencies_compiler_type" 1>&6
+echo "$as_me:2409: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type"
+echo "$as_me:2413: checking for $CC option to accept ANSI C" >&5
+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_stdc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_prog_cc_stdc=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+#line 2421 "configure"
+#include "confdefs.h"
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+ char **p;
+ int i;
+{
+ return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+ char *s;
+ va_list v;
+ va_start (v,p);
+ s = g (p, va_arg (v,int));
+ va_end (v);
+ return s;
+}
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+ ;
+ return 0;
+}
+_ACEOF
+# Don't try gcc -ansi; that turns off useful extensions and
+# breaks some systems' header files.
+# AIX -qlanglvl=ansi
+# Ultrix and OSF/1 -std1
+# HP-UX 10.20 and later -Ae
+# HP-UX older versions -Aa -D_HPUX_SOURCE
+# SVR4 -Xc -D__EXTENSIONS__
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+ CC="$ac_save_CC $ac_arg"
+ rm -f conftest.$ac_objext
+if { (eval echo "$as_me:2470: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:2473: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:2476: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:2479: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_prog_cc_stdc=$ac_arg
+break
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext
+done
+rm -f conftest.$ac_ext conftest.$ac_objext
+CC=$ac_save_CC
+
+fi
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1419: checking how to run the C preprocessor" >&5
+case "x$ac_cv_prog_cc_stdc" in
+ x|xno)
+ echo "$as_me:2496: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6 ;;
+ *)
+ echo "$as_me:2499: result: $ac_cv_prog_cc_stdc" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+ CC="$CC $ac_cv_prog_cc_stdc" ;;
+esac
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+echo "$as_me:2509: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- # This must be in double quotes, not single quotes, because CPP may get
- # substituted into the Makefile and "${CC-cc}" will confuse make.
- CPP="${CC-cc} -E"
+ if test "${ac_cv_prog_CPP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ # Double quotes because CPP needs to be expanded
+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+ do
+ # break 2 since there is a loop in there.
+ ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
# On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp.
- cat > conftest.$ac_ext <<EOF
-#line 1434 "configure"
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat >conftest.$ac_ext <<_ACEOF
+#line 2531 "configure"
#include "confdefs.h"
#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
+ Syntax error
+_ACEOF
+if { (eval echo "$as_me:2536: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:2542: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
:
else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- CPP="${CC-cc} -E -traditional-cpp"
- cat > conftest.$ac_ext <<EOF
-#line 1451 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1457: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- :
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+#line 2565 "configure"
+#include "confdefs.h"
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:2569: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:2575: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ # Broken: success on invalid input.
+continue
else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- CPP="${CC-cc} -nologo -E"
- cat > conftest.$ac_ext <<EOF
-#line 1468 "configure"
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ break 2
+fi
+
+ done
+ ac_cv_prog_CPP=$CPP
+
+fi
+ CPP=$ac_cv_prog_CPP
+else
+ ac_cv_prog_CPP=$CPP
+fi
+echo "$as_me:2612: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat >conftest.$ac_ext <<_ACEOF
+#line 2622 "configure"
#include "confdefs.h"
#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1474: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
+ Syntax error
+_ACEOF
+if { (eval echo "$as_me:2627: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:2633: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
:
else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+#line 2656 "configure"
+#include "confdefs.h"
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:2660: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:2666: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
fi
-rm -f conftest*
- ac_cv_prog_CPP="$CPP"
+if test -z "$ac_cpp_err"; then
+ # Broken: success on invalid input.
+continue
+else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ # Passes both tests.
+ac_preproc_ok=:
+break
fi
- CPP="$ac_cv_prog_CPP"
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ :
else
- ac_cv_prog_CPP="$CPP"
+ { { echo "$as_me:2694: error: C preprocessor \"$CPP\" fails sanity check" >&5
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+ { (exit 1); exit 1; }; }
fi
-echo "$ac_t""$CPP" 1>&6
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
case "$target" in
*-pc-cygwin*)
@@ -1522,7 +2729,9 @@ case "$host" in
*-*-vxworks*)
# Quick and dirty sanity check
case "$VX_KERNEL" in
- '') { echo "configure: error: Please follow the directions in html/vxworks.html!" 1>&2; exit 1; }
+ '') { { echo "$as_me:2732: error: Please follow the directions in html/vxworks.html!" >&5
+echo "$as_me: error: Please follow the directions in html/vxworks.html!" >&2;}
+ { (exit 1); exit 1; }; }
;;
esac
CFLAGS="$CFLAGS -DSYS_VXWORKS"
@@ -1533,84 +2742,90 @@ esac
for ac_prog in mawk gawk nawk awk
do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1540: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2747: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AWK+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$AWK"; then
ac_cv_prog_AWK="$AWK" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_AWK="$ac_prog"
- break
- fi
- done
- IFS="$ac_save_ifs"
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_AWK="$ac_prog"
+echo "$as_me:2762: found $ac_dir/$ac_word" >&5
+break
+done
+
fi
fi
-AWK="$ac_cv_prog_AWK"
+AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
- echo "$ac_t""$AWK" 1>&6
+ echo "$as_me:2770: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:2773: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
-test -n "$AWK" && break
+ test -n "$AWK" && break
done
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1570: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2780: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat > conftestmake <<\EOF
+ cat >conftest.make <<\EOF
all:
@echo 'ac_maketemp="${MAKE}"'
EOF
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
if test -n "$ac_maketemp"; then
eval ac_cv_prog_make_${ac_make}_set=yes
else
eval ac_cv_prog_make_${ac_make}_set=no
fi
-rm -f conftestmake
+rm -f conftest.make
fi
if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
- echo "$ac_t""yes" 1>&6
+ echo "$as_me:2800: result: yes" >&5
+echo "${ECHO_T}yes" >&6
SET_MAKE=
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:2804: result: no" >&5
+echo "${ECHO_T}no" >&6
SET_MAKE="MAKE=${MAKE-make}"
fi
-
rm -f conftest*
case "$GCC" in
yes)
CFLAGS="$CFLAGS -Wall"
- # CFLAGS="$CFLAGS -Wtraditional"
- CFLAGS="$CFLAGS -Wshadow"
- # CFLAGS="$CFLAGS -Wwrite-strings"
- CFLAGS="$CFLAGS -Wconversion"
- CFLAGS="$CFLAGS -Wpointer-arith"
- CFLAGS="$CFLAGS -Wcast-qual"
# CFLAGS="$CFLAGS -Wcast-align"
+ CFLAGS="$CFLAGS -Wcast-qual"
+ # CFLAGS="$CFLAGS -Wconversion"
+ # CFLAGS="$CFLAGS -Werror"
+ CFLAGS="$CFLAGS -Wmissing-prototypes"
+ CFLAGS="$CFLAGS -Wpointer-arith"
+ CFLAGS="$CFLAGS -Wshadow"
CFLAGS="$CFLAGS -Wstrict-prototypes"
+ # CFLAGS="$CFLAGS -Wtraditional"
+ # CFLAGS="$CFLAGS -Wwrite-strings"
- echo $ac_n "checking whether ${CC-cc} -pipe works""... $ac_c" 1>&6
-echo "configure:1612: checking whether ${CC-cc} -pipe works" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_pipe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+ echo "$as_me:2825: checking whether ${CC-cc} -pipe works" >&5
+echo $ECHO_N "checking whether ${CC-cc} -pipe works... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_pipe+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
echo 'void f(){}' > conftest.c
if test -z "`${CC-cc} -pipe -c conftest.c 2>&1`" -a -s conftest.o; then
@@ -1619,10 +2834,10 @@ else
ac_cv_prog_cc_pipe=no
fi
rm -f conftest*
-
-fi
-echo "$ac_t""$ac_cv_prog_cc_pipe" 1>&6
+fi
+echo "$as_me:2839: result: $ac_cv_prog_cc_pipe" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_pipe" >&6
case "$ac_cv_prog_cc_pipe" in
yes)
@@ -1635,7 +2850,11 @@ esac
ac_busted_vpath_in_make=no
case "$target" in
+ *-next-nextstep3)
+ CFLAGS="$CFLAGS -posix"
+ ;;
*-*-irix6.1*) # 64 bit only
+ # busted vpath?
;;
*-*-irix6*) # 6.2 (and later?)
ac_busted_vpath_in_make=yes
@@ -1657,8 +2876,6 @@ case "$target" in
esac
fi
;;
- *-next-nextstep3)
- CFLAGS="$CFLAGS -posix" ;;
*-*-solaris2.5.1)
ac_busted_vpath_in_make=yes
;;
@@ -1669,163 +2886,162 @@ case "$ac_busted_vpath_in_make$srcdir" in
yes.) ;;
*) case "`${MAKE-make} -v -f /dev/null 2>/dev/null | sed -e 's/GNU Make version \(1-9.]*\).*/\1/' -e q`" in
'')
- { echo "configure: error: building outside of the main directory requires GNU make" 1>&2; exit 1; }
+ { { echo "$as_me:2889: error: building outside of the main directory requires GNU make" >&5
+echo "$as_me: error: building outside of the main directory requires GNU make" >&2;}
+ { (exit 1); exit 1; }; }
;;
*) ;;
esac
;;
esac
-
-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1682: checking whether ln -s works" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
- rm -f conftestdata
- ac_cv_prog_LN_S="ln -s"
-else
- ac_cv_prog_LN_S=ln
-fi
-fi
-LN_S="$ac_cv_prog_LN_S"
-if test "$ac_cv_prog_LN_S" = "ln -s"; then
- echo "$ac_t""yes" 1>&6
+echo "$as_me:2898: checking whether ln -s works" >&5
+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+ echo "$as_me:2902: result: yes" >&5
+echo "${ECHO_T}yes" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:2905: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6
fi
-if test $ac_cv_prog_gcc = yes; then
- echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:1704: checking whether ${CC-cc} needs -traditional" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+if test $ac_cv_c_compiler_gnu = yes; then
+ echo "$as_me:2910: checking whether $CC needs -traditional" >&5
+echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
+if test "${ac_cv_prog_gcc_traditional+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_pattern="Autoconf.*'x'"
- cat > conftest.$ac_ext <<EOF
-#line 1710 "configure"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 2917 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
-EOF
+_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "$ac_pattern" >/dev/null 2>&1; then
- rm -rf conftest*
ac_cv_prog_gcc_traditional=yes
else
- rm -rf conftest*
ac_cv_prog_gcc_traditional=no
fi
rm -f conftest*
-
if test $ac_cv_prog_gcc_traditional = no; then
- cat > conftest.$ac_ext <<EOF
-#line 1728 "configure"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 2932 "configure"
#include "confdefs.h"
#include <termio.h>
Autoconf TCGETA
-EOF
+_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "$ac_pattern" >/dev/null 2>&1; then
- rm -rf conftest*
ac_cv_prog_gcc_traditional=yes
fi
rm -f conftest*
fi
fi
-
-echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6
+echo "$as_me:2945: result: $ac_cv_prog_gcc_traditional" >&5
+echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
if test $ac_cv_prog_gcc_traditional = yes; then
CC="$CC -traditional"
fi
fi
-echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:1750: checking for AIX" >&5
-cat > conftest.$ac_ext <<EOF
-#line 1752 "configure"
+echo "$as_me:2952: checking for AIX" >&5
+echo $ECHO_N "checking for AIX... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line 2955 "configure"
#include "confdefs.h"
#ifdef _AIX
yes
#endif
-EOF
+_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
- rm -rf conftest*
- echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
+ echo "$as_me:2964: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+cat >>confdefs.h <<\EOF
#define _ALL_SOURCE 1
EOF
else
- rm -rf conftest*
- echo "$ac_t""no" 1>&6
+ echo "$as_me:2971: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
rm -f conftest*
-
-ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
-echo "configure:1775: checking for minix/config.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2976: checking for minix/config.h" >&5
+echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6
+if test "${ac_cv_header_minix_config_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat > conftest.$ac_ext <<EOF
-#line 1780 "configure"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 2982 "configure"
#include "confdefs.h"
#include <minix/config.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
+_ACEOF
+if { (eval echo "$as_me:2986: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:2992: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_cv_header_minix_config_h=yes
else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+ ac_cv_header_minix_config_h=no
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
+echo "$as_me:3011: result: $ac_cv_header_minix_config_h" >&5
+echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6
+if test $ac_cv_header_minix_config_h = yes; then
MINIX=yes
else
- echo "$ac_t""no" 1>&6
-MINIX=
+ MINIX=
fi
if test "$MINIX" = yes; then
- cat >> confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define _POSIX_SOURCE 1
EOF
- cat >> confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
#define _POSIX_1_SOURCE 2
EOF
- cat >> confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
#define _MINIX 1
EOF
fi
-echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:1823: checking for POSIXized ISC" >&5
+echo "$as_me:3035: checking for POSIXized ISC" >&5
+echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
if test -d /etc/conf/kconfig.d &&
- grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
+ grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
then
- echo "$ac_t""yes" 1>&6
+ echo "$as_me:3040: result: yes" >&5
+echo "${ECHO_T}yes" >&6
ISC=yes # If later tests want to check for ISC.
- cat >> confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define _POSIX_SOURCE 1
EOF
@@ -1835,75 +3051,195 @@ EOF
CC="$CC -Xp"
fi
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:3054: result: no" >&5
+echo "${ECHO_T}no" >&6
ISC=
fi
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1846: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+echo "$as_me:3062: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_RANLIB+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_RANLIB="ranlib"
- break
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+echo "$as_me:3077: found $ac_dir/$ac_word" >&5
+break
+done
+
fi
fi
-RANLIB="$ac_cv_prog_RANLIB"
+RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- echo "$ac_t""$RANLIB" 1>&6
+ echo "$as_me:3085: result: $RANLIB" >&5
+echo "${ECHO_T}$RANLIB" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:3088: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+ ac_ct_RANLIB=$RANLIB
+ # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+echo "$as_me:3097: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_RANLIB"; then
+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_RANLIB="ranlib"
+echo "$as_me:3112: found $ac_dir/$ac_word" >&5
+break
+done
+
+ test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+ echo "$as_me:3121: result: $ac_ct_RANLIB" >&5
+echo "${ECHO_T}$ac_ct_RANLIB" >&6
+else
+ echo "$as_me:3124: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ RANLIB=$ac_ct_RANLIB
+else
+ RANLIB="$ac_cv_prog_RANLIB"
fi
# Extract the first word of "sh", so it can be a program name with args.
set dummy sh; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1876: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_PATH_SH'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:3135: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PATH_SH+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case "$PATH_SH" in
- /*)
+ case $PATH_SH in
+ [\\/]* | ?:[\\/]*)
ac_cv_path_PATH_SH="$PATH_SH" # Let the user override the test with a path.
;;
- ?:/*)
- ac_cv_path_PATH_SH="$PATH_SH" # Let the user override the test with a dos path.
- ;;
*)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_PATH_SH="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ if $as_executable_p "$ac_dir/$ac_word"; then
+ ac_cv_path_PATH_SH="$ac_dir/$ac_word"
+ echo "$as_me:3152: found $ac_dir/$ac_word" >&5
+ break
+fi
+done
+
;;
esac
fi
-PATH_SH="$ac_cv_path_PATH_SH"
+PATH_SH=$ac_cv_path_PATH_SH
+
if test -n "$PATH_SH"; then
- echo "$ac_t""$PATH_SH" 1>&6
+ echo "$as_me:3163: result: $PATH_SH" >&5
+echo "${ECHO_T}$PATH_SH" >&6
+else
+ echo "$as_me:3166: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+# Extract the first word of "perl", so it can be a program name with args.
+set dummy perl; ac_word=$2
+echo "$as_me:3172: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PATH_PERL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $PATH_PERL in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PATH_PERL="$PATH_PERL" # Let the user override the test with a path.
+ ;;
+ *)
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ if $as_executable_p "$ac_dir/$ac_word"; then
+ ac_cv_path_PATH_PERL="$ac_dir/$ac_word"
+ echo "$as_me:3189: found $ac_dir/$ac_word" >&5
+ break
+fi
+done
+
+ ;;
+esac
+fi
+PATH_PERL=$ac_cv_path_PATH_PERL
+
+if test -n "$PATH_PERL"; then
+ echo "$as_me:3200: result: $PATH_PERL" >&5
+echo "${ECHO_T}$PATH_PERL" >&6
+else
+ echo "$as_me:3203: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ cat >conftest.$ac_ext <<_ACEOF
+#line 3208 "configure"
+#include "confdefs.h"
+#define ACAT(a,b)a ## b
+ACAT(Cir,cus)
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "Circus" >/dev/null 2>&1; then
+ cat >>confdefs.h <<\EOF
+#define ULONG_CONST(a) a ## UL
+EOF
+
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 3222 "configure"
+#include "confdefs.h"
+#define RCAT(a,b)a/**/b
+RCAT(Rei,ser)
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "Reiser" >/dev/null 2>&1; then
+ cat >>confdefs.h <<\EOF
+#define ULONG_CONST(a) a/**/L
+EOF
+
else
- echo "$ac_t""no" 1>&6
+ { { echo "$as_me:3235: error: How do we create an unsigned long constant?" >&5
+echo "$as_me: error: How do we create an unsigned long constant?" >&2;}
+ { (exit 1); exit 1; }; }
fi
+rm -f conftest*
+fi
+rm -f conftest*
case "$target" in
*-*-vxworks*)
@@ -1918,31 +3254,39 @@ esac
# SunOS /usr/etc/install
# IRIX /sbin/install
# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1927: checking for a BSD compatible install" >&5
+echo "$as_me:3262: checking for a BSD compatible install" >&5
+echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+if test "${ac_cv_path_install+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
for ac_dir in $PATH; do
+ IFS=$ac_save_IFS
# Account for people who put trailing slashes in PATH elements.
- case "$ac_dir/" in
- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+ case $ac_dir/ in
+ / | ./ | .// | /cC/* \
+ | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \
+ | /usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
# Don't use installbsd from OSF since it installs stuff as root
# by default.
for ac_prog in ginstall scoinst install; do
- if test -f $ac_dir/$ac_prog; then
+ if $as_executable_p "$ac_dir/$ac_prog"; then
if test $ac_prog = install &&
- grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+ grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
:
+ elif test $ac_prog = install &&
+ grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then
+ # program-specific install script used by HP pwplus--don't use.
+ :
else
ac_cv_path_install="$ac_dir/$ac_prog -c"
break 2
@@ -1952,681 +3296,911 @@ else
;;
esac
done
- IFS="$ac_save_IFS"
fi
if test "${ac_cv_path_install+set}" = set; then
- INSTALL="$ac_cv_path_install"
+ INSTALL=$ac_cv_path_install
else
# As a last resort, use the slow shell script. We don't cache a
# path for INSTALL within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the path is relative.
- INSTALL="$ac_install_sh"
+ INSTALL=$ac_install_sh
fi
fi
-echo "$ac_t""$INSTALL" 1>&6
+echo "$as_me:3311: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
case "$target" in
*-pc-cygwin*)
- echo $ac_n "checking for main in -ladvapi32""... $ac_c" 1>&6
-echo "configure:1983: checking for main in -ladvapi32" >&5
-ac_lib_var=`echo advapi32'_'main | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+
+echo "$as_me:3325: checking for main in -ladvapi32" >&5
+echo $ECHO_N "checking for main in -ladvapi32... $ECHO_C" >&6
+if test "${ac_cv_lib_advapi32_main+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_save_LIBS="$LIBS"
+ ac_check_lib_save_LIBS=$LIBS
LIBS="-ladvapi32 $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1991 "configure"
+cat >conftest.$ac_ext <<_ACEOF
+#line 3333 "configure"
#include "confdefs.h"
-int main() {
-main()
-; return 0; }
-EOF
-if { (eval echo configure:1998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo advapi32 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
+int
+main ()
+{
+main ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:3345: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:3348: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:3351: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:3354: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_advapi32_main=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_advapi32_main=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:3365: result: $ac_cv_lib_advapi32_main" >&5
+echo "${ECHO_T}$ac_cv_lib_advapi32_main" >&6
+if test $ac_cv_lib_advapi32_main = yes; then
+ cat >>confdefs.h <<EOF
+#define HAVE_LIBADVAPI32 1
EOF
LIBS="-ladvapi32 $LIBS"
-else
- echo "$ac_t""no" 1>&6
fi
;;
esac
-echo $ac_n "checking for nlist in -lelf""... $ac_c" 1>&6
-echo "configure:2028: checking for nlist in -lelf" >&5
-ac_lib_var=`echo elf'_'nlist | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+
+echo "$as_me:3379: checking for nlist in -lelf" >&5
+echo $ECHO_N "checking for nlist in -lelf... $ECHO_C" >&6
+if test "${ac_cv_lib_elf_nlist+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_save_LIBS="$LIBS"
+ ac_check_lib_save_LIBS=$LIBS
LIBS="-lelf $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2036 "configure"
+cat >conftest.$ac_ext <<_ACEOF
+#line 3387 "configure"
#include "confdefs.h"
+
/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char nlist();
-
-int main() {
-nlist()
-; return 0; }
-EOF
-if { (eval echo configure:2047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo elf | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
+ builtin and then its argument prototype would still apply. */
+char nlist ();
+int
+main ()
+{
+nlist ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:3406: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:3409: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:3412: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:3415: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_elf_nlist=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_elf_nlist=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:3426: result: $ac_cv_lib_elf_nlist" >&5
+echo "${ECHO_T}$ac_cv_lib_elf_nlist" >&6
+if test $ac_cv_lib_elf_nlist = yes; then
+ cat >>confdefs.h <<EOF
+#define HAVE_LIBELF 1
EOF
LIBS="-lelf $LIBS"
-else
- echo "$ac_t""no" 1>&6
fi
-echo $ac_n "checking for main in -lkvm""... $ac_c" 1>&6
-echo "configure:2075: checking for main in -lkvm" >&5
-ac_lib_var=`echo kvm'_'main | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:3437: checking for main in -lkvm" >&5
+echo $ECHO_N "checking for main in -lkvm... $ECHO_C" >&6
+if test "${ac_cv_lib_kvm_main+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_save_LIBS="$LIBS"
+ ac_check_lib_save_LIBS=$LIBS
LIBS="-lkvm $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2083 "configure"
+cat >conftest.$ac_ext <<_ACEOF
+#line 3445 "configure"
#include "confdefs.h"
-int main() {
-main()
-; return 0; }
-EOF
-if { (eval echo configure:2090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo kvm | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
+int
+main ()
+{
+main ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:3457: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:3460: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:3463: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:3466: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_kvm_main=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_kvm_main=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:3477: result: $ac_cv_lib_kvm_main" >&5
+echo "${ECHO_T}$ac_cv_lib_kvm_main" >&6
+if test $ac_cv_lib_kvm_main = yes; then
+ cat >>confdefs.h <<EOF
+#define HAVE_LIBKVM 1
EOF
LIBS="-lkvm $LIBS"
-else
- echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking for nlist in -lld""... $ac_c" 1>&6
-echo "configure:2117: checking for nlist in -lld" >&5
-ac_lib_var=`echo ld'_'nlist | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+
+echo "$as_me:3488: checking for nlist in -lld" >&5
+echo $ECHO_N "checking for nlist in -lld... $ECHO_C" >&6
+if test "${ac_cv_lib_ld_nlist+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_save_LIBS="$LIBS"
+ ac_check_lib_save_LIBS=$LIBS
LIBS="-lld $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2125 "configure"
+cat >conftest.$ac_ext <<_ACEOF
+#line 3496 "configure"
#include "confdefs.h"
+
/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char nlist();
-
-int main() {
-nlist()
-; return 0; }
-EOF
-if { (eval echo configure:2136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo ld | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
+ builtin and then its argument prototype would still apply. */
+char nlist ();
+int
+main ()
+{
+nlist ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:3515: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:3518: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:3521: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:3524: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_ld_nlist=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_ld_nlist=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:3535: result: $ac_cv_lib_ld_nlist" >&5
+echo "${ECHO_T}$ac_cv_lib_ld_nlist" >&6
+if test $ac_cv_lib_ld_nlist = yes; then
+ cat >>confdefs.h <<EOF
+#define HAVE_LIBLD 1
EOF
LIBS="-lld $LIBS"
-else
- echo "$ac_t""no" 1>&6
fi
-echo $ac_n "checking for nlist in -lmld""... $ac_c" 1>&6
-echo "configure:2164: checking for nlist in -lmld" >&5
-ac_lib_var=`echo mld'_'nlist | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:3546: checking for nlist in -lmld" >&5
+echo $ECHO_N "checking for nlist in -lmld... $ECHO_C" >&6
+if test "${ac_cv_lib_mld_nlist+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_save_LIBS="$LIBS"
+ ac_check_lib_save_LIBS=$LIBS
LIBS="-lmld $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2172 "configure"
+cat >conftest.$ac_ext <<_ACEOF
+#line 3554 "configure"
#include "confdefs.h"
+
/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char nlist();
-
-int main() {
-nlist()
-; return 0; }
-EOF
-if { (eval echo configure:2183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo mld | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
+ builtin and then its argument prototype would still apply. */
+char nlist ();
+int
+main ()
+{
+nlist ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:3573: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:3576: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:3579: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:3582: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_mld_nlist=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_mld_nlist=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:3593: result: $ac_cv_lib_mld_nlist" >&5
+echo "${ECHO_T}$ac_cv_lib_mld_nlist" >&6
+if test $ac_cv_lib_mld_nlist = yes; then
+ cat >>confdefs.h <<EOF
+#define HAVE_LIBMLD 1
EOF
LIBS="-lmld $LIBS"
-else
- echo "$ac_t""no" 1>&6
fi
-echo $ac_n "checking for gethostent""... $ac_c" 1>&6
-echo "configure:2211: checking for gethostent" >&5
-if eval "test \"`echo '$''{'ac_cv_func_gethostent'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:3604: checking for gethostent" >&5
+echo $ECHO_N "checking for gethostent... $ECHO_C" >&6
+if test "${ac_cv_func_gethostent+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat > conftest.$ac_ext <<EOF
-#line 2216 "configure"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 3610 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char gethostent(); below. */
+ which can conflict with char gethostent (); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char gethostent();
-
-int main() {
+ builtin and then its argument prototype would still apply. */
+char gethostent ();
+char (*f) ();
+int
+main ()
+{
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_gethostent) || defined (__stub___gethostent)
choke me
#else
-gethostent();
+f = gethostent;
#endif
-; return 0; }
-EOF
-if { (eval echo configure:2239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_gethostent=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_func_gethostent=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'gethostent`\" = yes"; then
- echo "$ac_t""yes" 1>&6
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:3641: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:3644: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:3647: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:3650: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_gethostent=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_gethostent=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:3660: result: $ac_cv_func_gethostent" >&5
+echo "${ECHO_T}$ac_cv_func_gethostent" >&6
+if test $ac_cv_func_gethostent = yes; then
:
else
- echo "$ac_t""no" 1>&6
-echo $ac_n "checking for gethostent in -lnsl""... $ac_c" 1>&6
-echo "configure:2257: checking for gethostent in -lnsl" >&5
-ac_lib_var=`echo nsl'_'gethostent | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+
+echo "$as_me:3666: checking for gethostent in -lnsl" >&5
+echo $ECHO_N "checking for gethostent in -lnsl... $ECHO_C" >&6
+if test "${ac_cv_lib_nsl_gethostent+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_save_LIBS="$LIBS"
+ ac_check_lib_save_LIBS=$LIBS
LIBS="-lnsl -lsocket $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2265 "configure"
+cat >conftest.$ac_ext <<_ACEOF
+#line 3674 "configure"
#include "confdefs.h"
+
/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char gethostent();
-
-int main() {
-gethostent()
-; return 0; }
-EOF
-if { (eval echo configure:2276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo nsl | sed -e 's/^a-zA-Z0-9_/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
+ builtin and then its argument prototype would still apply. */
+char gethostent ();
+int
+main ()
+{
+gethostent ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:3693: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:3696: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:3699: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:3702: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_nsl_gethostent=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_nsl_gethostent=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:3713: result: $ac_cv_lib_nsl_gethostent" >&5
+echo "${ECHO_T}$ac_cv_lib_nsl_gethostent" >&6
+if test $ac_cv_lib_nsl_gethostent = yes; then
+ cat >>confdefs.h <<EOF
+#define HAVE_LIBNSL 1
EOF
LIBS="-lnsl $LIBS"
-else
- echo "$ac_t""no" 1>&6
fi
fi
-echo $ac_n "checking for openlog""... $ac_c" 1>&6
-echo "configure:2306: checking for openlog" >&5
-if eval "test \"`echo '$''{'ac_cv_func_openlog'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:3726: checking for openlog" >&5
+echo $ECHO_N "checking for openlog... $ECHO_C" >&6
+if test "${ac_cv_func_openlog+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat > conftest.$ac_ext <<EOF
-#line 2311 "configure"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 3732 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char openlog(); below. */
+ which can conflict with char openlog (); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char openlog();
-
-int main() {
+ builtin and then its argument prototype would still apply. */
+char openlog ();
+char (*f) ();
+int
+main ()
+{
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_openlog) || defined (__stub___openlog)
choke me
#else
-openlog();
+f = openlog;
#endif
-; return 0; }
-EOF
-if { (eval echo configure:2334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_openlog=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_func_openlog=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'openlog`\" = yes"; then
- echo "$ac_t""yes" 1>&6
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:3763: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:3766: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:3769: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:3772: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_openlog=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_openlog=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:3782: result: $ac_cv_func_openlog" >&5
+echo "${ECHO_T}$ac_cv_func_openlog" >&6
+if test $ac_cv_func_openlog = yes; then
:
else
- echo "$ac_t""no" 1>&6
-echo $ac_n "checking for openlog in -lgen""... $ac_c" 1>&6
-echo "configure:2352: checking for openlog in -lgen" >&5
-ac_lib_var=`echo gen'_'openlog | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+
+echo "$as_me:3788: checking for openlog in -lgen" >&5
+echo $ECHO_N "checking for openlog in -lgen... $ECHO_C" >&6
+if test "${ac_cv_lib_gen_openlog+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_save_LIBS="$LIBS"
+ ac_check_lib_save_LIBS=$LIBS
LIBS="-lgen $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2360 "configure"
+cat >conftest.$ac_ext <<_ACEOF
+#line 3796 "configure"
#include "confdefs.h"
+
/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char openlog();
-
-int main() {
-openlog()
-; return 0; }
+ builtin and then its argument prototype would still apply. */
+char openlog ();
+int
+main ()
+{
+openlog ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:3815: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:3818: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:3821: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:3824: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_gen_openlog=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_gen_openlog=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:3835: result: $ac_cv_lib_gen_openlog" >&5
+echo "${ECHO_T}$ac_cv_lib_gen_openlog" >&6
+if test $ac_cv_lib_gen_openlog = yes; then
+ cat >>confdefs.h <<EOF
+#define HAVE_LIBGEN 1
EOF
-if { (eval echo configure:2371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
+
+ LIBS="-lgen $LIBS"
+
fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo gen | sed -e 's/^a-zA-Z0-9_/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
- LIBS="-lgen $LIBS"
+echo "$as_me:3848: checking for readline in -lreadline" >&5
+echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6
+if test "${ac_cv_lib_readline_readline+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lreadline $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line 3856 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char readline ();
+int
+main ()
+{
+readline ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:3875: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:3878: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:3881: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:3884: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_readline_readline=yes
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_readline_readline=no
fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:3895: result: $ac_cv_lib_readline_readline" >&5
+echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6
+if test $ac_cv_lib_readline_readline = yes; then
+ cat >>confdefs.h <<EOF
+#define HAVE_LIBREADLINE 1
+EOF
+
+ LIBS="-lreadline $LIBS"
fi
+case "$target" in
+ *-*-linux*) ;;
+ *)
-echo $ac_n "checking for sched_setscheduler in -lrt""... $ac_c" 1>&6
-echo "configure:2402: checking for sched_setscheduler in -lrt" >&5
-ac_lib_var=`echo rt'_'sched_setscheduler | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:3910: checking for sched_setscheduler in -lrt" >&5
+echo $ECHO_N "checking for sched_setscheduler in -lrt... $ECHO_C" >&6
+if test "${ac_cv_lib_rt_sched_setscheduler+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_save_LIBS="$LIBS"
+ ac_check_lib_save_LIBS=$LIBS
LIBS="-lrt $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2410 "configure"
+cat >conftest.$ac_ext <<_ACEOF
+#line 3918 "configure"
#include "confdefs.h"
+
/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char sched_setscheduler();
-
-int main() {
-sched_setscheduler()
-; return 0; }
-EOF
-if { (eval echo configure:2421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo rt | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
+ builtin and then its argument prototype would still apply. */
+char sched_setscheduler ();
+int
+main ()
+{
+sched_setscheduler ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:3937: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:3940: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:3943: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:3946: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_rt_sched_setscheduler=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_rt_sched_setscheduler=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:3957: result: $ac_cv_lib_rt_sched_setscheduler" >&5
+echo "${ECHO_T}$ac_cv_lib_rt_sched_setscheduler" >&6
+if test $ac_cv_lib_rt_sched_setscheduler = yes; then
+ cat >>confdefs.h <<EOF
+#define HAVE_LIBRT 1
EOF
LIBS="-lrt $LIBS"
else
- echo "$ac_t""no" 1>&6
-echo $ac_n "checking for sched_setscheduler in -lposix4""... $ac_c" 1>&6
-echo "configure:2447: checking for sched_setscheduler in -lposix4" >&5
-ac_lib_var=`echo posix4'_'sched_setscheduler | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+
+echo "$as_me:3968: checking for sched_setscheduler in -lposix4" >&5
+echo $ECHO_N "checking for sched_setscheduler in -lposix4... $ECHO_C" >&6
+if test "${ac_cv_lib_posix4_sched_setscheduler+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_save_LIBS="$LIBS"
+ ac_check_lib_save_LIBS=$LIBS
LIBS="-lposix4 $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2455 "configure"
+cat >conftest.$ac_ext <<_ACEOF
+#line 3976 "configure"
#include "confdefs.h"
+
/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char sched_setscheduler();
-
-int main() {
-sched_setscheduler()
-; return 0; }
-EOF
-if { (eval echo configure:2466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo posix4 | sed -e 's/^a-zA-Z0-9_/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
+ builtin and then its argument prototype would still apply. */
+char sched_setscheduler ();
+int
+main ()
+{
+sched_setscheduler ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:3995: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:3998: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:4001: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:4004: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_posix4_sched_setscheduler=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_posix4_sched_setscheduler=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:4015: result: $ac_cv_lib_posix4_sched_setscheduler" >&5
+echo "${ECHO_T}$ac_cv_lib_posix4_sched_setscheduler" >&6
+if test $ac_cv_lib_posix4_sched_setscheduler = yes; then
+ cat >>confdefs.h <<EOF
+#define HAVE_LIBPOSIX4 1
EOF
LIBS="-lposix4 $LIBS"
-else
- echo "$ac_t""no" 1>&6
fi
fi
-echo $ac_n "checking for setsockopt""... $ac_c" 1>&6
-echo "configure:2496: checking for setsockopt" >&5
-if eval "test \"`echo '$''{'ac_cv_func_setsockopt'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+ ;;
+esac
+
+echo "$as_me:4031: checking for setsockopt" >&5
+echo $ECHO_N "checking for setsockopt... $ECHO_C" >&6
+if test "${ac_cv_func_setsockopt+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat > conftest.$ac_ext <<EOF
-#line 2501 "configure"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 4037 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char setsockopt(); below. */
+ which can conflict with char setsockopt (); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char setsockopt();
-
-int main() {
+ builtin and then its argument prototype would still apply. */
+char setsockopt ();
+char (*f) ();
+int
+main ()
+{
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_setsockopt) || defined (__stub___setsockopt)
choke me
#else
-setsockopt();
+f = setsockopt;
#endif
-; return 0; }
-EOF
-if { (eval echo configure:2524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_setsockopt=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_func_setsockopt=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'setsockopt`\" = yes"; then
- echo "$ac_t""yes" 1>&6
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:4068: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:4071: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:4074: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:4077: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_setsockopt=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_setsockopt=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:4087: result: $ac_cv_func_setsockopt" >&5
+echo "${ECHO_T}$ac_cv_func_setsockopt" >&6
+if test $ac_cv_func_setsockopt = yes; then
:
else
- echo "$ac_t""no" 1>&6
-echo $ac_n "checking for setsockopt in -lsocket""... $ac_c" 1>&6
-echo "configure:2542: checking for setsockopt in -lsocket" >&5
-ac_lib_var=`echo socket'_'setsockopt | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+
+echo "$as_me:4093: checking for setsockopt in -lsocket" >&5
+echo $ECHO_N "checking for setsockopt in -lsocket... $ECHO_C" >&6
+if test "${ac_cv_lib_socket_setsockopt+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_save_LIBS="$LIBS"
+ ac_check_lib_save_LIBS=$LIBS
LIBS="-lsocket $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2550 "configure"
+cat >conftest.$ac_ext <<_ACEOF
+#line 4101 "configure"
#include "confdefs.h"
+
/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char setsockopt();
-
-int main() {
-setsockopt()
-; return 0; }
-EOF
-if { (eval echo configure:2561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/^a-zA-Z0-9_/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
+ builtin and then its argument prototype would still apply. */
+char setsockopt ();
+int
+main ()
+{
+setsockopt ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:4120: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:4123: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:4126: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:4129: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_socket_setsockopt=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_socket_setsockopt=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:4140: result: $ac_cv_lib_socket_setsockopt" >&5
+echo "${ECHO_T}$ac_cv_lib_socket_setsockopt" >&6
+if test $ac_cv_lib_socket_setsockopt = yes; then
+ cat >>confdefs.h <<EOF
+#define HAVE_LIBSOCKET 1
EOF
LIBS="-lsocket $LIBS"
-else
- echo "$ac_t""no" 1>&6
fi
fi
-
-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2592: checking for ANSI C header files" >&5
-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:4153: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+if test "${ac_cv_header_stdc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat > conftest.$ac_ext <<EOF
-#line 2597 "configure"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 4159 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
#include <float.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
+
+_ACEOF
+if { (eval echo "$as_me:4167: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:4173: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
ac_cv_header_stdc=yes
else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
ac_cv_header_stdc=no
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 2622 "configure"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 4195 "configure"
#include "confdefs.h"
#include <string.h>
-EOF
+
+_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "memchr" >/dev/null 2>&1; then
:
else
- rm -rf conftest*
ac_cv_header_stdc=no
fi
rm -f conftest*
@@ -2635,16 +4209,16 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 2640 "configure"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 4213 "configure"
#include "confdefs.h"
#include <stdlib.h>
-EOF
+
+_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "free" >/dev/null 2>&1; then
:
else
- rm -rf conftest*
ac_cv_header_stdc=no
fi
rm -f conftest*
@@ -2653,740 +4227,910 @@ fi
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then
:
else
- cat > conftest.$ac_ext <<EOF
-#line 2661 "configure"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 4234 "configure"
#include "confdefs.h"
#include <ctype.h>
-#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int main () { int i; for (i = 0; i < 256; i++)
-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
-exit (0); }
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \
+ || ('j' <= (c) && (c) <= 'r') \
+ || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
-EOF
-if { (eval echo configure:2672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+ int i;
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+ exit(2);
+ exit (0);
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:4260: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:4263: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (eval echo "$as_me:4265: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:4268: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
:
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
- ac_cv_header_stdc=no
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_header_stdc=no
fi
-rm -fr conftest*
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
fi
-
fi
fi
-
-echo "$ac_t""$ac_cv_header_stdc" 1>&6
+echo "$as_me:4281: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6
if test $ac_cv_header_stdc = yes; then
- cat >> confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define STDC_HEADERS 1
EOF
fi
-for ac_hdr in bstring.h errno.h fcntl.h memory.h netdb.h poll.h resolv.h
+for ac_header in bstring.h errno.h fcntl.h ieeefp.h math.h memory.h netdb.h
do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2699: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2704 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2709: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+echo "$as_me:4294: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 4300 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:4304: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:4310: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ eval "$ac_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+ eval "$ac_ac_Header=no"
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
+echo "$as_me:4329: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
EOF
-
-else
- echo "$ac_t""no" 1>&6
+
fi
done
-for ac_hdr in sched.h sgtty.h stdlib.h string.h termio.h termios.h
+for ac_header in poll.h resolv.h sched.h sgtty.h stdlib.h string.h termio.h
do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2739: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2744 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+echo "$as_me:4342: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 4348 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:4352: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:4358: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ eval "$ac_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+ eval "$ac_ac_Header=no"
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
+echo "$as_me:4377: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
EOF
-
-else
- echo "$ac_t""no" 1>&6
+
fi
done
-for ac_hdr in timepps.h timex.h unistd.h utmp.h utmpx.h
+for ac_header in termios.h timepps.h timex.h unistd.h utmp.h utmpx.h
do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2779: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2784 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2789: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+echo "$as_me:4390: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 4396 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:4400: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:4406: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ eval "$ac_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+ eval "$ac_ac_Header=no"
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
+echo "$as_me:4425: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
EOF
-
-else
- echo "$ac_t""no" 1>&6
+
fi
done
-for ac_hdr in arpa/nameser.h net/if.h netinet/in_systm.h netinet/in.h
+for ac_header in arpa/nameser.h net/if.h netinet/in_systm.h netinet/in.h
do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2819: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2824 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+echo "$as_me:4438: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 4444 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:4448: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:4454: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ eval "$ac_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+ eval "$ac_ac_Header=no"
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
+echo "$as_me:4473: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
EOF
-
-else
- echo "$ac_t""no" 1>&6
+
fi
done
-for ac_hdr in netinfo/ni.h
+for ac_header in netinfo/ni.h
do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2859: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2864 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+echo "$as_me:4486: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 4492 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:4496: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:4502: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ eval "$ac_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+ eval "$ac_ac_Header=no"
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
+echo "$as_me:4521: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
EOF
- cat >> confdefs.h <<\EOF
+ cat >>confdefs.h <<\EOF
#define HAVE_NETINFO 1
EOF
-else
- echo "$ac_t""no" 1>&6
fi
done
-for ac_hdr in sun/audioio.h sys/audioio.h
+for ac_header in sun/audioio.h sys/audioio.h
do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2902: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2907 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2912: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+echo "$as_me:4537: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 4543 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:4547: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:4553: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ eval "$ac_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+ eval "$ac_ac_Header=no"
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
+echo "$as_me:4572: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
EOF
-
-else
- echo "$ac_t""no" 1>&6
+
fi
done
-for ac_hdr in sys/clkdefs.h sys/file.h
+for ac_header in sys/clkdefs.h sys/file.h
do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2942: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2947 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2952: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+echo "$as_me:4585: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 4591 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:4595: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:4601: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ eval "$ac_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+ eval "$ac_ac_Header=no"
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
+echo "$as_me:4620: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
EOF
-
-else
- echo "$ac_t""no" 1>&6
+
fi
done
case "$target" in
*-*-sunos4*) ;;
- *) for ac_hdr in sys/ioctl.h
+ *)
+for ac_header in sys/ioctl.h
do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2984: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2989 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+echo "$as_me:4636: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 4642 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:4646: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:4652: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ eval "$ac_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+ eval "$ac_ac_Header=no"
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
+echo "$as_me:4671: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
EOF
-
-else
- echo "$ac_t""no" 1>&6
+
fi
done
;;
esac
-for ac_hdr in sys/lock.h sys/mman.h sys/modem.h sys/param.h sys/ppsclock.h
+
+for ac_header in sys/lock.h sys/mman.h sys/modem.h sys/param.h sys/ppsclock.h
do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3026: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3031 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3036: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+echo "$as_me:4687: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 4693 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:4697: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:4703: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ eval "$ac_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+ eval "$ac_ac_Header=no"
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
+echo "$as_me:4722: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
EOF
-
-else
- echo "$ac_t""no" 1>&6
+
fi
done
-for ac_hdr in sys/ppstime.h sys/proc.h sys/resource.h sys/sched.h
+for ac_header in sys/ppstime.h sys/proc.h sys/resource.h sys/sched.h
do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3066: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3071 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+echo "$as_me:4735: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 4741 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:4745: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:4751: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ eval "$ac_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+ eval "$ac_ac_Header=no"
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
+echo "$as_me:4770: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
EOF
-
-else
- echo "$ac_t""no" 1>&6
+
fi
done
case "$target" in
*-*-sco*)
- for ac_hdr in sys/sio.h
+
+for ac_header in sys/sio.h
do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3108: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3113 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3118: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+echo "$as_me:4786: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 4792 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:4796: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:4802: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ eval "$ac_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+ eval "$ac_ac_Header=no"
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
+echo "$as_me:4821: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
EOF
-
-else
- echo "$ac_t""no" 1>&6
+
fi
done
;;
esac
-for ac_hdr in sys/select.h sys/sockio.h sys/stat.h sys/stream.h
+
+for ac_header in sys/select.h sys/sockio.h sys/stat.h sys/stream.h
do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3150: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3155 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+echo "$as_me:4837: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 4843 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:4847: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:4853: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ eval "$ac_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+ eval "$ac_ac_Header=no"
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
+echo "$as_me:4872: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
EOF
-
-else
- echo "$ac_t""no" 1>&6
+
fi
done
-for ac_hdr in sys/stropts.h sys/sysctl.h sys/syssgi.h sys/termios.h
+for ac_header in sys/stropts.h sys/sysctl.h sys/syssgi.h sys/termios.h
do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3190: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3195 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+echo "$as_me:4885: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 4891 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:4895: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:4901: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ eval "$ac_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+ eval "$ac_ac_Header=no"
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
+echo "$as_me:4920: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
EOF
-
-else
- echo "$ac_t""no" 1>&6
+
fi
done
-for ac_hdr in sys/time.h
+for ac_header in sys/time.h
do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3230: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3235 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+echo "$as_me:4933: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 4939 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:4943: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:4949: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ eval "$ac_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+ eval "$ac_ac_Header=no"
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
+echo "$as_me:4968: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
EOF
-
-else
- echo "$ac_t""no" 1>&6
+
fi
done
-cat > conftest.$ac_ext <<EOF
-#line 3267 "configure"
+cat >conftest.$ac_ext <<_ACEOF
+#line 4979 "configure"
#include "confdefs.h"
#include <sys/timepps.h>
#ifdef PPS_API_VERS_1
yes
#endif
-EOF
+_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
- rm -rf conftest*
- for ac_hdr in sys/timepps.h
+
+for ac_header in sys/timepps.h
do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3282: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3287 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3292: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+echo "$as_me:4993: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 4999 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:5003: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:5009: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ eval "$ac_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+ eval "$ac_ac_Header=no"
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
fi
-if eval "test \"`echo