X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=053996d1606b13a1ff3da085d59a0f1451f065af;hp=1a375e9f57b0c9d589b24caf7faf2fe4b02a861e;hb=ba83a291cd486e8ab53ac64d81b17d8f5705d715;hpb=e5de57de1b8bf1df96c152fc92f5a49f75d6d96c

diff --git a/configure.ac b/configure.ac
index 1a375e9f..053996d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,20 +46,21 @@ AC_DEFUN([LIB_SUBST_FLAGS], [
 	AC_SUBST($1_cppflags)
 	AC_SUBST($1_ldflags)
 ])
+AC_DEFUN([REQUIRE_EXECUTABLE], [
+        AC_PATH_PROG(m4_toupper([$1]), [$1])
+        test -z "$m4_toupper([$1])" && AC_MSG_ERROR(
+		[$1 is required to build this package])
+])
 
 AC_USE_SYSTEM_EXTENSIONS
 AC_C_BIGENDIAN()
-
-AC_PATH_PROG([BISON], [bison])
-AC_PATH_PROG([FLEX], [flex])
-
-AC_PATH_PROG([M4], [m4])
-test -z "$M4" && AC_MSG_ERROR(
-	[The m4 macro processor is required to build this package])
-
 AC_PROG_CC
 AC_PROG_CPP
 
+REQUIRE_EXECUTABLE([bison])
+REQUIRE_EXECUTABLE([flex])
+REQUIRE_EXECUTABLE([m4])
+
 executables="recv filter audioc write afh play"
 ########################################################################### osl
 STASH_FLAGS
@@ -391,9 +392,10 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes && test -n "$BISON" && \
 		wma_common
 		sideband
 		version
+		lsu
 	"
 	if test "$CRYPTOLIB" = openssl; then
-		server_errlist_objs="$server_errlist_objs crypt"
+		server_errlist_objs="$server_errlist_objs openssl"
 	else
 		server_errlist_objs="$server_errlist_objs gcrypt"
 	fi
@@ -419,6 +421,7 @@ if test -n "$CRYPTOLIB"; then
 		net
 		string
 		fd
+		lsu
 		sched
 		stdin
 		stdout
@@ -431,7 +434,7 @@ if test -n "$CRYPTOLIB"; then
 		version
 	"
 	if test "$CRYPTOLIB" = openssl; then
-		client_errlist_objs="$client_errlist_objs crypt"
+		client_errlist_objs="$client_errlist_objs openssl"
 	else
 		client_errlist_objs="$client_errlist_objs gcrypt"
 	fi
@@ -485,9 +488,10 @@ if test -n "$CRYPTOLIB"; then
 		wmadec_filter
 		buffer_tree
 		sync_filter
+		lsu
 	"
 	if test "$CRYPTOLIB" = openssl; then
-		audiod_errlist_objs="$audiod_errlist_objs crypt"
+		audiod_errlist_objs="$audiod_errlist_objs openssl"
 	else
 		audiod_errlist_objs="$audiod_errlist_objs gcrypt"
 	fi
@@ -542,7 +546,7 @@ fi
 if test $HAVE_OSS = yes -o $HAVE_ALSA = yes; then
 	build_mixer="yes"
 	executables="$executables mixer"
-	mixer_errlist_objs="mixer exec string fd version"
+	mixer_errlist_objs="mixer exec string fd lsu version"
 	if test $HAVE_OSS = yes; then
 		mixer_errlist_objs="$mixer_errlist_objs oss_mix"
 	fi
@@ -568,6 +572,7 @@ if test $HAVE_CURSES = yes; then
 		fd
 		gui
 		gui_theme
+		lsu
 		time
 		sched
 		version
@@ -592,6 +597,7 @@ filter_errlist_objs="
 	amp_filter
 	fecdec_filter
 	fec
+	lsu
 	version
 	prebuffer_filter
 	time
@@ -721,6 +727,7 @@ play_errlist_objs="
 	file_write
 	version
 	sync_filter
+	lsu
 "
 NEED_OGG_OBJECTS && play_errlist_objs="$play_errlist_objs ogg_afh_common"
 NEED_VORBIS_OBJECTS && {
@@ -792,6 +799,7 @@ AC_SUBST(write_objs, add_dot_o($write_objs))
 audioc_errlist_objs="
 	audioc
 	string
+	lsu
 	net
 	fd
 	version