ChangeLog, aclocal.m4, configure, configure.in:

  * configure.in: Lose the changequote calls and fix the quoting.
  Reported by: Akim Demaille <akim@epita.fr>

bk: 38ba49d4hF01DBJLP3wuC6cNdRdgVw

diff --git a/ChangeLog b/ChangeLog
index e9eb311af1eb883b9129358e90314563cbbcde63..e88c5e85795de6df0f07da45238e1f19f5216332 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 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>

diff --git a/aclocal.m4 b/aclocal.m4
index 981fd7243eaddaefd743949d6c421f94302b7854..58a619afd827c45d75de53854afab9024b15fd0a 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -153,7 +153,7 @@ if eval "$MISSING --run :"; then
   am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  AC_MSG_WARN([\`missing' script is too old or missing])
+  AC_MSG_WARN([`missing' script is too old or missing])
 fi
 ])
 

diff --git a/configure b/configure
index 06f1630a7321582cb847a47d5dbb9d0c1eb9a5fc..9f0d309cb11667638c1273877008be49b26b3d4f 100755 (executable)
--- a/configure
+++ b/configure
@@ -7005,8 +7005,8 @@ else
 int
 main ()
 {
-  extern char *sys_errlist[];
-  
+extern char *sys_errlist[];
+
   ;
   return 0;
 }
@@ -7707,7 +7707,7 @@ else
   ans=no
 case "$ac_cv_hdr_def_sigpoll" in
  yes)
-        case "$target" in
+    case "$target" in
      mips-sgi-irix*)
        ans=no
        ;;
@@ -7741,7 +7741,7 @@ case "$ac_cv_hdr_def_sigpoll" in
      *) ans=yes
         ;;
     esac
-        ;;
+    ;;
 esac
 ac_cv_var_use_udp_sigpoll=$ans
 fi
@@ -9977,7 +9977,7 @@ if test "${enable_kmem+set}" = set; then
   enableval="$enable_kmem"
   ans=$enableval
 else
-      case "$ac_cv_func_nlist$ac_cv_func_K_open$ac_cv_func_kvm_open" in
+  case "$ac_cv_func_nlist$ac_cv_func_K_open$ac_cv_func_kvm_open" in
      *yes*)
        ans=yes
        ;;
@@ -10004,7 +10004,7 @@ else
        ans=no
        ;;
     esac
-        
+    
 fi
 
 ac_cv_var_can_kmem=$ans
@@ -10029,7 +10029,7 @@ if test "${enable_accurate_adjtime+set}" = set; then
   enableval="$enable_accurate_adjtime"
   ans=$enableval
 else
-      case "$target" in
+  case "$target" in
       i386-sequent-ptx*)
         ans=no
         ;;
@@ -10057,7 +10057,7 @@ else
       *) ans=no
         ;;
      esac
-          
+     
 fi
 
 ac_cv_var_adjtime_is_accurate=$ans
@@ -10610,7 +10610,7 @@ if test "${enable_slew_always+set}" = set; then
   enableval="$enable_slew_always"
   ans=$enableval
 else
-      case "$target" in
+  case "$target" in
       *-apple-aux[23]*)
         ans=yes
         ;;
@@ -10626,7 +10626,7 @@ else
       *) ans=no
         ;;
      esac
-          
+     
 fi
 
 ac_cv_var_slew_always=$ans
@@ -10649,7 +10649,7 @@ if test "${enable_step_slew+set}" = set; then
   enableval="$enable_step_slew"
   ans=$enableval
 else
-      case "$target" in
+  case "$target" in
       *-sni-sysv*)
         ans=yes
         ;;
@@ -10668,7 +10668,7 @@ else
       *) ans=no
         ;;
      esac
-          
+     
 fi
 
 ac_cv_var_step_slew=$ans
@@ -10691,14 +10691,14 @@ if test "${enable_ntpdate_step+set}" = set; then
   enableval="$enable_ntpdate_step"
   ans=$enableval
 else
-      case "$target" in
+  case "$target" in
       *-apple-aux[23]*)
         ans=yes
         ;;
       *) ans=no
         ;;
      esac
-          
+     
 fi
 
 ac_cv_var_ntpdate_step=$ans
@@ -10753,7 +10753,7 @@ if test "${enable_kernel_fll_bug+set}" = set; then
   enableval="$enable_kernel_fll_bug"
   ans=$enableval
 else
-      case "$target" in
+  case "$target" in
      *-*-solaris2.6)
         case "`uname -v`" in
          Generic_105181-17)
@@ -10778,7 +10778,7 @@ else
      *) ans=no
         ;;
     esac
-        
+    
 fi
 
 ac_cv_var_kernel_fll_bug=$ans

diff --git a/configure.in b/configure.in
index d81d81295e3a1fb701506376d85851fd3c440a26..09653053362a6b07ee552538932d4daeace1aa36 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -737,9 +737,8 @@ AC_CACHE_CHECK([[if declaring 'char *sys_errlist[]' is ok]], ac_cv_decl_sys_errl
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif],
-  changequote(<<, >>)dnl
-  <<extern char *sys_errlist[];>>
-  changequote([, ]),
+  [extern char *sys_errlist[];
+],
   ac_cv_decl_sys_errlist=yes, ac_cv_decl_sys_errlist=no)])
 case "$ac_cv_decl_sys_errlist" in
  yes) AC_DEFINE(CHAR_SYS_ERRLIST) ;;
@@ -766,9 +765,7 @@ case "$ac_cv_decl_syscall" in
 esac
 
 case "$target" in
-changequote(<<, >>)dnl
- *-*-osf[45]*)
-changequote([, ])dnl
+ *-*-osf[[45]]*)
     AC_DEFINE(DECL_PLOCK_0)
     AC_DEFINE(DECL_STIME_1)
     ;;
@@ -859,13 +856,11 @@ AC_CACHE_CHECK(if we should use a streams device for ifconfig,
 
 AC_CACHE_CHECK(if we need extra room for SO_RCVBUF, ac_cv_var_rcvbuf_slop,
 [ans=no
-changequote(<<, >>)dnl
 case "$target" in
- *-*-hpux[567]*)
+ *-*-hpux[[567]]*)
     ans=yes
     ;;
 esac
-changequote([, ])dnl
 ac_cv_var_rcvbuf_slop=$ans])
 case "$ac_cv_var_rcvbuf_slop" in
  yes) AC_DEFINE(NEED_RCVBUF_SLOP) ;;
@@ -899,9 +894,8 @@ case "$ac_cv_var_hpux_findconfig" in
 esac
 
 AC_CACHE_CHECK(if process groups are set with -pid, ac_cv_arg_setpgrp_negpid,
-[changequote(<<, >>)dnl
-case "$target" in
- *-*-hpux[567]*)
+[case "$target" in
+ *-*-hpux[[567]]*)
     ans=no
     ;;
  *-*-hpux*)
@@ -920,7 +914,6 @@ case "$target" in
     ans=no
     ;;
 esac
-changequote([, ])dnl
 ac_cv_arg_setpgrp_negpid=$ans])
 case "$ac_cv_arg_setpgrp_negpid" in
  yes) AC_DEFINE(UDP_BACKWARDS_SETOWN) ;;
@@ -1082,7 +1075,6 @@ AC_CACHE_CHECK(if we can use SIGPOLL for UDP I/O, ac_cv_var_use_udp_sigpoll,
 [ans=no
 case "$ac_cv_hdr_def_sigpoll" in
  yes)
-    changequote(<<, >>)dnl
     case "$target" in
      mips-sgi-irix*)
        ans=no
@@ -1117,7 +1109,6 @@ case "$ac_cv_hdr_def_sigpoll" in
      *) ans=yes
         ;;
     esac
-    changequote([, ])dnl
     ;;
 esac
 ac_cv_var_use_udp_sigpoll=$ans])
@@ -2302,15 +2293,13 @@ AC_SUBST(CLKTEST)       dnl Set to "clktest"
 
 AC_SUBST(MAKE_ADJTIMED)
 AC_MSG_CHECKING(if we want HP-UX adjtimed support)
-changequote(<<, >>)dnl
 case "$target" in
- *-*-hpux[56789]*)
+ *-*-hpux[[56789]]*)
     ans=yes
     ;;
  *) ans=no
     ;;
 esac
-changequote([, ])dnl
 if test "$ans" = "yes"; then
     MAKE_ADJTIMED=adjtimed
     AC_DEFINE(NEED_HPUX_ADJTIME)
@@ -2320,8 +2309,7 @@ AC_MSG_RESULT($ans)
 AC_CACHE_CHECK(if we can read kmem, ac_cv_var_can_kmem,
 [AC_ARG_ENABLE(kmem,           [  --enable-kmem           s read /dev/kmem for tick and/or tickadj],
     [ans=$enableval],
-    [changequote(<<, >>)dnl
-    case "$ac_cv_func_nlist$ac_cv_func_K_open$ac_cv_func_kvm_open" in
+    [case "$ac_cv_func_nlist$ac_cv_func_K_open$ac_cv_func_kvm_open" in
      *yes*)
        ans=yes
        ;;
@@ -2338,7 +2326,7 @@ AC_CACHE_CHECK(if we can read kmem, ac_cv_var_can_kmem,
      *-*-hpux*)
        #ans=no
        ;;
-     *-*-irix[456]*)
+     *-*-irix[[456]]*)
        ans=no
        ;;
      *-*-linux*)
@@ -2348,7 +2336,6 @@ AC_CACHE_CHECK(if we can read kmem, ac_cv_var_can_kmem,
        ans=no
        ;;
     esac
-    changequote([, ])dnl
     ])
 ac_cv_var_can_kmem=$ans])
 
@@ -2361,15 +2348,14 @@ AC_CACHE_CHECK(if adjtime is accurate, ac_cv_var_adjtime_is_accurate,
 [AC_ARG_ENABLE(accurate-adjtime, [  --enable-accurate-adjtime
                           s the adjtime() call is accurate],
     [ans=$enableval],
-    [changequote(<<, >>)dnl
-    case "$target" in
+    [case "$target" in
       i386-sequent-ptx*)
         ans=no
         ;;
       i386-unknown-osf1*)
         ans=yes
         ;;
-      mips-sgi-irix[456]*)
+      mips-sgi-irix[[456]]*)
         ans=yes
         ;;
       *-fujitsu-uxp*)
@@ -2381,7 +2367,7 @@ AC_CACHE_CHECK(if adjtime is accurate, ac_cv_var_adjtime_is_accurate,
       *-*-linux*)
         ans=yes
         ;;
-      *-*-solaris2.[01]*)
+      *-*-solaris2.[[01]]*)
         ans=no
         ;;
       *-*-solaris2*)
@@ -2390,7 +2376,6 @@ AC_CACHE_CHECK(if adjtime is accurate, ac_cv_var_adjtime_is_accurate,
       *) ans=no
         ;;
      esac
-     changequote([, ])dnl
      ])
 ac_cv_var_adjtime_is_accurate=$ans])
 case "$ac_cv_var_adjtime_is_accurate" in
@@ -2399,25 +2384,24 @@ esac
 
 AC_CACHE_CHECK([the name of 'tick' in the kernel],
 ac_cv_var_nlist_tick,
-[changequote(<<, >>)dnl
-ans=_tick
+[ans=_tick
 case "$target" in
  m68*-hp-hpux*) # HP9000/300?
     ans=_old_tick
     ;;
- *-apple-aux[23]*)
+ *-apple-aux[[23]]*)
     ans=tick
     ;;
  *-hp-hpux*)
     ans=old_tick
     ;;
- *-ibm-aix[34]*)
+ *-ibm-aix[[34]]*)
     ans=no
     ;;
  *-*-ptx*)
     ans=tick
     ;;
- *-*-sco3.2v[45]*)
+ *-*-sco3.2v[[45]]*)
     ans=no
     ;;
  *-*-solaris2*)
@@ -2427,7 +2411,6 @@ case "$target" in
     ans=tick
     ;;
 esac
-changequote([, ])dnl
 ac_cv_var_nlist_tick=$ans])
 case "$ac_cv_var_nlist_tick" in
  ''|no) ;;     # HMS: I think we can only get 'no' here...
@@ -2436,14 +2419,12 @@ esac
 #
 AC_CACHE_CHECK([for the units of 'tick'],
 ac_cv_var_tick_nano,
-[changequote(<<, >>)dnl
-ans=usec
+[ans=usec
 case "$target" in
  *-*-solaris2*)
     ans=nsec
     ;;
 esac
-changequote([, ])dnl
 ac_cv_var_tick_nano=$ans])
 case "$ac_cv_var_tick_nano" in
  nsec)
@@ -2453,13 +2434,12 @@ esac
 #
 AC_CACHE_CHECK([the name of 'tickadj' in the kernel],
 ac_cv_var_nlist_tickadj,
-[changequote(<<, >>)dnl
-ans=_tickadj
+[ans=_tickadj
 case "$target" in
  m68*-hp-hpux*) # HP9000/300?
     ans=_tickadj
     ;;
- *-apple-aux[23]*)
+ *-apple-aux[[23]]*)
     ans=tickadj
     ;;
  *-hp-hpux10*)
@@ -2490,7 +2470,6 @@ case "$target" in
     ans=tickadj
     ;;
 esac
-changequote([, ])dnl
 ac_cv_var_nlist_tickadj=$ans])
 case "$ac_cv_var_nlist_tickadj" in
  ''|no) ;;     # HMS: I think we can only get 'no' here...
@@ -2499,14 +2478,12 @@ esac
 #
 AC_CACHE_CHECK([for the units of 'tickadj'],
 ac_cv_var_tickadj_nano,
-[changequote(<<, >>)dnl
-ans=usec
+[ans=usec
 case "$target" in
  *-*-solaris2*)
     ans=nsec
     ;;
 esac
-changequote([, ])dnl
 ac_cv_var_tickadj_nano=$ans])
 case "$ac_cv_var_tickadj_nano" in
  nsec)
@@ -2516,9 +2493,8 @@ esac
 #
 AC_CACHE_CHECK([half-heartedly for 'dosynctodr' in the kernel],
 ac_cv_var_nlist_dosynctodr,
-[changequote(<<, >>)dnl
-case "$target" in
- *-apple-aux[23]*)
+[case "$target" in
+ *-apple-aux[[23]]*)
     ans=no
     ;;
  *-sni-sysv*)
@@ -2552,7 +2528,6 @@ case "$target" in
     ans=_dosynctodr
     ;;
 esac
-changequote([, ])dnl
 ac_cv_var_nlist_dosynctodr=$ans])
 case "$ac_cv_var_nlist_dosynctodr" in
  no) ;;
@@ -2562,9 +2537,8 @@ esac
 #
 AC_CACHE_CHECK([half-heartedly for 'noprintf' in the kernel],
 ac_cv_var_nlist_noprintf,
-[changequote(<<, >>)dnl
-case "$target" in
- *-apple-aux[23]*)
+[case "$target" in
+ *-apple-aux[[23]]*)
     ans=no
     ;;
  *-sni-sysv*)
@@ -2592,7 +2566,6 @@ case "$target" in
     ans=_noprintf
     ;;
 esac
-changequote([, ])dnl
 ac_cv_var_nlist_noprintf=$ans])
 case "$ac_cv_var_nlist_noprintf" in
  no) ;;
@@ -2853,12 +2826,11 @@ esac
 AC_CACHE_CHECK(if we should always slew the time, ac_cv_var_slew_always,
 [AC_ARG_ENABLE(slew-always,     [  --enable-slew-always    s always slew the time],
     [ans=$enableval],
-    [changequote(<<, >>)dnl
-    case "$target" in
-      *-apple-aux[23]*)
+    [case "$target" in
+      *-apple-aux[[23]]*)
         ans=yes
         ;;
-      *-*-bsdi[012]*)
+      *-*-bsdi[[012]]*)
         ans=no
         ;;
       *-*-bsdi*)
@@ -2870,7 +2842,6 @@ AC_CACHE_CHECK(if we should always slew the time, ac_cv_var_slew_always,
       *) ans=no
         ;;
      esac
-     changequote([, ])dnl
      ])
 ac_cv_var_slew_always=$ans])
 case "$ac_cv_var_slew_always" in
@@ -2880,8 +2851,7 @@ esac
 AC_CACHE_CHECK(if we should step and slew the time, ac_cv_var_step_slew,
 [AC_ARG_ENABLE(step-slew,       [  --enable-step-slew      s step and slew the time],
     [ans=$enableval],
-    [changequote(<<, >>)dnl
-    case "$target" in
+    [case "$target" in
       *-sni-sysv*)
         ans=yes
         ;;
@@ -2891,7 +2861,7 @@ AC_CACHE_CHECK(if we should step and slew the time, ac_cv_var_step_slew,
       *-*-ptx*)
         ans=yes
         ;;
-      *-*-solaris2.[012]*)
+      *-*-solaris2.[[012]]*)
         ans=yes
         ;;
       *-*-sysv4*)      # HMS: Does this catch Fujitsu UXP?
@@ -2900,7 +2870,6 @@ AC_CACHE_CHECK(if we should step and slew the time, ac_cv_var_step_slew,
       *) ans=no
         ;;
      esac
-     changequote([, ])dnl
      ])
 ac_cv_var_step_slew=$ans])
 case "$ac_cv_var_step_slew" in
@@ -2910,15 +2879,13 @@ esac
 AC_CACHE_CHECK(if ntpdate should step the time, ac_cv_var_ntpdate_step,
 [AC_ARG_ENABLE(ntpdate-step,    [  --enable-ntpdate-step   s if ntpdate should step the time],
     [ans=$enableval],
-    [changequote(<<, >>)dnl
-    case "$target" in
-      *-apple-aux[23]*)
+    [case "$target" in
+      *-apple-aux[[23]]*)
         ans=yes
         ;;
       *) ans=no
         ;;
      esac
-     changequote([, ])dnl
      ])
 ac_cv_var_ntpdate_step=$ans])
 case "$ac_cv_var_ntpdate_step" in
@@ -2947,8 +2914,7 @@ esac
 AC_CACHE_CHECK(if we should avoid kernel FLL bug, ac_cv_var_kernel_fll_bug,
 [AC_ARG_ENABLE(kernel-fll-bug, [  --enable-kernel-fll-bug s if we should avoid a kernel FLL bug],
     [ans=$enableval],
-    [changequote(<<, >>)dnl
-    case "$target" in
+    [case "$target" in
      *-*-solaris2.6)
         case "`uname -v`" in
          Generic_105181-17)
@@ -2973,7 +2939,6 @@ AC_CACHE_CHECK(if we should avoid kernel FLL bug, ac_cv_var_kernel_fll_bug,
      *) ans=no
         ;;
     esac
-    changequote([, ])dnl
     ])
 ac_cv_var_kernel_fll_bug=$ans])
 case "$ac_cv_var_kernel_fll_bug" in