comparison configure.ac @ 866:12d5f40894ec

Fix library order of libtom*
author Matt Johnston <matt@ucc.asn.au>
date Mon, 25 Nov 2013 23:39:15 +0800
parents 39d872718d4b
children 4f1988cb79ce
comparison
equal deleted inserted replaced
865:39d872718d4b 866:12d5f40894ec
369 if test "x$enableval" = "xyes"; then 369 if test "x$enableval" = "xyes"; then
370 BUNDLED_LIBTOM=1 370 BUNDLED_LIBTOM=1
371 AC_MSG_NOTICE(Forcing bundled libtom*) 371 AC_MSG_NOTICE(Forcing bundled libtom*)
372 else 372 else
373 BUNDLED_LIBTOM=0 373 BUNDLED_LIBTOM=0
374 AC_CHECK_LIB(tommath, mp_exptmod, ,
375 [AC_MSG_ERROR([Missing system libtomcrypt and --disable-bundled-libtom was specified])] )
374 AC_CHECK_LIB(tomcrypt, register_cipher, , 376 AC_CHECK_LIB(tomcrypt, register_cipher, ,
375 [AC_MSG_ERROR([Missing system libtomcrypt and --disable-bundled-libtom was specified])] ) 377 [AC_MSG_ERROR([Missing system libtomcrypt and --disable-bundled-libtom was specified])] )
376 AC_CHECK_LIB(tommath, mp_exptmod, ,
377 [AC_MSG_ERROR([Missing system libtomcrypt and --disable-bundled-libtom was specified])] )
378 fi 378 fi
379 ], 379 ],
380 [ 380 [
381 BUNDLED_LIBTOM=0 381 BUNDLED_LIBTOM=0
382 AC_CHECK_LIB(tommath, mp_exptmod, , BUNDLED_LIBTOM=1)
382 AC_CHECK_LIB(tomcrypt, register_cipher, , BUNDLED_LIBTOM=1) 383 AC_CHECK_LIB(tomcrypt, register_cipher, , BUNDLED_LIBTOM=1)
383 AC_CHECK_LIB(tommath, mp_exptmod, , BUNDLED_LIBTOM=1)
384 ] 384 ]
385 ) 385 )
386 386
387 if test $BUNDLED_LIBTOM = 1 ; then 387 if test $BUNDLED_LIBTOM = 1 ; then
388 AC_DEFINE(BUNDLED_LIBTOM,,Use bundled libtom) 388 AC_DEFINE(BUNDLED_LIBTOM,,Use bundled libtom)