aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-09-28 12:30:43 +0200
committerKim Alvefur <zash@zash.se>2017-09-28 12:30:43 +0200
commitb2ce59836b6100381899bcada945198b1cf7bff4 (patch)
treea3904e3c10be6d247c87f47161878deae861c8ff
parentconfigure: Remove unused "require config" option (diff)
downloadprosody-b2ce59836b6100381899bcada945198b1cf7bff4.tar.xz
prosody-b2ce59836b6100381899bcada945198b1cf7bff4.zip
configure: Remove unused OS and architecture detection that would most likely fail on systems without gcc
-rwxr-xr-xconfigure29
1 files changed, 0 insertions, 29 deletions
diff --git a/configure b/configure
index 0b021c928..c26f78edc 100755
--- a/configure
+++ b/configure
@@ -506,34 +506,6 @@ then
fi
fi
-echo_n "Configuring for system... "
-if uname -s
-then
- UNAME_S=`uname -s`
-else
- die "Could not determine operating system. 'uname -s' failed."
-fi
-echo_n "Configuring for architecture... "
-if uname -m
-then
- UNAME_M=`uname -m`
-else
- die "Could not determine processor architecture. 'uname -m' failed."
-fi
-
-if [ "$UNAME_S" = Linux ]
-then
- GCC_ARCH=`gcc -print-multiarch 2>/dev/null`
- if [ -n "$GCC_ARCH" -a -d "/usr/lib/$GCC_ARCH" ]
- then
- MULTIARCH_SUBDIR="lib/$GCC_ARCH"
- elif [ -d "/usr/lib64" ]
- then
- # Useful for Fedora systems
- MULTIARCH_SUBDIR="lib64"
- fi
-fi
-
if [ "$IDN_LIBRARY" = "icu" ]
then
IDNA_LIBS="$ICU_FLAGS"
@@ -579,7 +551,6 @@ LUA_DIR_SET=$LUA_DIR_SET
LUA_INCDIR=$LUA_INCDIR
LUA_LIBDIR=$LUA_LIBDIR
LUA_BINDIR=$LUA_BINDIR
-MULTIARCH_SUBDIR=$MULTIARCH_SUBDIR
IDN_LIB=$IDN_LIB
IDNA_LIBS=$IDNA_LIBS
OPENSSL_LIBS=$OPENSSL_LIBS