diff options
| author | Klaus Ziegler <klausz@haus-gisela.de> | 2015-05-19 22:41:01 +0200 |
|---|---|---|
| committer | Niels Möller <nisse@lysator.liu.se> | 2015-05-19 22:41:01 +0200 |
| commit | b7dd9283f0fe3b2b6e8b562dc8803f2b84354f61 (patch) | |
| tree | 45a3994d0b1f87d5d384832ca8463c4b9ac9b3ec | |
| parent | f1a54f2abf9057a30a5b5d5f2c64b3175d3b07da (diff) | |
| download | nettle-b7dd9283f0fe3b2b6e8b562dc8803f2b84354f61.tar.gz | |
ABI and libdir detection for Irix.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 17 |
2 files changed, 22 insertions, 0 deletions
@@ -1,3 +1,8 @@ +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 diff --git a/configure.ac b/configure.ac index 4ead52c6..c7ed7841 100644 --- a/configure.ac +++ b/configure.ac @@ -292,6 +292,17 @@ case "$host_cpu" in ABI=64 ]) ;; + *mips*) + AC_TRY_COMPILE([ +#if defined(__sgi) && defined(__LP64__) +#error 32-bit mips +#endif + ], [], [ + ABI=32 + ], [ + ABI=64 + ]) + ;; esac if test "x$ABI" != xstandard ; then @@ -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 ' |