ChangeLog, configure, configure.in:

  * configure.in (ac_refclock_chu): Provide the CHU driver by
  default, and by default prefer the AUDIO version.  We used to
  limit this to SunOS or Solaris; now we drive by the availability
  of the audioio header file.
  Select the IRIG and WWV audio drivers the same way.

bk: 386f3614DdAZvpiOWVSOP1gK4doAFA

diff --git a/ChangeLog b/ChangeLog
index 884f5e98f9d1aa85dc87eb66308ce2cf80df6376..599428aa71dbe23c6f50bb45673ee1dbac87a29c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2000-01-02  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+       * configure.in (ac_refclock_chu): Provide the CHU driver by
+       default, and by default prefer the AUDIO version.  We used to
+       limit this to SunOS or Solaris; now we drive by the availability
+       of the audioio header file.
+       Select the IRIG and WWV audio drivers the same way.
+
        * flock-build: build ignores the -l flag; lose it.
        (BUILD_ARGS): added.
        * build: Remove unused -l stuff (LOG variable).

diff --git a/configure b/configure
index ccd5f7e92f7dea1a0c8178f693db24d4d490e14d..384f717c8900f9ce7ab7c9e59fc8a9f590e22d27 100755 (executable)
--- a/configure
+++ b/configure
@@ -41,7 +41,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-CHU            - CHU modem/decoder"
 ac_help="$ac_help
-  --enable-AUDIO-CHU      + CHU audio/decoder"
+  --enable-AUDIO-CHU      s CHU audio/decoder"
 ac_help="$ac_help
   --enable-DATUM          s Datum Programmable Time System"
 ac_help="$ac_help
@@ -8130,16 +8130,24 @@ case "$ac_cv_header_termio_h$ac_cv_header_termios_h" in
 esac
 echo "$ac_t""$ntp_canparse" 1>&6
 
+echo $ac_n "checking if we have support for audio clocks""... $ac_c" 1>&6
+echo "configure:8135: checking if we have support for audio clocks" >&5
+case "$ac_cv_header_sun_audioio_h$ac_cv_header_sys_audioio_h" in
+ *yes*)        ntp_canaudio=yes ;;
+ *)    ntp_canaudio=no  ;;
+esac
+echo "$ac_t""$ntp_canaudio" 1>&6
+
 # Requires modem control
 echo $ac_n "checking ACTS modem service""... $ac_c" 1>&6
-echo "configure:8136: checking ACTS modem service" >&5
+echo "configure:8144: checking ACTS modem service" >&5
 # Check whether --enable-ACTS or --disable-ACTS was given.
 if test "${enable_ACTS+set}" = set; then
   enableval="$enable_ACTS"
   ntp_ok=$enableval
 else
   cat > conftest.$ac_ext <<EOF
-#line 8143 "configure"
+#line 8151 "configure"
 #include "confdefs.h"
 #include <termios.h>
 #ifdef HAVE_SYS_IOCTL_H
@@ -8172,7 +8180,7 @@ fi
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking Arbiter 1088A/B GPS receiver""... $ac_c" 1>&6
-echo "configure:8176: checking Arbiter 1088A/B GPS receiver" >&5
+echo "configure:8184: checking Arbiter 1088A/B GPS receiver" >&5
 # Check whether --enable-ARBITER or --disable-ARBITER was given.
 if test "${enable_ARBITER+set}" = set; then
   enableval="$enable_ARBITER"
@@ -8191,7 +8199,7 @@ fi
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking Arcron MSF receiver""... $ac_c" 1>&6
-echo "configure:8195: checking Arcron MSF receiver" >&5
+echo "configure:8203: checking Arcron MSF receiver" >&5
 # Check whether --enable-ARCRON_MSF or --disable-ARCRON_MSF was given.
 if test "${enable_ARCRON_MSF+set}" = set; then
   enableval="$enable_ARCRON_MSF"
@@ -8210,7 +8218,7 @@ fi
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking Austron 2200A/2201A GPS receiver""... $ac_c" 1>&6
-echo "configure:8214: checking Austron 2200A/2201A GPS receiver" >&5
+echo "configure:8222: checking Austron 2200A/2201A GPS receiver" >&5
 # Check whether --enable-AS2201 or --disable-AS2201 was given.
 if test "${enable_AS2201+set}" = set; then
   enableval="$enable_AS2201"
@@ -8229,7 +8237,7 @@ fi
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking PPS interface""... $ac_c" 1>&6
-echo "configure:8233: checking PPS interface" >&5
+echo "configure:8241: checking PPS interface" >&5
 # Check whether --enable-ATOM or --disable-ATOM was given.
 if test "${enable_ATOM+set}" = set; then
   enableval="$enable_ATOM"
@@ -8248,13 +8256,13 @@ fi
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking CHU modem/decoder""... $ac_c" 1>&6
-echo "configure:8252: checking CHU modem/decoder" >&5
+echo "configure:8260: checking CHU modem/decoder" >&5
 # Check whether --enable-CHU or --disable-CHU was given.
 if test "${enable_CHU+set}" = set; then
   enableval="$enable_CHU"
   ntp_ok=$enableval
 else
-  ntp_ok=no
+  ntp_ok=$ntp_eac
 fi
 
 if test "$ntp_ok" = "yes"; then
@@ -8268,13 +8276,16 @@ echo "$ac_t""$ntp_ok" 1>&6
 ac_refclock_chu=$ntp_ok
 
 echo $ac_n "checking CHU audio/decoder""... $ac_c" 1>&6
-echo "configure:8272: checking CHU audio/decoder" >&5
+echo "configure:8280: checking CHU audio/decoder" >&5
 # Check whether --enable-AUDIO-CHU or --disable-AUDIO-CHU was given.
 if test "${enable_AUDIO_CHU+set}" = set; then
   enableval="$enable_AUDIO_CHU"
   ntp_ok=$enableval
 else
-  ntp_ok=$ntp_eac
+  case "$ntp_eac$ac_refclock_chu$ntp_canaudio" in
+ *no*) ntp_ok=no  ;;
+ *)    ntp_ok=yes ;;
+esac
 fi
 
 if test "$ntp_ok" = "yes"; then
@@ -8284,15 +8295,14 @@ EOF
 
 fi
 echo "$ac_t""$ntp_ok" 1>&6
-case "$ntp_ok$ac_refclock_chu$target" in
- yesyes*-*-sunos*) ;;
- yesyes*-*-solaris*) ;;
- yes*) echo "configure: warning: *** But the expected answer is...no ***" 1>&2 ;;
+# We used to check for sunos/solaris target...
+case "$ntp_ok$ac_refclock_chu$ntp_canaudio" in
+ yes*no*) echo "configure: warning: *** But the expected answer is...no ***" 1>&2 ;;
 esac
 
 # Not under HP-UX
 echo $ac_n "checking Datum Programmable Time System""... $ac_c" 1>&6
-echo "configure:8296: checking Datum Programmable Time System" >&5
+echo "configure:8306: checking Datum Programmable Time System" >&5
 # Check whether --enable-DATUM or --disable-DATUM was given.
 if test "${enable_DATUM+set}" = set; then
   enableval="$enable_DATUM"
@@ -8317,7 +8327,7 @@ fi
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking Forum Graphic GPS""... $ac_c" 1>&6
-echo "configure:8321: checking Forum Graphic GPS" >&5
+echo "configure:8331: checking Forum Graphic GPS" >&5
 # Check whether --enable-FG or --disable-FG was given.
 if test "${enable_FG+set}" = set; then
   enableval="$enable_FG"
@@ -8337,14 +8347,14 @@ echo "$ac_t""$ntp_ok" 1>&6
 
 # Requires modem control
 echo $ac_n "checking Heath GC-1000 WWV/WWVH receiver""... $ac_c" 1>&6
-echo "configure:8341: checking Heath GC-1000 WWV/WWVH receiver" >&5
+echo "configure:8351: checking Heath GC-1000 WWV/WWVH receiver" >&5
 # Check whether --enable-HEATH or --disable-HEATH was given.
 if test "${enable_HEATH+set}" = set; then
   enableval="$enable_HEATH"
   ntp_ok=$enableval
 else
   cat > conftest.$ac_ext <<EOF
-#line 8348 "configure"
+#line 8358 "configure"
 #include "confdefs.h"
 #include <termios.h>
 #ifdef HAVE_SYS_IOCTL_H
@@ -8377,7 +8387,7 @@ fi
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking HP 58503A GPS receiver""... $ac_c" 1>&6
-echo "configure:8381: checking HP 58503A GPS receiver" >&5
+echo "configure:8391: checking HP 58503A GPS receiver" >&5
 # Check whether --enable-HPGPS or --disable-HPGPS was given.
 if test "${enable_HPGPS+set}" = set; then
   enableval="$enable_HPGPS"
@@ -8396,18 +8406,15 @@ fi
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking Sun IRIG audio decoder""... $ac_c" 1>&6
-echo "configure:8400: checking Sun IRIG audio decoder" >&5
+echo "configure:8410: checking Sun IRIG audio decoder" >&5
 # Check whether --enable-IRIG or --disable-IRIG was given.
 if test "${enable_IRIG+set}" = set; then
   enableval="$enable_IRIG"
   ntp_ok=$enableval
 else
-  case "$ac_cv_header_sun_audioio_h$ac_cv_header_sys_audioio_h" in
-     *yes*)
-       ntp_ok=$ntp_eac
-       ;;
-     *)        ntp_ok=no
-       ;;
+  case "$ntp_eac$ntp_canaudio" in
+     *no*)     ntp_ok=no  ;;
+     *)                ntp_ok=yes ;;
     esac
 fi
 
@@ -8419,12 +8426,12 @@ EOF
 
 fi
 echo "$ac_t""$ntp_ok" 1>&6
-case "$ntp_ok$ac_cv_header_sun_audioio_h$ac_cv_header_sys_audioio_h" in
- yesnono) echo "configure: warning: *** But the expected answer is... no ***" 1>&2 ;;
+case "$ntp_ok$ntp_canaudio" in
+ yesno) echo "configure: warning: *** But the expected answer is... no ***" 1>&2 ;;
 esac
 
 echo $ac_n "checking Leitch CSD 5300 Master Clock System Driver""... $ac_c" 1>&6
-echo "configure:8428: checking Leitch CSD 5300 Master Clock System Driver" >&5
+echo "configure:8435: checking Leitch CSD 5300 Master Clock System Driver" >&5
 # Check whether --enable-LEITCH or --disable-LEITCH was given.
 if test "${enable_LEITCH+set}" = set; then
   enableval="$enable_LEITCH"
@@ -8443,7 +8450,7 @@ fi
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking local clock reference""... $ac_c" 1>&6
-echo "configure:8447: checking local clock reference" >&5
+echo "configure:8454: checking local clock reference" >&5
 # Check whether --enable-LOCAL-CLOCK or --disable-LOCAL-CLOCK was given.
 if test "${enable_LOCAL_CLOCK+set}" = set; then
   enableval="$enable_LOCAL_CLOCK"
@@ -8462,7 +8469,7 @@ fi
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking EES M201 MSF receiver""... $ac_c" 1>&6
-echo "configure:8466: checking EES M201 MSF receiver" >&5
+echo "configure:8473: checking EES M201 MSF receiver" >&5
 # Check whether --enable-MSFEES or --disable-MSFEES was given.
 if test "${enable_MSFEES+set}" = set; then
   enableval="$enable_MSFEES"
@@ -8482,7 +8489,7 @@ echo "$ac_t""$ntp_ok" 1>&6
 
 # Not Ultrix
 echo $ac_n "checking Magnavox MX4200 GPS receiver""... $ac_c" 1>&6
-echo "configure:8486: checking Magnavox MX4200 GPS receiver" >&5
+echo "configure:8493: checking Magnavox MX4200 GPS receiver" >&5
 # Check whether --enable-MX4200 or --disable-MX4200 was given.
 if test "${enable_MX4200+set}" = set; then
   enableval="$enable_MX4200"
@@ -8509,7 +8516,7 @@ case "$ntp_ok$target" in
 esac
 
 echo $ac_n "checking NMEA GPS receiver""... $ac_c" 1>&6
-echo "configure:8513: checking NMEA GPS receiver" >&5
+echo "configure:8520: checking NMEA GPS receiver" >&5
 # Check whether --enable-NMEA or --disable-NMEA was given.
 if test "${enable_NMEA+set}" = set; then
   enableval="$enable_NMEA"
@@ -8528,7 +8535,7 @@ fi
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking for ONCORE Motorola VP/UT Oncore GPS""... $ac_c" 1>&6
-echo "configure:8532: checking for ONCORE Motorola VP/UT Oncore GPS" >&5
+echo "configure:8539: checking for ONCORE Motorola VP/UT Oncore GPS" >&5
 # Check whether --enable-ONCORE or --disable-ONCORE was given.
 if test "${enable_ONCORE+set}" = set; then
   enableval="$enable_ONCORE"
@@ -8550,7 +8557,7 @@ fi
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking for Palisade clock""... $ac_c" 1>&6
-echo "configure:8554: checking for Palisade clock" >&5
+echo "configure:8561: checking for Palisade clock" >&5
 # Check whether --enable-PALISADE or --disable-PALISADE was given.
 if test "${enable_PALISADE+set}" = set; then
   enableval="$enable_PALISADE"
@@ -8576,7 +8583,7 @@ fi
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking PST/Traconex 1020 WWV/WWVH receiver""... $ac_c" 1>&6
-echo "configure:8580: checking PST/Traconex 1020 WWV/WWVH receiver" >&5
+echo "configure:8587: checking PST/Traconex 1020 WWV/WWVH receiver" >&5
 # Check whether --enable-PST or --disable-PST was given.
 if test "${enable_PST+set}" = set; then
   enableval="$enable_PST"
@@ -8596,7 +8603,7 @@ echo "$ac_t""$ntp_ok" 1>&6
 
 # Not Ultrix
 echo $ac_n "checking Rockwell Jupiter GPS receiver""... $ac_c" 1>&6
-echo "configure:8600: checking Rockwell Jupiter GPS receiver" >&5
+echo "configure:8607: checking Rockwell Jupiter GPS receiver" >&5
 # Check whether --enable-JUPITER or --disable-JUPITER was given.
 if test "${enable_JUPITER+set}" = set; then
   enableval="$enable_JUPITER"
@@ -8624,14 +8631,14 @@ esac
 
 # Requires modem control
 echo $ac_n "checking PTB modem service""... $ac_c" 1>&6
-echo "configure:8628: checking PTB modem service" >&5
+echo "configure:8635: checking PTB modem service" >&5
 # Check whether --enable-PTBACTS or --disable-PTBACTS was given.
 if test "${enable_PTBACTS+set}" = set; then
   enableval="$enable_PTBACTS"
   ntp_ok=$enableval
 else
   cat > conftest.$ac_ext <<EOF
-#line 8635 "configure"
+#line 8642 "configure"
 #include "confdefs.h"
 #include <termios.h>
 #ifdef HAVE_SYS_IOCTL_H
@@ -8664,7 +8671,7 @@ fi
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking KSI/Odetics TPRO/S GPS receiver/IRIG interface""... $ac_c" 1>&6
-echo "configure:8668: checking KSI/Odetics TPRO/S GPS receiver/IRIG interface" >&5
+echo "configure:8675: checking KSI/Odetics TPRO/S GPS receiver/IRIG interface" >&5
 # Check whether --enable-TPRO or --disable-TPRO was given.
 if test "${enable_TPRO+set}" = set; then
   enableval="$enable_TPRO"
@@ -8692,7 +8699,7 @@ case "$ntp_ok$ac_cv_header_sys_tpro" in
 esac
 
 echo $ac_n "checking TRAK 8810 GPS receiver""... $ac_c" 1>&6
-echo "configure:8696: checking TRAK 8810 GPS receiver" >&5
+echo "configure:8703: checking TRAK 8810 GPS receiver" >&5
 # Check whether --enable-TRAK or --disable-TRAK was given.
 if test "${enable_TRAK+set}" = set; then
   enableval="$enable_TRAK"
@@ -8711,7 +8718,7 @@ fi
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking Chrono-log K-series WWVB receiver""... $ac_c" 1>&6
-echo "configure:8715: checking Chrono-log K-series WWVB receiver" >&5
+echo "configure:8722: checking Chrono-log K-series WWVB receiver" >&5
 # Check whether --enable-CHRONOLOG or --disable-CHRONOLOG was given.
 if test "${enable_CHRONOLOG+set}" = set; then
   enableval="$enable_CHRONOLOG"
@@ -8730,7 +8737,7 @@ fi
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking Dumb generic hh:mm:ss local clock""... $ac_c" 1>&6
-echo "configure:8734: checking Dumb generic hh:mm:ss local clock" >&5
+echo "configure:8741: checking Dumb generic hh:mm:ss local clock" >&5
 # Check whether --enable-DUMBCLOCK or --disable-DUMBCLOCK was given.
 if test "${enable_DUMBCLOCK+set}" = set; then
   enableval="$enable_DUMBCLOCK"
@@ -8749,7 +8756,7 @@ fi
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking Conrad parallel port radio clock""... $ac_c" 1>&6
-echo "configure:8753: checking Conrad parallel port radio clock" >&5
+echo "configure:8760: checking Conrad parallel port radio clock" >&5
 # Check whether --enable-PCF or --disable-PCF was given.
 if test "${enable_PCF+set}" = set; then
   enableval="$enable_PCF"
@@ -8768,7 +8775,7 @@ fi
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking Spectracom 8170/Netclock/2 WWVB receiver""... $ac_c" 1>&6
-echo "configure:8772: checking Spectracom 8170/Netclock/2 WWVB receiver" >&5
+echo "configure:8779: checking Spectracom 8170/Netclock/2 WWVB receiver" >&5
 # Check whether --enable-SPECTRACOM or --disable-SPECTRACOM was given.
 if test "${enable_SPECTRACOM+set}" = set; then
   enableval="$enable_SPECTRACOM"
@@ -8788,7 +8795,7 @@ echo "$ac_t""$ntp_ok" 1>&6
 
 # Not on a vax-dec-bsd
 echo $ac_n "checking Kinemetrics/TrueTime receivers""... $ac_c" 1>&6
-echo "configure:8792: checking Kinemetrics/TrueTime receivers" >&5
+echo "configure:8799: checking Kinemetrics/TrueTime receivers" >&5
 # Check whether --enable-TRUETIME or --disable-TRUETIME was given.
 if test "${enable_TRUETIME+set}" = set; then
   enableval="$enable_TRUETIME"
@@ -8817,7 +8824,7 @@ case "$ntp_ok$target" in
 esac
 
 echo $ac_n "checking Ultralink M320 WWVB receiver""... $ac_c" 1>&6
-echo "configure:8821: checking Ultralink M320 WWVB receiver" >&5
+echo "configure:8828: checking Ultralink M320 WWVB receiver" >&5
 # Check whether --enable-ULINK or --disable-ULINK was given.
 if test "${enable_ULINK+set}" = set; then
   enableval="$enable_ULINK"
@@ -8836,18 +8843,15 @@ fi
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking WWV receiver""... $ac_c" 1>&6
-echo "configure:8840: checking WWV receiver" >&5
+echo "configure:8847: checking WWV receiver" >&5
 # Check whether --enable-WWV or --disable-WWV was given.
 if test "${enable_WWV+set}" = set; then
   enableval="$enable_WWV"
   ntp_ok=$enableval
 else
-  case "$ac_cv_header_sun_audioio_h$ac_cv_header_sys_audioio_h" in
-     *yes*)
-       ntp_ok=$ntp_eac
-       ;;
-     *)        ntp_ok=no
-       ;;
+  case "$ntp_eac$ntp_canaudio" in
+     *no*)     ntp_ok=no  ;;
+     *)                ntp_ok=yes ;;
     esac
 fi
 
@@ -8859,17 +8863,20 @@ EOF
 
 fi
 echo "$ac_t""$ntp_ok" 1>&6
+case "$ntp_ok$ntp_canaudio" in
+ yesno) echo "configure: warning: *** But the expected answer is... no ***" 1>&2 ;;
+esac
 
 # Requires modem control
 echo $ac_n "checking USNO modem service""... $ac_c" 1>&6
-echo "configure:8866: checking USNO modem service" >&5
+echo "configure:8873: checking USNO modem service" >&5
 # Check whether --enable-USNO or --disable-USNO was given.
 if test "${enable_USNO+set}" = set; then
   enableval="$enable_USNO"
   ntp_ok=$enableval
 else
   cat > conftest.$ac_ext <<EOF
-#line 8873 "configure"
+#line 8880 "configure"
 #include "confdefs.h"
 #include <termios.h>
 #ifdef HAVE_SYS_IOCTL_H
@@ -8902,7 +8909,7 @@ fi
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking for default inclusion of all suitable PARSE clocks""... $ac_c" 1>&6
-echo "configure:8906: checking for default inclusion of all suitable PARSE clocks" >&5
+echo "configure:8913: checking for default inclusion of all suitable PARSE clocks" >&5
 # Check whether --enable-parse-clocks or --disable-parse-clocks was given.
 if test "${enable_parse_clocks+set}" = set; then
   enableval="$enable_parse_clocks"
@@ -8932,7 +8939,7 @@ ntp_parseutil=no
 ntp_rawdcf=no
 
 echo $ac_n "checking Diem Computime Radio Clock""... $ac_c" 1>&6
-echo "configure:8936: checking Diem Computime Radio Clock" >&5
+echo "configure:8943: checking Diem Computime Radio Clock" >&5
 # Check whether --enable-COMPUTIME or --disable-COMPUTIME was given.
 if test "${enable_COMPUTIME+set}" = set; then
   enableval="$enable_COMPUTIME"
@@ -8957,7 +8964,7 @@ case "$ntp_ok$ntp_canparse" in
 esac
 
 echo $ac_n "checking ELV/DCF7000 clock""... $ac_c" 1>&6
-echo "configure:8961: checking ELV/DCF7000 clock" >&5
+echo "configure:8968: checking ELV/DCF7000 clock" >&5
 # Check whether --enable-DCF7000 or --disable-DCF7000 was given.
 if test "${enable_DCF7000+set}" = set; then
   enableval="$enable_DCF7000"
@@ -8982,7 +8989,7 @@ case "$ntp_ok$ntp_canparse" in
 esac
 
 echo $ac_n "checking HOPF 6021 clock""... $ac_c" 1>&6
-echo "configure:8986: checking HOPF 6021 clock" >&5
+echo "configure:8993: checking HOPF 6021 clock" >&5
 # Check whether --enable-HOPF6021 or --disable-HOPF6021 was given.
 if test "${enable_HOPF6021+set}" = set; then
   enableval="$enable_HOPF6021"
@@ -9007,7 +9014,7 @@ case "$ntp_ok$ntp_canparse" in
 esac
 
 echo $ac_n "checking Meinberg clocks""... $ac_c" 1>&6
-echo "configure:9011: checking Meinberg clocks" >&5
+echo "configure:9018: checking Meinberg clocks" >&5
 # Check whether --enable-MEINBERG or --disable-MEINBERG was given.
 if test "${enable_MEINBERG+set}" = set; then
   enableval="$enable_MEINBERG"
@@ -9032,7 +9039,7 @@ case "$ntp_ok$ntp_canparse" in
 esac
 
 echo $ac_n "checking DCF77 raw time code""... $ac_c" 1>&6
-echo "configure:9036: checking DCF77 raw time code" >&5
+echo "configure:9043: checking DCF77 raw time code" >&5
 # Check whether --enable-RAWDCF or --disable-RAWDCF was given.
 if test "${enable_RAWDCF+set}" = set; then
   enableval="$enable_RAWDCF"
@@ -9061,7 +9068,7 @@ esac
 case "$ntp_rawdcf" in
  yes)
     echo $ac_n "checking if we must enable parity for RAWDCF""... $ac_c" 1>&6
-echo "configure:9065: checking if we must enable parity for RAWDCF" >&5
+echo "configure:9072: checking if we must enable parity for RAWDCF" >&5
 if eval "test \"`echo '$''{'ac_cv_var_rawdcf_parity'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9089,7 +9096,7 @@ EOF
 esac
 
 echo $ac_n "checking RCC 8000 clock""... $ac_c" 1>&6
-echo "configure:9093: checking RCC 8000 clock" >&5
+echo "configure:9100: checking RCC 8000 clock" >&5
 # Check whether --enable-RCC8000 or --disable-RCC8000 was given.
 if test "${enable_RCC8000+set}" = set; then
   enableval="$enable_RCC8000"
@@ -9114,7 +9121,7 @@ case "$ntp_ok$ntp_canparse" in
 esac
 
 echo $ac_n "checking Schmid DCF77 clock""... $ac_c" 1>&6
-echo "configure:9118: checking Schmid DCF77 clock" >&5
+echo "configure:9125: checking Schmid DCF77 clock" >&5
 # Check whether --enable-SCHMID or --disable-SCHMID was given.
 if test "${enable_SCHMID+set}" = set; then
   enableval="$enable_SCHMID"
@@ -9139,7 +9146,7 @@ case "$ntp_ok$ntp_canparse" in
 esac
 
 echo $ac_n "checking Trimble GPS receiver/TAIP protocol""... $ac_c" 1>&6
-echo "configure:9143: checking Trimble GPS receiver/TAIP protocol" >&5
+echo "configure:9150: checking Trimble GPS receiver/TAIP protocol" >&5
 # Check whether --enable-TRIMTAIP or --disable-TRIMTAIP was given.
 if test "${enable_TRIMTAIP+set}" = set; then
   enableval="$enable_TRIMTAIP"
@@ -9164,7 +9171,7 @@ case "$ntp_ok$ntp_canparse" in
 esac
 
 echo $ac_n "checking Trimble GPS receiver/TSIP protocol""... $ac_c" 1>&6
-echo "configure:9168: checking Trimble GPS receiver/TSIP protocol" >&5
+echo "configure:9175: checking Trimble GPS receiver/TSIP protocol" >&5
 # Check whether --enable-TRIMTSIP or --disable-TRIMTSIP was given.
 if test "${enable_TRIMTSIP+set}" = set; then
   enableval="$enable_TRIMTSIP"
@@ -9189,7 +9196,7 @@ case "$ntp_ok$ntp_canparse" in
 esac
 
 echo $ac_n "checking WHARTON 400A Series clock""... $ac_c" 1>&6
-echo "configure:9193: checking WHARTON 400A Series clock" >&5
+echo "configure:9200: checking WHARTON 400A Series clock" >&5
 # Check whether --enable-WHARTON or --disable-WHARTON was given.
 if test "${enable_WHARTON+set}" = set; then
   enableval="$enable_WHARTON"
@@ -9214,7 +9221,7 @@ case "$ntp_ok$ntp_canparse" in
 esac
 
 echo $ac_n "checking VARITEXT clock""... $ac_c" 1>&6
-echo "configure:9218: checking VARITEXT clock" >&5
+echo "configure:9225: checking VARITEXT clock" >&5
 # Check whether --enable-VARITEXT or --disable-VARITEXT was given.
 if test "${enable_VARITEXT+set}" = set; then
   enableval="$enable_VARITEXT"
@@ -9242,7 +9249,7 @@ esac
 
 
 echo $ac_n "checking if we need to make and use the parse libraries""... $ac_c" 1>&6
-echo "configure:9246: checking if we need to make and use the parse libraries" >&5
+echo "configure:9253: checking if we need to make and use the parse libraries" >&5
 ans=no
 case "$ntp_libparse" in
  yes)
@@ -9270,7 +9277,7 @@ echo "$ac_t""$ans" 1>&6
 
 
 echo $ac_n "checking if we need to make and use the RSAREF library""... $ac_c" 1>&6
-echo "configure:9274: checking if we need to make and use the RSAREF library" >&5
+echo "configure:9281: checking if we need to make and use the RSAREF library" >&5
 ans=no
 if test -f $srcdir/rsaref2/source/rsa.c
 then
@@ -9288,7 +9295,7 @@ echo "$ac_t""$ans" 1>&6
 
 
 echo $ac_n "checking if we can make dcf parse utilities""... $ac_c" 1>&6
-echo "configure:9292: checking if we can make dcf parse utilities" >&5
+echo "configure:9299: checking if we can make dcf parse utilities" >&5
 ans=no
 if test "$ntp_parseutil" = "yes"; then
     case "$target" in
@@ -9303,7 +9310,7 @@ echo "$ac_t""$ans" 1>&6
 
 
 echo $ac_n "checking if we can build kernel streams modules for parse""... $ac_c" 1>&6
-echo "configure:9307: checking if we can build kernel streams modules for parse" >&5
+echo "configure:9314: checking if we can build kernel streams modules for parse" >&5
 ans=no
 case "$ntp_parseutil$ac_cv_header_sys_stropts_h" in
  yesyes)
@@ -9330,7 +9337,7 @@ esac
 echo "$ac_t""$ans" 1>&6
 
 echo $ac_n "checking if we need basic refclock support""... $ac_c" 1>&6
-echo "configure:9334: checking if we need basic refclock support" >&5
+echo "configure:9341: checking if we need basic refclock support" >&5
 if test "$ntp_refclock" = "yes"; then
     cat >> confdefs.h <<\EOF
 #define REFCLOCK 1
@@ -9342,7 +9349,7 @@ echo "$ac_t""$ntp_refclock" 1>&6
                        
 
 echo $ac_n "checking if we want HP-UX adjtimed support""... $ac_c" 1>&6
-echo "configure:9346: checking if we want HP-UX adjtimed support" >&5
+echo "configure:9353: checking if we want HP-UX adjtimed support" >&5
 case "$target" in
  *-*-hpux[56789]*)
     ans=yes
@@ -9360,7 +9367,7 @@ fi
 echo "$ac_t""$ans" 1>&6
 
 echo $ac_n "checking if we can read kmem""... $ac_c" 1>&6
-echo "configure:9364: checking if we can read kmem" >&5
+echo "configure:9371: checking if we can read kmem" >&5
 if eval "test \"`echo '$''{'ac_cv_var_can_kmem'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9413,7 +9420,7 @@ EOF
 esac
 
 echo $ac_n "checking if adjtime is accurate""... $ac_c" 1>&6
-echo "configure:9417: checking if adjtime is accurate" >&5
+echo "configure:9424: checking if adjtime is accurate" >&5
 if eval "test \"`echo '$''{'ac_cv_var_adjtime_is_accurate'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9465,7 +9472,7 @@ EOF
 esac
 
 echo $ac_n "checking the name of 'tick' in the kernel""... $ac_c" 1>&6
-echo "configure:9469: checking the name of 'tick' in the kernel" >&5
+echo "configure:9476: checking the name of 'tick' in the kernel" >&5
 if eval "test \"`echo '$''{'ac_cv_var_nlist_tick'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9509,7 +9516,7 @@ EOF
 esac
 #
 echo $ac_n "checking for the units of 'tick'""... $ac_c" 1>&6
-echo "configure:9513: checking for the units of 'tick'" >&5
+echo "configure:9520: checking for the units of 'tick'" >&5
 if eval "test \"`echo '$''{'ac_cv_var_tick_nano'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9533,7 +9540,7 @@ EOF
 esac
 #
 echo $ac_n "checking the name of 'tickadj' in the kernel""... $ac_c" 1>&6
-echo "configure:9537: checking the name of 'tickadj' in the kernel" >&5
+echo "configure:9544: checking the name of 'tickadj' in the kernel" >&5
 if eval "test \"`echo '$''{'ac_cv_var_nlist_tickadj'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9586,7 +9593,7 @@ EOF
 esac
 #
 echo $ac_n "checking for the units of 'tickadj'""... $ac_c" 1>&6
-echo "configure:9590: checking for the units of 'tickadj'" >&5
+echo "configure:9597: checking for the units of 'tickadj'" >&5
 if eval "test \"`echo '$''{'ac_cv_var_tickadj_nano'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9610,7 +9617,7 @@ EOF
 esac
 #
 echo $ac_n "checking half-heartedly for 'dosynctodr' in the kernel""... $ac_c" 1>&6
-echo "configure:9614: checking half-heartedly for 'dosynctodr' in the kernel" >&5
+echo "configure:9621: checking half-heartedly for 'dosynctodr' in the kernel" >&5
 if eval "test \"`echo '$''{'ac_cv_var_nlist_dosynctodr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9663,7 +9670,7 @@ EOF
 esac
 #
 echo $ac_n "checking half-heartedly for 'noprintf' in the kernel""... $ac_c" 1>&6
-echo "configure:9667: checking half-heartedly for 'noprintf' in the kernel" >&5
+echo "configure:9674: checking half-heartedly for 'noprintf' in the kernel" >&5
 if eval "test \"`echo '$''{'ac_cv_var_nlist_noprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9713,7 +9720,7 @@ esac
 
 
 echo $ac_n "checking for a default value for 'tick'""... $ac_c" 1>&6
-echo "configure:9717: checking for a default value for 'tick'" >&5
+echo "configure:9724: checking for a default value for 'tick'" >&5
 if eval "test \"`echo '$''{'ac_cv_var_tick'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9757,7 +9764,7 @@ EOF
 esac
 
 echo $ac_n "checking for a default value for 'tickadj'""... $ac_c" 1>&6
-echo "configure:9761: checking for a default value for 'tickadj'" >&5
+echo "configure:9768: checking for a default value for 'tickadj'" >&5
 if eval "test \"`echo '$''{'ac_cv_var_tickadj'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9890,7 +9897,7 @@ esac
 
 
 echo $ac_n "checking if we want and can make the tickadj utility""... $ac_c" 1>&6
-echo "configure:9894: checking if we want and can make the tickadj utility" >&5
+echo "configure:9901: checking if we want and can make the tickadj utility" >&5
 if eval "test \"`echo '$''{'ac_cv_make_tickadj'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9906,7 +9913,7 @@ esac
 
 
 echo $ac_n "checking if we want and can make the ntptime utility""... $ac_c" 1>&6
-echo "configure:9910: checking if we want and can make the ntptime utility" >&5
+echo "configure:9917: checking if we want and can make the ntptime utility" >&5
 if eval "test \"`echo '$''{'ac_cv_make_ntptime'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9932,7 +9939,7 @@ case "$ac_cv_make_ntptime" in
 esac
 
 echo $ac_n "checking if we want UDP wildcard delivery""... $ac_c" 1>&6
-echo "configure:9936: checking if we want UDP wildcard delivery" >&5
+echo "configure:9943: checking if we want UDP wildcard delivery" >&5
 if eval "test \"`echo '$''{'ac_cv_var_udp_wildcard_delivery'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10011,7 +10018,7 @@ case "$host" in
 esac
 
 echo $ac_n "checking if we should always slew the time""... $ac_c" 1>&6
-echo "configure:10015: checking if we should always slew the time" >&5
+echo "configure:10022: checking if we should always slew the time" >&5
 if eval "test \"`echo '$''{'ac_cv_var_slew_always'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10051,7 +10058,7 @@ EOF
 esac
 
 echo $ac_n "checking if we should step and slew the time""... $ac_c" 1>&6
-echo "configure:10055: checking if we should step and slew the time" >&5
+echo "configure:10062: checking if we should step and slew the time" >&5
 if eval "test \"`echo '$''{'ac_cv_var_step_slew'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10094,7 +10101,7 @@ EOF
 esac
 
 echo $ac_n "checking if ntpdate should step the time""... $ac_c" 1>&6
-echo "configure:10098: checking if ntpdate should step the time" >&5
+echo "configure:10105: checking if ntpdate should step the time" >&5
 if eval "test \"`echo '$''{'ac_cv_var_ntpdate_step'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10125,7 +10132,7 @@ EOF
 esac
 
 echo $ac_n "checking if we should sync TODR clock every hour""... $ac_c" 1>&6
-echo "configure:10129: checking if we should sync TODR clock every hour" >&5
+echo "configure:10136: checking if we should sync TODR clock every hour" >&5
 if eval "test \"`echo '$''{'ac_cv_var_sync_todr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10158,7 +10165,7 @@ EOF
 esac
 
 echo $ac_n "checking if we should avoid kernel FLL bug""... $ac_c" 1>&6
-echo "configure:10162: checking if we should avoid kernel FLL bug" >&5
+echo "configure:10169: checking if we should avoid kernel FLL bug" >&5
 if eval "test \"`echo '$''{'ac_cv_var_kernel_fll_bug'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

diff --git a/configure.in b/configure.in
index d125c28dcb5d61d020bd75f5b372a9efa6ea0ceb..3898f25adf2bc92cd3ae49cddfbea3ec65ae74b4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1534,6 +1534,13 @@ case "$ac_cv_header_termio_h$ac_cv_header_termios_h" in
 esac
 AC_MSG_RESULT($ntp_canparse)
 
+AC_MSG_CHECKING([if we have support for audio clocks])
+case "$ac_cv_header_sun_audioio_h$ac_cv_header_sys_audioio_h" in
+ *yes*)        ntp_canaudio=yes ;;
+ *)    ntp_canaudio=no  ;;
+esac
+AC_MSG_RESULT($ntp_canaudio)
+
 # Requires modem control
 AC_MSG_CHECKING(ACTS modem service)
 AC_ARG_ENABLE(ACTS,            [  --enable-ACTS           + ACTS modem service],
@@ -1591,7 +1598,7 @@ AC_MSG_RESULT($ntp_ok)
 
 AC_MSG_CHECKING(CHU modem/decoder)
 AC_ARG_ENABLE(CHU,             [  --enable-CHU            - CHU modem/decoder],
-    [ntp_ok=$enableval], [ntp_ok=no])
+    [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
     AC_DEFINE(CLOCK_CHU)
@@ -1600,16 +1607,19 @@ AC_MSG_RESULT($ntp_ok)
 ac_refclock_chu=$ntp_ok
 
 AC_MSG_CHECKING(CHU audio/decoder)
-AC_ARG_ENABLE(AUDIO-CHU,       [  --enable-AUDIO-CHU      + CHU audio/decoder],
-    [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
+AC_ARG_ENABLE(AUDIO-CHU,       [  --enable-AUDIO-CHU      s CHU audio/decoder],
+    [ntp_ok=$enableval],
+    [case "$ntp_eac$ac_refclock_chu$ntp_canaudio" in
+ *no*) ntp_ok=no  ;;
+ *)    ntp_ok=yes ;;
+esac])
 if test "$ntp_ok" = "yes"; then
     AC_DEFINE(AUDIO_CHU)
 fi
 AC_MSG_RESULT($ntp_ok)
-case "$ntp_ok$ac_refclock_chu$target" in
- yesyes*-*-sunos*) ;;
- yesyes*-*-solaris*) ;;
- yes*) AC_WARN(*** But the expected answer is...no ***) ;;
+# We used to check for sunos/solaris target...
+case "$ntp_ok$ac_refclock_chu$ntp_canaudio" in
+ yes*no*) AC_WARN(*** But the expected answer is...no ***) ;;
 esac
 
 # Not under HP-UX
@@ -1669,20 +1679,17 @@ AC_MSG_RESULT($ntp_ok)
 AC_MSG_CHECKING(Sun IRIG audio decoder)
 AC_ARG_ENABLE(IRIG,            [  --enable-IRIG           s Sun IRIG audio decoder],
     [ntp_ok=$enableval],
-    [case "$ac_cv_header_sun_audioio_h$ac_cv_header_sys_audioio_h" in
-     *yes*)
-       ntp_ok=$ntp_eac
-       ;;
-     *)        ntp_ok=no
-       ;;
+    [case "$ntp_eac$ntp_canaudio" in
+     *no*)     ntp_ok=no  ;;
+     *)                ntp_ok=yes ;;
     esac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
     AC_DEFINE(CLOCK_IRIG)
 fi
 AC_MSG_RESULT($ntp_ok)
-case "$ntp_ok$ac_cv_header_sun_audioio_h$ac_cv_header_sys_audioio_h" in
- yesnono) AC_WARN(*** But the expected answer is... no ***) ;;
+case "$ntp_ok$ntp_canaudio" in
+ yesno) AC_WARN(*** But the expected answer is... no ***) ;;
 esac
 
 AC_MSG_CHECKING(Leitch CSD 5300 Master Clock System Driver)
@@ -1913,18 +1920,18 @@ AC_MSG_RESULT($ntp_ok)
 AC_MSG_CHECKING(WWV receiver)
 AC_ARG_ENABLE(WWV,             [  --enable-WWV            + WWV Audio receiver],
     [ntp_ok=$enableval],
-    [case "$ac_cv_header_sun_audioio_h$ac_cv_header_sys_audioio_h" in
-     *yes*)
-       ntp_ok=$ntp_eac
-       ;;
-     *)        ntp_ok=no
-       ;;
+    [case "$ntp_eac$ntp_canaudio" in
+     *no*)     ntp_ok=no  ;;
+     *)                ntp_ok=yes ;;
     esac])
 if test "$ntp_ok" = "yes"; then
     ntp_refclock=yes
     AC_DEFINE(CLOCK_WWV)
 fi
 AC_MSG_RESULT($ntp_ok)
+case "$ntp_ok$ntp_canaudio" in
+ yesno) AC_WARN(*** But the expected answer is... no ***) ;;
+esac
 
 # Requires modem control
 AC_MSG_CHECKING(USNO modem service)