X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=Config.in;h=2c4be2e9f4d49f4a4c90e7acb0180a48c96dc686;hb=7c47b560a8fc97956dd8132bd7f1863d83c19866;hp=79fe8ff9a086701be28f27f95a20403996542070;hpb=b9f4cd85f0e9c62aba2d6f1be67eb8369fdcedce;p=oweals%2Fbusybox.git

diff --git a/Config.in b/Config.in
index 79fe8ff9a..2c4be2e9f 100644
--- a/Config.in
+++ b/Config.in
@@ -161,12 +161,13 @@ config UNICODE_USING_LOCALE
 	  Internal implementation is smaller.
 
 config FEATURE_CHECK_UNICODE_IN_ENV
-	bool "Check $LANG environment variable"
+	bool "Check $LC_ALL, $LC_CTYPE and $LANG environment variables"
 	default n
 	depends on UNICODE_SUPPORT && !UNICODE_USING_LOCALE
 	help
 	  With this option on, Unicode support is activated
-	  only if LANG variable has the value of the form "xxxx.utf8"
+	  only if locale-related variables have the value of the form
+	  "xxxx.utf8"
 
 	  Otherwise, Unicode support will be always enabled and active.
 
@@ -310,7 +311,18 @@ config FEATURE_PIDFILE
 	default y
 	help
 	  This option makes some applets (e.g. crond, syslogd, inetd) write
-	  a pidfile in /var/run. Some applications rely on them.
+	  a pidfile at the configured PID_FILE_PATH.  It has no effect
+	  on applets which require pidfiles to run.
+
+config PID_FILE_PATH
+	string "Path to directory for pidfile"
+	default "/var/run"
+	depends on FEATURE_PIDFILE
+	help
+	  This is the default path where pidfiles are created.  Applets which
+	  allow you to set the pidfile path on the command line will override
+	  this value.  The option has no effect on applets that require you to
+	  specify a pidfile path.
 
 config FEATURE_SUID
 	bool "Support for SUID/SGID handling"
@@ -321,7 +333,7 @@ config FEATURE_SUID
 	  root-level operations even when run by ordinary users
 	  (for example, mounting of user mounts in fstab needs this).
 
-	  Busybox will automatically drop priviledges for applets
+	  Busybox will automatically drop privileges for applets
 	  that don't need root access.
 
 	  If you are really paranoid and don't want to do this, build two
@@ -600,12 +612,39 @@ config CROSS_COMPILER_PREFIX
 
 	  Native builds leave this empty.
 
+config SYSROOT
+	string "Path to sysroot"
+	default ""
+	help
+	  If you want to build BusyBox with a cross compiler, then you
+	  might also need to specify where /usr/include and /usr/lib
+	  will be found.
+
+	  For example, BusyBox can be built against an installed
+	  Android NDK, platform version 9, for ARM ABI with
+
+	  CONFIG_SYSROOT=/opt/android-ndk/platforms/android-9/arch-arm
+
+	  Native builds leave this empty.
+
 config EXTRA_CFLAGS
 	string "Additional CFLAGS"
 	default ""
 	help
 	  Additional CFLAGS to pass to the compiler verbatim.
 
+config EXTRA_LDFLAGS
+	string "Additional LDFLAGS"
+	default ""
+	help
+	  Additional LDFLAGS to pass to the linker verbatim.
+
+config EXTRA_LDLIBS
+	string "Additional LDLIBS"
+	default ""
+	help
+	  Additional LDLIBS to pass to the linker with -l.
+
 endmenu
 
 menu 'Debugging Options'