[Bug 784] Make --enable-linuxcaps the default when available

add reference to refclock_jjy.c to ports/winnt/ntpd/ntpd.vcproj

bk: 4a026f68xFunhJpBE4EdRFt_bgz3fw

diff --git a/ChangeLog b/ChangeLog
index a7ffbbdd11b6a468f89f4415d53f98af87621bc9..f98dbb1f5d276d7f6af1a5b57b79d59402e29487 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 ---
 
+* [Bug 784] Make --enable-linuxcaps the default when available
 * Updated JJY reference clock driver from Takao abe
 
 ---

diff --git a/configure.ac b/configure.ac
index a262e7ea466398a9842c3098c09a269fc9ff8bf3..94920c5cd486906e8f95456be0aafbf89decb6b5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4232,8 +4232,6 @@ esac
 
 AC_CHECK_HEADERS(sys/clockctl.h)
 
-AC_MSG_CHECKING([if we should use /dev/clockctl])
-
 case "$host" in
  *-*-netbsd*)
     ans=yes
@@ -4248,62 +4246,65 @@ AC_ARG_ENABLE(
        [--enable-clockctl],
        [s Use /dev/clockctl for non-root clock control]
     ),
-    [ans=$enableval]
+    [ntp_use_dev_clockctl=$enableval],
+    [ntp_use_dev_clockctl=$ac_cv_header_sys_clockctl_h]
 )
 
-case "$ac_cv_header_sys_clockctl_h" in
- no)
-    ans=no
-esac
-
-AC_MSG_RESULT([$ans])
-
-case "$ans" in
- yes)
-    AC_DEFINE(HAVE_DROPROOT, ,[Can we drop root privileges?])
-esac
+AC_MSG_CHECKING([[if we should use /dev/clockctl]])
+AC_MSG_RESULT([$ntp_use_dev_clockctl])
 
 
 AC_CHECK_HEADERS([sys/capability.h])
 AC_CHECK_HEADERS([sys/prctl.h])
 
-AC_MSG_CHECKING([if we have linux capabilities (libcap)])
+AC_MSG_CHECKING([[if we have linux capabilities (libcap)]])
+
+case "$ac_cv_header_sys_capability_h$ac_cv_header_sys_prctl_h" in
+ yesyes)
+    ntp_have_linuxcaps=yes
+    ;;
+ *)
+    ntp_have_linuxcaps=no
+esac
+
+AC_MSG_RESULT([$ntp_have_linuxcaps])
+
 
 AC_ARG_ENABLE(
     [linuxcaps],
     AC_HELP_STRING(
-        [--enable-linuxcaps], 
-        [s Use Linux capabilities for non-root clock control]
+       [--enable-linuxcaps],
+       [[s Use Linux capabilities for non-root clock control]]
     ),
-    [ans=$enableval],
-    [ans=no]
+    [ntp_have_linuxcaps=$enableval]
 )
 
-case "$ans$ac_cv_header_sys_capability_h$ac_cv_header_sys_prctl_h" in
- yesyesyes)
-    ;;
- *)
-    ans=no
-esac
-
-AC_MSG_RESULT([$ans])
 
-case "$ans" in
+case "$ntp_have_linuxcaps" in
  yes)
-    AC_DEFINE(HAVE_LINUX_CAPABILITIES, ,[Do we have Linux capabilities?])
-    AC_DEFINE(HAVE_DROPROOT, ,[Can we drop root privileges?])
+    AC_DEFINE(HAVE_LINUX_CAPABILITIES, ,[[Do we have Linux capabilities?]])
     LIBS="$LIBS -lcap"
 esac
 
 
-AC_CHECK_HEADERS(libscf.h)
+case "$ntp_use_dev_clockctl$ntp_have_linuxcaps" in
+ *yes*)
+    AC_DEFINE(HAVE_DROPROOT, ,[[Can we drop root privileges?]])
+esac
+
+
+AC_CHECK_HEADERS([libscf.h])
+
 case "$ac_cv_header_libscf_h" in
  yes)
     AC_SUBST(LSCF, [-lscf])
-    ;;
 esac
 
-AC_CHECK_FUNC(setppriv,AC_DEFINE(HAVE_SOLARIS_PRIVS, ,[Are Solaris privileges available?]), )
+AC_CHECK_FUNC(
+    [setppriv],
+    AC_DEFINE(HAVE_SOLARIS_PRIVS, ,[[Are Solaris privileges available?]])
+)
+
 
 #
 # ISC stuff

diff --git a/ports/winnt/ntpd/ntpd.vcproj b/ports/winnt/ntpd/ntpd.vcproj
index 335e4733082c79e06a1070723f33a11af3123e89..79b64cacb9d5b429d729e40dae63af4d123d465a 100644 (file)
--- a/ports/winnt/ntpd/ntpd.vcproj
+++ b/ports/winnt/ntpd/ntpd.vcproj
@@ -1439,6 +1439,10 @@
                                        />
                                </FileConfiguration>
                        </File>
+                       <File
+                               RelativePath="..\..\..\ntpd\refclock_jjy.c"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\..\ntpd\refclock_jupiter.c"
                                >