ABI and libdir detection for Irix.

b7dd9283 · Klaus Ziegler · Niels Möller · f1a54f2a · b7dd9283 · b7dd9283
Commit b7dd9283 authored May 19, 2015 by Klaus Ziegler Committed by Niels Möller May 19, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 22 additions and 0 deletions

ChangeLog ChangeLog +5 -0

configure.ac configure.ac +17 -0

No files found.
--- a/ChangeLog
+++ b/ChangeLog
+2015-05-19  Niels Möller  <nisse@lysator.liu.se>
+
+	* configure.ac: ABI detection (n32 or n64) on Irix, and
+	appropriate default for libdir. Patch from Klaus Ziegler.
+
 2015-05-12  Niels Möller  <nisse@lysator.liu.se>

 	* version.c (nettle_version_major, nettle_version_minor): New

--- a/configure.ac
+++ b/configure.ac
@@ -285,6 +285,17 @@ case "$host_cpu" in
    AC_TRY_COMPILE([
 #if defined(__sparcv9) || defined(__arch64__)
 #error 64-bit sparc
+#endif
+    ], [], [
+      ABI=32
+    ], [
+      ABI=64
+    ])
+    ;;
+  *mips*)
+    AC_TRY_COMPILE([
+#if defined(__sgi) && defined(__LP64__)
+#error 32-bit mips
 #endif
    ], [], [
      ABI=32
@@ -335,6 +346,12 @@ if test "x$ABI" != xstandard ; then
      *: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 '