fix build of rijndael lib

diff --git a/Makefile.am b/Makefile.am
index a97b2814d85a9b66954ad82f6483871ebcd999b1..19092c36515400d79e3eff70ea47a217cf53e690 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,16 +13,16 @@ lib_LTLIBRARIES = libd0_blind_id.la
 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
-
 library_includedir = $(includedir)/d0_blind_id
-library_include_HEADERS = d0_blind_id.h d0.h d0_rijndael.h
+library_include_HEADERS = d0_blind_id.h d0.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
+library_include_HEADERS += d0_rijndael.h
+pkgconfig_HEADERS += d0_rijndael.pc
 endif

diff --git a/configure.ac b/configure.ac
index 70fecc0c9d7cf32b36b6fa9b750ec20e8dbfe3b4..a6e8bbe5cfe80507b0484345e213cfb0f8e8d7a5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ 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])
+AM_CONDITIONAL(ENABLE_RIJNDAEL, [test x$enable_aes = xyes])
 
 dnl AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile d0_blind_id.pc])

diff --git a/d0_blind_id.pc.in b/d0_blind_id.pc.in
index bfd50973233ab2505a2395715a67ba1671a472d0..60fcdc4ecebd28fa5ddf49a3129c2f2a76e2f947 100644 (file)
--- a/d0_blind_id.pc.in
+++ b/d0_blind_id.pc.in
@@ -7,5 +7,5 @@ Name: Blind-ID
 Description: Library for user identification using RSA blind signatures
 Requires: 
 Version: @VERSION@
-Libs: -L${libdir} -lblind_id
-Cflags: -I${includedir}/blind_id
+Libs: -L${libdir} -ld0_blind_id
+Cflags: -I${includedir}/d0_blind_id

diff --git a/d0_rijndael.pc.in b/d0_rijndael.pc.in
new file mode 100644 (file)
index 0000000..bb735f1
--- /dev/null
+++ b/d0_rijndael.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Rijndael
+Description: Library for Rijndael encryption
+Requires: 
+Version: @VERSION@
+Libs: -L${libdir} -ld0_rijndael
+Cflags: -I${includedir}/d0_blind_id