Delete configure logic to tweak the default libdir.

diff --git a/ChangeLog b/ChangeLog
index bb61676194e0a3ac7105bdda7e0b6e117a9045a1..50617ac9418344796b9c578629dc003f34e195e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
        * configure.ac: Delete unusual configure options --with-lib-path
        and --with-lib-path.
+       (libdir): Delete logic to set the default libdir depending on ABI.
+
        * aclocal.m4 (LSH_PATH_ADD, LSH_RPATH_ADD, LSH_RPATH_INIT)
        (LSH_RPATH_FIX): Deleted now unused macros.
 

diff --git a/configure.ac b/configure.ac
index c49a23ddf09837fc4d79d0f5da3dceb249a1dfe6..d5dd4fa611da36e8d0e2e2edb93317e432fab93e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -381,57 +381,6 @@ esac
 
 if test "x$ABI" != xstandard ; then
   AC_MSG_NOTICE([Compiler uses $ABI-bit ABI. To change, set CC.])
-  if test "$libdir" = '${exec_prefix}/lib' ; then
-    # Try setting a better default
-    case "$host_cpu:$host_os:$ABI" in
-      *:solaris*:32|*:sunos*:32)
-       libdir='${exec_prefix}/lib'
-       ;;
-      *:solaris*:64|*:sunos*:64)
-       libdir='${exec_prefix}/lib/64'
-       ;;
-      # Linux conventions are a mess... According to the Linux File
-      # Hierarchy Standard, all architectures except IA64 puts 32-bit
-      # libraries in lib, and 64-bit in lib64. Some distributions,
-      # e.g., Fedora and Gentoo, adhere to this standard, while at
-      # least Debian has decided to put 64-bit libraries in lib and
-      # 32-bit libraries in lib32.
-      
-      # We try to figure out the convention, except if we're cross
-      # compiling. We use lib${ABI} if /usr/lib${ABI} exists and
-      # appears to not be a symlink to a different name.
-      *:linux*:32|*:linux*:64)
-       if test "$cross_compiling" = yes ; then
-          AC_MSG_WARN([Cross compiling for linux. Can't guess if libraries go in lib${ABI} or lib.]); dnl '
-       else
-         # The dash builtin pwd tries to be "helpful" and remember
-         # symlink names. Use -P option, and hope it's portable enough.
-         test -d /usr/lib${ABI} \
-           && (cd /usr/lib${ABI} && pwd -P | grep >/dev/null "/lib${ABI}"'$') \
-           && libdir='${exec_prefix}/'"lib${ABI}"
-       fi
-       ;;
-      # On freebsd, it seems 32-bit libraries are in lib32,
-      # and 64-bit in lib. Don't know about "kfreebsd", does
-      # it follow the Linux fhs conventions?
-      *:freebsd*:32)
-       libdir='${exec_prefix}/lib32'
-       ;;
-      *:freebsd*:64)
-       libdir='${exec_prefix}/lib'
-       ;;
-      *:irix*:32)
-       libdir='${exec_prefix}/lib32'
-       ;;
-      *:irix*:64)
-       libdir='${exec_prefix}/lib64'
-       ;;
-      *)
-        AC_MSG_WARN([Don't know where to install $ABI-bit libraries on this system.]); dnl '
-
-    esac
-    AC_MSG_NOTICE([Libraries to be installed in $libdir.])
-  fi
 fi
 
 OPT_NETTLE_SOURCES=""