X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=configure.ac;fp=configure.ac;h=b44f78e47c4a3bfacc6df1b72ebea10486f88e38;hb=63df7d00a150c9558fb4ba96da9cf7c4000fc464;hp=efcd228816a382111ee367732c48e0b3d191ec3e;hpb=6bce9c7d544e967e73128e06f3ee2fc9ebc10e69;p=paraslash.git

diff --git a/configure.ac b/configure.ac
index efcd2288..b44f78e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,6 +38,7 @@ AC_DEFUN([LIB_SUBST_FLAGS], [
 	if test "$HAVE_[]m4_toupper([$1])" = 'yes'; then
 		AC_DEFINE(HAVE_[]m4_toupper([$1]), 1,
 			define to 1 to turn on $1 support)
+		AC_SUBST(HAVE_[]m4_toupper([$1]))
 	else
 		$1_cppflags=
 		$1_ldflags=
@@ -172,6 +173,7 @@ case "$enable_cryptolib" in
 	;;
 esac
 AC_SUBST(crypto_ldflags)
+AC_SUBST(CRYPTOLIB)
 ########################################################################## iconv
 STASH_FLAGS
 LIBS=
@@ -280,14 +282,19 @@ AS_IF([test "$HAVE_OGG" = 'yes' -a \( \
 		-o "$HAVE_OPUS" = 'yes' \
 		-o "$HAVE_FLAC" = 'yes' \
 \)], [NEED_OGG_OBJECTS=yes], [NEED_OGG_OBJECTS=no])
+AC_SUBST([NEED_OGG_OBJECTS])
 AS_IF([test "$HAVE_OGG" = 'yes' -a "$HAVE_VORBIS" = 'yes'],
 	[NEED_VORBIS_OBJECTS=yes], [NEED_VORBIS_OBJECTS=no])
+AC_SUBST([NEED_VORBIS_OBJECTS])
 AS_IF([test "$HAVE_OGG" = 'yes' -a "$HAVE_SPEEX" = 'yes'],
 	[NEED_SPEEX_OBJECTS=yes], [NEED_SPEEX_OBJECTS=no])
+AC_SUBST([NEED_SPEEX_OBJECTS])
 AS_IF([test "$HAVE_OGG" = 'yes' -a "$HAVE_OPUS" = 'yes'],
 	[NEED_OPUS_OBJECTS=yes], [NEED_OPUS_OBJECTS=no])
+AC_SUBST([NEED_OPUS_OBJECTS])
 AS_IF([test "$HAVE_OGG" = 'yes' -a "$HAVE_FLAC" = 'yes'],
 	[NEED_FLAC_OBJECTS=yes], [NEED_FLAC_OBJECTS=no])
+AC_SUBST([NEED_FLAC_OBJECTS])
 ########################################################################### faad
 STASH_FLAGS
 LIB_ARG_WITH([faad], [-lfaad])
@@ -375,83 +382,13 @@ AC_ARG_ENABLE([ubsan], [AS_HELP_STRING(--enable-ubsan,
 	[Detect and report undefined behaviour.])],
 	[ENABLE_UBSAN=yes], [ENABLE_UBSAN=no])
 AC_SUBST(ENABLE_UBSAN)
-######################################################################### server
+######################################################### server and upgrade_db
 if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then
 	build_server="yes"
 	executables="$executables server upgrade_db"
-	server_objs="
-		server
-		afh_common
-		mp3_afh
-		vss
-		command
-		net
-		string
-		signal
-		time
-		daemon
-		http_send
-		close_on_fork
-		crypt_common
-		base64
-		ipc
-		dccp_send
-		fd
-		user_list
-		chunk_queue
-		afs
-		aft
-		mood
-		mp
-		score
-		attribute
-		blob
-		playlist
-		sched
-		acl
-		send_common
-		udp_send
-		color
-		fec
-		wma_afh
-		wma_common
-		sideband
-		version
-		lsu
-	"
-	if test "$CRYPTOLIB" = openssl; then
-		server_objs="$server_objs openssl"
-	else
-		server_objs="$server_objs gcrypt"
-	fi
-	AS_IF([test $NEED_OGG_OBJECTS = yes],
-		[server_objs="$server_objs ogg_afh_common"])
-	AS_IF([test $NEED_VORBIS_OBJECTS = yes],
-		[server_objs="$server_objs ogg_afh"])
-	AS_IF([test $NEED_SPEEX_OBJECTS = yes],
-		[server_objs="$server_objs spx_afh spx_common"])
-	AS_IF([test $NEED_OPUS_OBJECTS = yes],
-		[server_objs="$server_objs opus_afh opus_common"])
-	AS_IF([test $NEED_FLAC_OBJECTS = yes],
-		[server_objs="$server_objs flac_afh"])
-	if test $HAVE_FAAD = yes; then
-		server_objs="$server_objs aac_afh mp4"
-	fi
-	AC_SUBST(server_objs, add_dot_o($server_objs))
 else
 	build_server="no"
 fi
-############################################################# upgrade_db
-upgrade_db_objs='
-	crypt_common
-	exec
-	fd
-	string
-	upgrade_db
-	version
-	base64
-'
-AC_SUBST(upgrade_db_objs, add_dot_o($upgrade_db_objs))
 ############################################################# client
 if test -n "$CRYPTOLIB"; then
 	build_client="yes"