From: Andre Noll <maan@systemlinux.org>
Date: Thu, 29 Aug 2013 21:09:45 +0000 (+0000)
Subject: build: Build para_client only if crypto lib was found.
X-Git-Tag: v0.5.1~1^2~62
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=98b801a470a01d805fd03e44c1636186d6e10bbf;hp=17ed11f03c1f9bbc5fc5c4b6f81a23afd7dadb67

build: Build para_client only if crypto lib was found.

This creates a separate section for para_client, similar to the one
for para_server that was added in the previous patch.

The new section sets $build_client to either yes or no, depending on
whether a crypto library (openssl nor gcrypt) was found by the tests
performed earlier. This test is always true at the moment since we
abort anyway if neither library was detected. But this is about to
change, so..
---

diff --git a/configure.ac b/configure.ac
index 00ff019f..a6fc62af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,7 +92,7 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \
 AC_DEFUN([add_cmdline],[$(for i in $@; do printf "${i}.cmdline "; done)])
 
 
-executables="recv filter audioc write client afh audiod play"
+executables="recv filter audioc write afh audiod play"
 audio_format_handlers="mp3 wma"
 
 recv_cmdline_objs="add_cmdline(recv http_recv dccp_recv udp_recv afh_recv)"
@@ -144,25 +144,6 @@ write_ldflags=""
 writers=" file"
 default_writer="FILE_WRITE"
 
-client_cmdline_objs="add_cmdline(client)"
-client_errlist_objs="
-	client
-	net
-	string
-	fd
-	sched
-	stdin
-	stdout
-	time
-	sideband
-	client_common
-	buffer_tree
-	crypt_common
-	version
-	ggo
-"
-client_ldflags=""
-
 gui_cmdline_objs="add_cmdline(gui)"
 gui_errlist_objs="
 	exec
@@ -1173,6 +1154,30 @@ if test \( "$have_openssl" = "yes" -o "$have_gcrypt" = "yes" \) \
 else
 	build_server="no"
 fi
+############################################################# client
+if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then
+	build_client="yes"
+	executables="$executables client"
+	client_cmdline_objs="add_cmdline(client)"
+	client_errlist_objs="$client_errlist_objs
+		client
+		net
+		string
+		fd
+		sched
+		stdin
+		stdout
+		time
+		sideband
+		client_common
+		buffer_tree
+		crypt_common
+		version
+		ggo
+	"
+else
+	build_client="no"
+fi
 ############################################################# error2.h
 AC_MSG_NOTICE(creating error2.h)
 
@@ -1182,7 +1187,6 @@ all_errlist_objs="
 	$filter_errlist_objs
 	$audioc_errlist_objs
 	$write_errlist_objs
-	$client_errlist_objs
 	$afh_errlist_objs
 	$audiod_errlist_objs
 	$play_errlist_objs
@@ -1198,6 +1202,9 @@ fi
 if test "$build_fade" = "yes"; then
 	all_errlist_objs="$all_errlist_objs $fade_errlist_objs"
 fi
+if test "$build_client" = "yes"; then
+	all_errlist_objs="$all_errlist_objs $client_errlist_objs"
+fi
 
 all_errlist_objs="$(echo $all_errlist_objs | tr ' ' '\n' | sort | uniq)"
 
@@ -1343,4 +1350,5 @@ $mixer_summary
 para_server: $build_server
 para_gui: $build_gui
 para_fade: $build_fade
+para_client: $build_client
 ])