X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=80671ad5e2e696adbcc0451f2512fd2dfe51d63f;hp=b6aac81b98973f384fff3deafb5be36eac05fa88;hb=e96982fb3158bb8293d2c63b8341cbc0712faca1;hpb=a61e862450dc1e74394bf5bbf7002d9947f98d31

diff --git a/configure.ac b/configure.ac
index b6aac81b..80671ad5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,17 +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([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
@@ -169,6 +173,17 @@ AC_CHECK_TYPE([struct ucred], [
 	#include <sys/types.h>
 	#include <sys/socket.h>
 ])
+################################################################### FNM_EXTMATCH
+AC_MSG_CHECKING(for extended wildcard pattern matching)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+	#include <fnmatch.h>
+]], [[
+	unsigned n = FNM_EXTMATCH;
+]])], [have_fnm_extmatch=yes], [have_fnm_extmatch=no])
+AC_MSG_RESULT($have_fnm_extmatch)
+if test $have_fnm_extmatch = yes; then
+	AC_DEFINE(HAVE_FNM_EXTMATCH, 1, define to 1 if FNM_EXTMATCH is defined)
+fi
 ########################################################################### curses
 STASH_FLAGS
 LIB_ARG_WITH([curses], [])
@@ -334,7 +349,8 @@ AC_CHECK_LIB([samplerate], [src_process], [], HAVE_SAMPLERATE=no)
 LIB_SUBST_FLAGS(samplerate)
 UNSTASH_FLAGS
 ######################################################################### server
-if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then
+if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes && test -n "$BISON" && \
+		test -n "$FLEX"; then
 	build_server="yes"
 	executables="$executables server"
 	server_errlist_objs="
@@ -361,6 +377,7 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then
 		afs
 		aft
 		mood
+		mp
 		score
 		attribute
 		blob
@@ -375,6 +392,7 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then
 		wma_common
 		sideband
 		version
+		lsu
 	"
 	if test "$CRYPTOLIB" = openssl; then
 		server_errlist_objs="$server_errlist_objs crypt"
@@ -469,6 +487,7 @@ if test -n "$CRYPTOLIB"; then
 		wmadec_filter
 		buffer_tree
 		sync_filter
+		lsu
 	"
 	if test "$CRYPTOLIB" = openssl; then
 		audiod_errlist_objs="$audiod_errlist_objs crypt"
@@ -790,33 +809,9 @@ if test $HAVE_READLINE = yes; then
 fi
 audioc_objs="$audioc_errlist_objs"
 AC_SUBST(audioc_objs, add_dot_o($audioc_objs))
-################################################################## status items
-
-status_items="basename status num_played mtime bitrate frequency file_size
-status_flags format score techinfo afs_mode
-attributes_txt decoder_flags audiod_status play_time attributes_bitmap
-offset seconds_total stream_start current_time audiod_uptime image_id
-lyrics_id duration directory lyrics_name image_name path hash channels
-last_played num_chunks chunk_time amplification artist title year album
-comment max_chunk_size"
-
-result=
-for i in $status_items; do
-	result="$result SI_$(echo $i | tr 'a-z' 'A-Z'), "
-done
-AC_DEFINE_UNQUOTED(STATUS_ITEM_ENUM, [$result],
-	[enum of all status items])
-
-result=
-for i in $status_items; do
-	result="$result \"$i\", "
-done
-AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY, [$result],
-	[char * array of all status items])
 
 AC_DEFINE_UNQUOTED(AUDIO_FORMAT_HANDLERS, "$audio_format_handlers",
 	[formats supported by para_server and para_afh])
-
 AC_SUBST(executables)
 
 AC_OUTPUT