-change to gabe bswabe fork

1 files changed, 23 insertions, 16 deletions

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 4b1e44503..62cf03684 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -87,7 +87,6 @@ libgnunetutil_la_SOURCES = \
   crypto_paillier.c \
   crypto_random.c \
   crypto_rsa.c \
-  crypto_abe.c \
   disk.c \
   disk.h \
   getopt.c \
@@ -118,21 +117,24 @@ libgnunetutil_la_LIBADD = \
   $(LIBGCRYPT_LIBS) \
   $(LTLIBICONV) \
   $(LTLIBINTL) \
-        $(ABE_LIBADD) \
-        -lbswabe \
-        -lssl \
-        -lpbc \
-        -lglib-2.0 \
   -lltdl $(Z_LIBS) -lunistring $(XLIB)
 
+if HAVE_PBC
+if HAVE_ABE
+libgnunetutil_la_SOURCES += \
+        crypto_abe.c
+libgnunetutil_la_LIBADD += \
+  $(ABE_LIBADD) \
+        -lgabe \
+        -lpbc \
+        -lglib-2.0
+endif
+endif
+
 libgnunetutil_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
-        $(ABE_LDADD) \
   -version-info 13:0:0
 
-libgnunetutil_la_CFLAGS = \
-  $(ABE_CFLAGS)
-
 libgnunetutil_taler_wallet_la_SOURCES = \
   common_allocation.c \
   common_endian.c \
@@ -283,7 +285,6 @@ check_PROGRAMS = \
  test_container_multipeermap \
  test_container_heap \
  test_crypto_symmetric \
- test_crypto_abe \
  test_crypto_crc \
  test_crypto_ecdsa \
  test_crypto_eddsa \
@@ -416,11 +417,6 @@ test_crypto_symmetric_SOURCES = \
 test_crypto_symmetric_LDADD = \
  libgnunetutil.la
 
-test_crypto_abe_SOURCES = \
- test_crypto_abe.c
-test_crypto_abe_LDADD = \
- libgnunetutil.la
-
 test_crypto_crc_SOURCES = \
  test_crypto_crc.c
 test_crypto_crc_LDADD = \
@@ -568,6 +564,17 @@ test_speedup_SOURCES = \
 test_speedup_LDADD = \
  libgnunetutil.la
 
+if HAVE_PBC
+if HAVE_ABE
+test_crypto_abe_SOURCES = \
+ test_crypto_abe.c
+test_crypto_abe_LDADD = \
+ libgnunetutil.la
+check_PROGRAMS += \
+ test_crypto_abe
+endif
+endif
+
 perf_crypto_hash_SOURCES = \
  perf_crypto_hash.c
 perf_crypto_hash_LDADD = \