git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.7-trunk@2851 33e552b5-05e3-0310-8538-816dae2090ed

1 files changed, 106 insertions, 97 deletions

diff --git a/rules/ntp.in b/rules/ntp.in
index 9506bf28e..41e3b059a 100644
--- a/rules/ntp.in
+++ b/rules/ntp.in
@@ -1,154 +1,162 @@
 menu "NTP                 "
 
 config NTP
-bool             
-prompt "NTP"             
-default n
-
+	bool             
+	prompt "NTP"             
+	default n
+	depends on !OPENNTPD
+	help
+	  Build the standard NTP Daemon Process
+	  This conflicts with BSD openntpd. 	
+		
 # ----- Compile Options 
 
+comment "Conflicts with OpenNTPd"
+	depends on OPENNTPD
+
 comment "Compile Options"
+	depends on NTP
 
 config NTP_CLOCKCTL
-bool
-prompt "Use /dev/clockctl for non-root time control"
-default n
-depends NTP
+	bool
+	prompt "Use /dev/clockctl for non-root time control"
+	default n
+	depends on NTP
 
 config NTP_DEBUGGING
-bool
-prompt "include debugging code"
-default n
-depends NTP
+	bool
+	prompt "include debugging code"
+	default n
+	depends on NTP
 
 config NTP_DST-MINUTES
-int
-prompt "minutes per DST adjustment"
-default 60
-depends NTP
+	int
+	prompt "minutes per DST adjustment"
+	default 60
+	depends on NTP
 
 config NTP_BANCOMM
-bool
-prompt "Datum/Bancomm bc635/VME interface"
-default n
-depends NTP
+	bool
+	prompt "Datum/Bancomm bc635/VME interface"
+	default n
+	depends on NTP
 
 config NTP_GPSVME
-bool
-prompt "TrueTime GPS receiver/VME interface"
-default n
-depends NTP
+	bool
+	prompt "TrueTime GPS receiver/VME interface"
+	default n
+	depends on NTP
 
 config NTP_KMEM
-bool
-prompt "read /dev/kmem for tick and/or tickadj"
-default n
-depends NTP
+	bool
+	prompt "read /dev/kmem for tick and/or tickadj"
+	default n
+	depends on NTP
 
 config NTP_ACCURATE_ADJTIME
-bool
-prompt "the adjtime () call is accurate"
-default n
-depends NTP
+	bool
+	prompt "the adjtime () call is accurate"
+	default n
+	depends on NTP
 
 config NTP_TICK_FORCE
-bool
-prompt "force a value for 'tick'"
-default n
-depends NTP
+	bool
+	prompt "force a value for 'tick'"
+	default n
+	depends on NTP
 
 config NTP_TICK
-int             
-prompt "value for 'tick'"             
-default 1             
-depends NTP && NTP_TICK_FORCE
+	int             
+	prompt "value for 'tick'"             
+	default 1             
+	depends on NTP && NTP_TICK_FORCE
 
 config NTP_TICKADJ_FORCE
-bool
-prompt "force a value for 'tickadj'"
-default n
-depends NTP
+	bool
+	prompt "force a value for 'tickadj'"
+	default n
+	depends on NTP
 
 config NTP_TICKADJ
-bool
-prompt "value for 'tickadj'"
-default 1
-depends NTP && NTP_TICKADJ_FORCE
+	bool
+	prompt "value for 'tickadj'"
+	default 1
+	depends on NTP && NTP_TICKADJ_FORCE
 
 config NTP_SIMULATOR
-bool
-prompt "build/install the NTPD simulator?"
-default n
-depends NTP
+	bool
+	prompt "build/install the NTPD simulator?"
+	default n
+	depends on NTP
 
 config NTP_UDP_WILDCARD
-bool
-prompt "use UDP wildcard delivery"
-default n
-depends NTP
+	bool
+	prompt "use UDP wildcard delivery"
+	default n
+	depends on NTP
 
 config NTP_SLEW_ALWAYS
-bool
-prompt "always slew the time"
-default n
-depends NTP
+	bool
+	prompt "always slew the time"
+	default n
+	depends on NTP
 
 config NTP_STEP_SLEW
-bool
-prompt "step and slew the time"
-default n
-depends NTP
+	bool
+	prompt "step and slew the time"
+	default n
+	depends on NTP
 
 config NTP_NTPDATE_STEP
-bool
-prompt "if ntpdate should step the time"
-default n
-depends NTP
+	bool
+	prompt "if ntpdate should step the time"
+	default n
+	depends on NTP
 
 config NTP_HOURLY_TODR_SYNC
-bool
-prompt "if we should sync TODR hourly"
-default n
-depends NTP
+	bool
+	prompt "if we should sync TODR hourly"
+	default n
+	depends on NTP
 
 config NTP_KERNEL_FLL_BUG
-bool
-prompt "if we should avoid a kernel FLL bug"
-default n
-depends NTP
+	bool
+	prompt "if we should avoid a kernel FLL bug"
+	default n
+	depends on NTP
 
 config NTP_IRIG_SAWTOOTH
-bool
-prompt "if we should enable the IRIG sawtooth filter"
-default n
-depends NTP
+	bool
+	prompt "if we should enable the IRIG sawtooth filter"
+	default n
+	depends on NTP
 
 config NTP_NIST
-bool
-prompt "if we should enable the NIST lockclock scheme"
-default n
-depends NTP
+	bool
+	prompt "if we should enable the NIST lockclock scheme"
+	default n
+	depends on NTP
 
 config NTP_CRYPTO
-bool
-prompt "use openssl"
-default n
-depends NTP && OPENSSL
+	bool
+	prompt "use openssl"
+	default n
+	depends on NTP && OPENSSL
 
 comment "crypto needs openssl"
-depends on !(NTP && OPENSSL)
+	depends on !(NTP && OPENSSL) && NTP
 
 config NTP_SNTP
-bool
-prompt "Build SNTP"
-default n
-depends NTP
+	bool
+	prompt "Build SNTP"
+	default n
+	depends on NTP
 
 config NTP_ARLIB
-bool
-prompt "Compile the async resolver library"
-default n
-depends NTP
+	bool
+	prompt "Compile the async resolver library"
+	default n
+	depends on NTP
 
 source "rules/ntp_parse.in"
 source "rules/ntp_nonparse.in"
@@ -156,6 +164,7 @@ source "rules/ntp_nonparse.in"
 # ---------- Install Options
 
 comment "Install Options"
+depends on NTP
 
 config NTP_NTPDATE
 	bool