From: DJ Delorie <dj@redhat.com>
Date: Wed, 8 Jan 2025 21:55:05 +0000 (-0500)
Subject: Revert "configure: default to --prefix=/usr on GNU/Linux"
X-Git-Tag: glibc-2.41~111
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0bba6c29a1c4697bcdc1e6d29657bb6dbbd21afb;p=thirdparty%2Fglibc.git

Revert "configure: default to --prefix=/usr on GNU/Linux"

This reverts commit 81439a116cf48583127ddf1f09809440aa40969a.
---

diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure
index 8cda8e9451..4d642e953b 100644
--- a/sysdeps/unix/sysv/linux/configure
+++ b/sysdeps/unix/sysv/linux/configure
@@ -1,4 +1,3 @@
-ac_default_prefix=/usr
 # This file is generated from configure.ac by Autoconf.  DO NOT EDIT!
  # Local configure fragment for sysdeps/unix/sysv/linux.
 
@@ -117,9 +116,7 @@ if test -n "$sysheaders"; then
   CPPFLAGS=$OLD_CPPFLAGS
 fi
 
-
-
-if test "$prefix" = "/usr/local" -o "$prefix" = "/usr/local/"; then
+if test "$prefix" = "/usr/local" -o "$prefix" = "/usr/local/" -o "$prefix" = "NONE"; then
   if test $enable_sanity = yes; then
     echo "\
 *** On GNU/Linux systems the GNU C Library should not be installed into
diff --git a/sysdeps/unix/sysv/linux/configure.ac b/sysdeps/unix/sysv/linux/configure.ac
index 4c43cda877..c177e082a9 100644
--- a/sysdeps/unix/sysv/linux/configure.ac
+++ b/sysdeps/unix/sysv/linux/configure.ac
@@ -71,9 +71,7 @@ if test -n "$sysheaders"; then
   CPPFLAGS=$OLD_CPPFLAGS
 fi
 
-AC_PREFIX_DEFAULT([/usr])
-
-if test "$prefix" = "/usr/local" -o "$prefix" = "/usr/local/"; then
+if test "$prefix" = "/usr/local" -o "$prefix" = "/usr/local/" -o "$prefix" = "NONE"; then
   if test $enable_sanity = yes; then
     echo "\
 *** On GNU/Linux systems the GNU C Library should not be installed into