Update.

[platform/upstream/glibc.git] / config.make.in

diff --git a/config.make.in b/config.make.in
index 27d1e6e..a353706 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -2,18 +2,24 @@
 # From $Id$.
 # Don't edit this file.  Put configuration parameters in configparms instead.
 
+version = @VERSION@
+release = @RELEASE@
+
 # Installation prefixes.
 install_root =
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datadir = @datadir@
+libdir = @libdir@
 slibdir = @libc_cv_slibdir@
+localedir = @libc_cv_localedir@
 sysconfdir = @libc_cv_sysconfdir@
 libexecdir = @libexecdir@
 rootsbindir = @libc_cv_rootsbindir@
+infodir = @infodir@
 
-# If ldconfig exists.  This will go away as soon as `ldconfig' is available
-# in GNU libc.
-has-ldconfig = @has_ldconfig@
+# Should we use and build ldconfig?
+use-ldconfig = @use_ldconfig@
 
 # Maybe the `ldd' script must be rewritten.
 ldd-rewrite-script = @ldd_rewrite_script@
@@ -26,20 +32,27 @@ config-os = @host_os@
 config-sysdirs = @sysnames@
 
 defines = @DEFINES@
+sysincludes = @SYSINCLUDES@
 
 elf = @elf@
+have-protected = @libc_cv_asm_protected_directive@
+have-z-nodelete = @libc_cv_z_nodelete@
+have-z-nodlopen = @libc_cv_z_nodlopen@
 have-initfini = @libc_cv_have_initfini@
 need-nopic-initfini = @nopic_initfini@
 with-cvs = @with_cvs@
+old-glibc-headers = @old_glibc_headers@
 
 versioning = @VERSIONING@
+no-whole-archive = @no_whole_archive@
+exceptions = @exceptions@
+have_doors = @linux_doors@
 
-have-ar-S=@libc_cv_ar_S@
-have-no-whole-archive = @libc_cv_ld_no_whole_archive@
-have-no-exceptions = @libc_cv_gcc_no_exceptions@
 have-bash2 = @libc_cv_have_bash2@
 have-ksh = @libc_cv_have_ksh@
 
+sizeof-long-double = @sizeof_long_double@
+
 # Configuration options.
 gnu-as = @gnu_as@
 gnu-ld = @gnu_ld@
@@ -53,8 +66,7 @@ build-static-nss = @static_nss@
 stdio = @stdio@
 add-ons = @subdirs@
 cross-compiling = @cross_compiling@
-
-LDAP = @LDAP@
+force-install = @force_install@
 
 # Build tools.
 CC = @CC@
@@ -65,17 +77,24 @@ RANLIB = @RANLIB@
 MAKEINFO = @MAKEINFO@
 AS = $(CC) -c
 MIG = @MIG@
+PWD_P = @PWD_P@
 
 # Installation tools.
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+INSTALL_INFO = @INSTALL_INFO@
+OLD_DEBIAN_INSTALL_INFO = @OLD_DEBIAN_INSTALL_INFO@
 LN_S = @LN_S@
 MSGFMT = @MSGFMT@
 
 # Script execution tools.
 BASH = @BASH@
 KSH = @KSH@
+AWK = @AWK@
 PERL = @PERL@
 
+# Additional libraries.
+LIBGD = @LIBGD@
+
 # More variables may be inserted below by configure.