X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=configure.ac;h=4d1de5e6e55637789da6d1381208080a71fd895f;hb=b9c5e76780028a95b392be074a0198df79975dab;hp=ce36408ad6e63eb17f31ff3ce881df9751bd7def;hpb=5610bfab7fe9910823f05dc17d453271106047b1;p=xonotic%2Fd0_blind_id.git

diff --git a/configure.ac b/configure.ac
index ce36408..4d1de5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,22 +1,29 @@
-AC_INIT([d0_blind_id], [0.1], [divVerent@alientrap.org])
+AC_INIT([d0_blind_id],[0.5],[divVerent@xonotic.org])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([-Wall foreign])
 AC_PROG_CC
-AC_PROG_LIBTOOL
+AM_PROG_AR
+LT_INIT
 
-AC_ARG_WITH(openssl, AS_HELP_STRING([--with-openssl], [Use OpenSSL instead of GMP (beware of the OpenSSL license)]), [enable_openssl=$enableval], [enable_openssl=no])
-AM_CONDITIONAL(ENABLE_OPENSSL, [test x$enable_openssl = xyes])
+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])
 
-if test x$enable_openssl = xyes
-then
-	AC_SEARCH_LIBS(BN_init, ssl, , [AC_MSG_ERROR([OpenSSL not found, see http://www.openssl.org/, or try --without-openssl])])
-else
-	AC_SEARCH_LIBS(__gmpz_init, gmp, , [AC_MSG_ERROR([GNU MP not found, see http://gmplib.org/, or try --with-openssl])])
-fi
+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 "$srcdir/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])
 
-dnl AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile d0_blind_id.pc d0_rijndael.pc])
+
 AC_OUTPUT