don't use AX_PTHREAD

[xonotic/d0_blind_id.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 268cc4c3c14efc3c8e58a728bcb4b5dee0497bf4..5c98c6565401510ad44476e0d89aea2d18244633 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,21 +1,26 @@
-AC_INIT([d0_blind_id], [0.2], [divVerent@xonotic.org])
+AC_INIT([d0_blind_id],[0.4],[divVerent@xonotic.org])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([-Wall foreign])
 AC_PROG_CC
-AC_PROG_LIBTOOL
+LT_INIT
 
 AC_ARG_WITH(openssl, AS_HELP_STRING([--with-openssl], [Use OpenSSL instead of GMP (beware of the OpenSSL license)]), [with_openssl=$withval], [with_openssl=no])
+AC_ARG_WITH(tommath, AS_HELP_STRING([--with-tommath], [Use libtommath instead of GMP (slow, but WTFPL)]), [with_tommath=$withval], [with_tommath=no])
 AM_CONDITIONAL(WITH_OPENSSL, [test x"$with_openssl" != xno])
+AM_CONDITIONAL(WITH_TOMMATH, [test x"$with_tommath" != xno])
 
-AS_IF([test x"$with_openssl" != xno],
-       [AC_SEARCH_LIBS(BN_init, crypto, ,
-               [AC_MSG_ERROR([OpenSSL not found, see http://www.openssl.org/, or try --without-openssl])])],
-       [AC_SEARCH_LIBS(__gmpz_init, gmp, ,
-               [AC_MSG_ERROR([GNU MP not found, see http://gmplib.org/, or try --with-openssl])])])
+AS_IF([test x"$with_tommath" != xno],
+       [AC_SEARCH_LIBS(mp_init, tommath, ,
+               [AC_MSG_ERROR([libtommath not found, see http://www.libtom.org/, or try --without-tommath])])],
+       [AS_IF([test x"$with_openssl" != xno],
+               [AC_SEARCH_LIBS(BN_init, crypto, ,
+                       [AC_MSG_ERROR([OpenSSL not found, see http://www.openssl.org/, or try --without-openssl])])],
+               [AC_SEARCH_LIBS(__gmpz_init, gmp, ,
+                       [AC_MSG_ERROR([GNU MP not found, see http://gmplib.org/, or try --with-openssl])])])])
 
 AC_ARG_ENABLE(rijndael, AS_HELP_STRING([--disable-rijndael], [Disable build of the d0_rijndael library]), [enable_aes=$enableval], [enable_aes=yes])
 
-AS_IF([test -f d0_rijndael.c], [], [AS_IF([test x"$enable_aes" != x"no"], [AC_MSG_ERROR([d0_rijndael.c is missing, try --disable-rijndael or download the full version of this library, but beware of crypto import laws then])])])
+AS_IF([test -f d0_rijndael.c], [], [AS_IF([test x"$enable_aes" != xno], [AC_MSG_ERROR([d0_rijndael.c is missing, try --disable-rijndael or download the full version of this library, but beware of crypto import laws then])])])
 AM_CONDITIONAL(ENABLE_RIJNDAEL, [test x$enable_aes = xyes])
 
 AC_CONFIG_FILES([Makefile d0_blind_id.pc d0_rijndael.pc])