summaryrefslogtreecommitdiff
path: root/libc/sysdeps/gnu
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2012-05-12 15:44:41 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2012-05-12 15:44:41 +0000
commit62eb53f68d92687a028f3c515489b30e3df1d979 (patch)
tree7fcf1c95d89caecbbff5d932778f04670c151c52 /libc/sysdeps/gnu
parentc29b18b38ccefba22c13b33dd801acba0ae92523 (diff)
downloadeglibc2-62eb53f68d92687a028f3c515489b30e3df1d979.tar.gz
Merge changes between r18392 and r18519 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@18520 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/gnu')
-rw-r--r--libc/sysdeps/gnu/configure36
-rw-r--r--libc/sysdeps/gnu/configure.in36
2 files changed, 72 insertions, 0 deletions
diff --git a/libc/sysdeps/gnu/configure b/libc/sysdeps/gnu/configure
new file mode 100644
index 000000000..634e1d0cc
--- /dev/null
+++ b/libc/sysdeps/gnu/configure
@@ -0,0 +1,36 @@
+# This file is generated from configure.in by Autoconf. DO NOT EDIT!
+
+# Local configure fragment for sysdeps/gnu.
+
+# The Filesystem Hierarchy Standard prescribes where to place "essential"
+# files. I.e., when the installation prefix is "/usr" we have to place
+# shared library objects and the configuration files on the root partition
+# in /lib and /etc.
+case "$prefix" in
+/usr | /usr/)
+ # 64-bit libraries on bi-arch platforms go in /lib64 instead of /lib.
+ # Allow earlier configure scripts to handle libc_cv_slibdir, libdir,
+ # and libc_cv_localedir.
+ test -n "$libc_cv_slibdir" || \
+ case $machine in
+ sparc/sparc64 | x86_64* | powerpc/powerpc64 | s390/s390-64)
+ libc_cv_slibdir=/lib64
+ if test "$libdir" = '${exec_prefix}/lib'; then
+ libdir='${exec_prefix}/lib64';
+ # Locale data can be shared between 32bit and 64bit libraries
+ libc_cv_localedir='${exec_prefix}/lib/locale'
+ fi
+ ;;
+ *)
+ libc_cv_slibdir=/lib
+ ;;
+ esac
+ # Allow the user to override the path with --sysconfdir
+ if test "$sysconfdir" = '${prefix}/etc'; then
+ libc_cv_sysconfdir=/etc
+ else
+ libc_cv_sysconfdir=$sysconfdir
+ fi
+ libc_cv_rootsbindir=/sbin
+ ;;
+esac
diff --git a/libc/sysdeps/gnu/configure.in b/libc/sysdeps/gnu/configure.in
new file mode 100644
index 000000000..3422007ff
--- /dev/null
+++ b/libc/sysdeps/gnu/configure.in
@@ -0,0 +1,36 @@
+GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
+
+# Local configure fragment for sysdeps/gnu.
+
+# The Filesystem Hierarchy Standard prescribes where to place "essential"
+# files. I.e., when the installation prefix is "/usr" we have to place
+# shared library objects and the configuration files on the root partition
+# in /lib and /etc.
+case "$prefix" in
+/usr | /usr/)
+ # 64-bit libraries on bi-arch platforms go in /lib64 instead of /lib.
+ # Allow earlier configure scripts to handle libc_cv_slibdir, libdir,
+ # and libc_cv_localedir.
+ test -n "$libc_cv_slibdir" || \
+ case $machine in
+ sparc/sparc64 | x86_64* | powerpc/powerpc64 | s390/s390-64)
+ libc_cv_slibdir=/lib64
+ if test "$libdir" = '${exec_prefix}/lib'; then
+ libdir='${exec_prefix}/lib64';
+ # Locale data can be shared between 32bit and 64bit libraries
+ libc_cv_localedir='${exec_prefix}/lib/locale'
+ fi
+ ;;
+ *)
+ libc_cv_slibdir=/lib
+ ;;
+ esac
+ # Allow the user to override the path with --sysconfdir
+ if test "$sysconfdir" = '${prefix}/etc'; then
+ libc_cv_sysconfdir=/etc
+ else
+ libc_cv_sysconfdir=$sysconfdir
+ fi
+ libc_cv_rootsbindir=/sbin
+ ;;
+esac