Browse Source

fix UCLIBC_STATIC_LDCONFIG location in menus and touchup display for other shared lib options

Mike Frysinger 18 years ago
parent
commit
c6bb70417e
1 changed files with 15 additions and 14 deletions
  1. 15 14
      extra/Configs/Config.in

+ 15 - 14
extra/Configs/Config.in

@@ -217,7 +217,7 @@ config FORCE_SHAREABLE_TEXT_SEGMENTS
 	  coded shared libraries.
 
 config LDSO_LDD_SUPPORT
-	bool "Native shared library loader 'ldd' support"
+	bool "Native 'ldd' support"
 	depends on HAVE_SHARED
 	default y
 	help
@@ -228,7 +228,7 @@ config LDSO_LDD_SUPPORT
 	  shared library loader a little bit smaller.  Most people will answer Y.
 
 config LDSO_CACHE_SUPPORT
-	bool "Enable shared library loader cache"
+	bool "Enable library loader cache (ld.so.conf)"
 	depends on HAVE_SHARED
 	default y
 	help
@@ -238,7 +238,7 @@ config LDSO_CACHE_SUPPORT
 	  the /etc/ld.so.cache shared library loader cache file.
 
 config LDSO_PRELOAD_FILE_SUPPORT
-	bool "Enable shared library loader preload file support"
+	bool "Enable library loader preload file (ld.so.preload)"
 	depends on HAVE_SHARED
 	default n
 	help
@@ -263,6 +263,18 @@ config LDSO_BASE_FILENAME
 	  WARNING: Changing the default prefix could cause problems with
 	           binutils' ld !
 
+config UCLIBC_STATIC_LDCONFIG
+	bool "Link ldconfig statically"
+	depends on HAVE_SHARED
+	default y
+	help
+	  Enable this option to statically link the ldconfig binary.
+
+	  Making ldconfig static can be beneficial if you have a library
+	  problem and need to use ldconfig to recover.  Sometimes, it is
+	  preferable to instead keep the size of the system down, in which
+	  case you should disable this option.
+
 config LDSO_RUNPATH
 	bool "Enable ELF RUNPATH tag support"
 	depends on HAVE_SHARED
@@ -349,17 +361,6 @@ config UCLIBC_HAS_LFS
 	  if you are using an older Linux kernel (2.0.x) that lacks large file
 	  support.  Enabling this option will increase the size of uClibc.
 
-config UCLIBC_STATIC_LDCONFIG
-	bool "Link ldconfig statically"
-	default y
-	help
-	  Enable this option to statically link the ldconfig binary.
-
-	  Making ldconfig static can be beneficial if you have a library
-	  problem and need to use ldconfig to recover.  Sometimes, it is
-	  preferable to instead keep the size of the system down, in which
-	  case you should disable this option.
-
 choice
 	prompt "Malloc Implementation"
 	default MALLOC if ! ARCH_HAS_MMU