From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 26 Jul 2010 13:29:00 +0000 (+0200)
Subject: more rijndael support stuff
X-Git-Tag: xonotic-v0.1.0preview~38^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b51d8aba4d184fa4e04a6a70743593d1945b9e16;p=xonotic%2Fd0_blind_id.git

more rijndael support stuff
---

diff --git a/Makefile.am b/Makefile.am
index 66cb8e7..a97b281 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ bin_PROGRAMS = blind_id
 blind_id_SOURCES = main.c
 blind_id_LDADD = libd0_blind_id.la
 
-lib_LTLIBRARIES = libd0_blind_id.la libd0_rijndael.la
+lib_LTLIBRARIES = libd0_blind_id.la
 # versioninfo:
 #   - compatible interface change: c:r:a -> c+1:0:a+1
 #   - incompatible interface change: c:r:a -> c+1:0:0
@@ -14,11 +14,15 @@ libd0_blind_id_la_SOURCES = d0_bignum-gmp.c d0_blind_id.c d0.c d0_iobuf.c sha2.c
 libd0_blind_id_la_LDFLAGS = -versioninfo 2:0:2
 libd0_blind_id_la_CFLAGS = -fvisibility=hidden -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement
 
-libd0_rijndael_la_SOURCES = d0_rijndael.c
-libd0_rijndael_la_LDFLAGS = -versioninfo 0:0:0
-libd0_rijndael_la_CFLAGS = -fvisibility=hidden -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement
-
 library_includedir = $(includedir)/d0_blind_id
 library_include_HEADERS = d0_blind_id.h d0.h d0_rijndael.h
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_HEADERS = d0_blind_id.pc
+
+if ENABLE_RIJNDAEL
+library_include_HEADERS += d0_rijndael.h
+lib_LTLIBRARIES += libd0_rijndael.la
+libd0_rijndael_la_SOURCES = d0_rijndael.c
+libd0_rijndael_la_LDFLAGS = -versioninfo 0:0:0
+libd0_rijndael_la_CFLAGS = -fvisibility=hidden -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement
+endif
diff --git a/configure.ac b/configure.ac
index 6fe8993..70fecc0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,9 @@ AC_PROG_LIBTOOL
 
 AC_SEARCH_LIBS(__gmpz_init, gmp, , [AC_MSG_ERROR([GNU MP not found, see http://gmplib.org/])])
 
+AC_ARG_ENABLE(rijndael, AS_HELP_STRING([--disable-rijndael], [Disable build of the d0_rijndael library]), [enable_aes=$enableval], [enable_aes=yes])
+AM_CONDITIONAL(ENABLE_RIJNDAEL, [test x$enable_aes = xtrue])
+
 dnl AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile d0_blind_id.pc])
 AC_OUTPUT