From 747248026fbb4e41d2ed1132cda9d37b978163d0 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Sat, 7 Jun 2008 23:17:15 +0200
Subject: [PATCH] Use new Configure module to configure crypto libs.

---
 configure       |  8 ++++++++
 submit/Makefile | 17 ++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/configure b/configure
index da5ad74..d8c25e2 100755
--- a/configure
+++ b/configure
@@ -32,5 +32,13 @@ if (Get("CONFIG_SUBMIT") || Get("CONFIG_MOP")) {
 	Set("CONFIG_UCW_LIBS" => 1);
 }
 
+if (Get("CONFIG_SUBMIT")) {
+	# Submit server needs crypto libraries
+	if (!TrivConfig("libgnutls", script => "libgnutls-config") ||
+	    !TrivConfig("libgcrypt", script => "libgcrypt-config")) {
+		Fail "The libgnutls and libgcrypt libraries are required to build the submit server.";
+	}
+}
+
 Finish();
 Log "\nConfigured, run `make' to build everything.\n";
diff --git a/submit/Makefile b/submit/Makefile
index 9e7e0a6..c7971f3 100644
--- a/submit/Makefile
+++ b/submit/Makefile
@@ -1,9 +1,8 @@
 # Makefile for MO-Eval submitter
 # (c) 2008 Martin Mares <mj@ucw.cz>
 
-TLSCF:=$(shell libgnutls-config --cflags)
-TLSLF:=$(shell libgnutls-config --libs)
-GCRCF:=$(shell libgcrypt-config --cflags)
+SUBCF=$(CFLAGS_LIBGCRYPT) $(CFLAGS_LIBGNUTLS)
+SUBLF=$(LIBS_LIBGCRYPT) $(LIBS_LIBGNUTLS)
 
 DIRS+=submit
 SDIR=$(o)/submit
@@ -15,16 +14,16 @@ PROGS+=$(addprefix $(SDIR)/,submitd privkey connect)
 $(SHERLOCK_PERL_MODS): PERL_MODULE_DIR=MO
 
 $(SDIR)/submitd: $(addprefix $(SDIR)/,submitd.o commands.o tasks.o) $(LIBUCW) $(LIBSH)
-$(SDIR)/submitd: CFLAGS+=$(TLSCF) $(GCRCF)
-$(SDIR)/submitd: LIBS+=$(TLSLF)
+$(SDIR)/submitd: CFLAGS+=$(SUBCF)
+$(SDIR)/submitd: LIBS+=$(SUBLF)
 
 $(SDIR)/connect: $(SDIR)/connect.o $(LIBUCW)
-$(SDIR)/connect: CFLAGS+=$(TLSCF) $(GCRCF)
-$(SDIR)/connect: LIBS+=$(TLSLF)
+$(SDIR)/connect: CFLAGS+=$(SUBCF)
+$(SDIR)/connect: LIBS+=$(SUBLF)
 
 $(SDIR)/privkey: $(SDIR)/privkey.o $(LIBUCW)
-$(SDIR)/privkey: CFLAGS+=$(TLSCF) $(GCRCF)
-$(SDIR)/privkey: LIBS+=$(TLSLF)
+$(SDIR)/privkey: CFLAGS+=$(SUBCF)
+$(SDIR)/privkey: LIBS+=$(SUBLF)
 
 CONFIGS+=submitd
 run/cf/submitd: $(SDIR)/submitd.cf
-- 
2.39.2