changeset 868:463e2b70be14

merge
author Matt Johnston <matt@ucc.asn.au>
date Wed, 27 Nov 2013 21:32:45 +0800
parents 12d5f40894ec (diff) d2d624c951ca (current diff)
children c63e7644db60
files
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Wed Nov 27 21:30:05 2013 +0800
+++ b/configure.ac	Wed Nov 27 21:32:45 2013 +0800
@@ -371,16 +371,16 @@
 			AC_MSG_NOTICE(Forcing bundled libtom*)
 		else
 			BUNDLED_LIBTOM=0
-			AC_CHECK_LIB(tomcrypt, register_cipher, , 
+			AC_CHECK_LIB(tommath, mp_exptmod, , 
 				[AC_MSG_ERROR([Missing system libtomcrypt and --disable-bundled-libtom was specified])] )
-			AC_CHECK_LIB(tommath, mp_exptmod, , 
+			AC_CHECK_LIB(tomcrypt, register_cipher, , 
 				[AC_MSG_ERROR([Missing system libtomcrypt and --disable-bundled-libtom was specified])] )
 		fi
 	],
 	[
 		BUNDLED_LIBTOM=0
+		AC_CHECK_LIB(tommath, mp_exptmod, , BUNDLED_LIBTOM=1)
 		AC_CHECK_LIB(tomcrypt, register_cipher, , BUNDLED_LIBTOM=1)
-		AC_CHECK_LIB(tommath, mp_exptmod, , BUNDLED_LIBTOM=1)
 	]
 )