# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1385559165 -28800
# Node ID 463e2b70be14fb4e94275bfe93f697b3f7821940
# Parent  12d5f40894ecdbab73cdcc826e9512c30cb484dd# Parent  d2d624c951cae0999e8f98d54a86cc8236d185e0
merge

diff -r d2d624c951ca -r 463e2b70be14 configure.ac
--- 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)
 	]
 )