diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2017-06-03 09:45:55 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-03 09:45:55 +0800 |
| commit | 7ab8f61974601444046888da07f211c44e55e5a5 (patch) | |
| tree | 53ec65635185bbef4f43131e213cecbeb74eb918 /configure.ac | |
| parent | 4bba3268d5ad0a450f0f3d1b07cd600add47062b (diff) | |
| parent | f9e6bc2aecab0f4b5b529e07a92cc63c8a66cd4b (diff) | |
| download | dropbear-7ab8f61974601444046888da07f211c44e55e5a5.tar.gz | |
Merge pull request #38 from armcc/master
Fix libtomcrypt/libtommath linking order
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 783e832..767bd05 100644 --- a/configure.ac +++ b/configure.ac @@ -388,16 +388,16 @@ AC_ARG_ENABLE(bundled-libtom, AC_MSG_NOTICE(Forcing bundled libtom*) else BUNDLED_LIBTOM=0 - AC_CHECK_LIB(tommath, mp_exptmod, LIBTOM_LIBS="$LIBTOM_LIBS -ltommath", + AC_CHECK_LIB(tommath, mp_exptmod, LIBTOM_LIBS="-ltommath $LIBTOM_LIBS", [AC_MSG_ERROR([Missing system libtommath and --disable-bundled-libtom was specified])] ) - AC_CHECK_LIB(tomcrypt, register_cipher, LIBTOM_LIBS="$LIBTOM_LIBS -ltomcrypt", + AC_CHECK_LIB(tomcrypt, register_cipher, LIBTOM_LIBS="-ltomcrypt $LIBTOM_LIBS", [AC_MSG_ERROR([Missing system libtomcrypt and --disable-bundled-libtom was specified])] ) fi ], [ BUNDLED_LIBTOM=0 - AC_CHECK_LIB(tommath, mp_exptmod, LIBTOM_LIBS="$LIBTOM_LIBS -ltommath", BUNDLED_LIBTOM=1) - AC_CHECK_LIB(tomcrypt, register_cipher, LIBTOM_LIBS="$LIBTOM_LIBS -ltomcrypt", BUNDLED_LIBTOM=1) + AC_CHECK_LIB(tommath, mp_exptmod, LIBTOM_LIBS="-ltommath $LIBTOM_LIBS", BUNDLED_LIBTOM=1) + AC_CHECK_LIB(tomcrypt, register_cipher, LIBTOM_LIBS="-ltomcrypt $LIBTOM_LIBS", BUNDLED_LIBTOM=1) ] ) |