X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=32dfd90c348e35c3913795c3b4b3292be03c3573;hp=aef9d1ec9f944c562a97b3cc45351dd7d5b3c27c;hb=1227a1c87d931f075a398052959adc8391088c3d;hpb=8978f426314b107c55a652e0151397fdab2f003e

diff --git a/configure.ac b/configure.ac
index aef9d1ec..32dfd90c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,12 +15,18 @@ AC_MSG_CHECKING(os type)
 OSTYPE="`$UNAMEPATH -s`"
 AC_MSG_RESULT("$OSTYPE")
 
+if test "$OSTYPE" = "SunOS"; then
+	# needed on SunOS for socket magic
+	arch_cppflags="-D_XOPEN_SOURCE=500 -D__EXTENSIONS__"
+	AC_SUBST(arch_cppflags)
+fi
+
 AC_C_BIGENDIAN()
 
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
-
+AC_REPLACE_FNMATCH
 
 AC_HEADER_DIRENT
 AC_HEADER_STDC
@@ -30,7 +36,7 @@ AC_CHECK_HEADERS([arpa/inet.h ctype.h fcntl.h limits.h netdb.h netinet/in.h \
 	sys/ipc.h unistd.h utime.h stddef.h],
 	[], [AC_MSG_ERROR([$ac_header not found])])
 
-AC_CHECK_HEADER(linux/soundcard.h, [extras="$extras para_fade"], 
+AC_CHECK_HEADER(linux/soundcard.h, [extras="$extras para_fade"],
 	[AC_MSG_WARN([linux/soundcard.h not found, cannot build para_fade])])
 
 # Checks for typedefs, structures, and compiler characteristics.
@@ -42,12 +48,15 @@ AC_TYPE_SIZE_T
 AC_HEADER_TIME
 AC_STRUCT_TM
 AC_TYPE_INT16_T
+AC_TYPE_INT32_T
+AC_TYPE_INT64_T
 AC_TYPE_MODE_T
 AC_TYPE_SSIZE_T
 AC_TYPE_UID_T
+AC_TYPE_UINT8_T
 AC_TYPE_UINT16_T
 AC_TYPE_UINT32_T
-AC_TYPE_UINT8_T
+AC_TYPE_UINT64_T
 
 # Checks for library functions.
 AC_FUNC_FORK
@@ -68,21 +77,21 @@ AC_FUNC_LSTAT
 AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \
 	regcomp select strchr strdup strerror strstr strtol uname \
 	fchdir gettimeofday localtime_r munmap strcasecmp strcspn \
-	strncasecmp strrchr strspn alarm], [],
+	strncasecmp strrchr strspn alarm inet_ntoa mkdir \
+	rmdir socket], [],
 	[AC_MSG_ERROR([function not found, cannot live without it])])
 
 all_errlist_objs="server mp3_afh afh_common vss command net string signal time
-daemon stat crypt http_send close_on_fork ipc dccp
+daemon stat crypt http_send close_on_fork ipc
 dccp_send fd user_list chunk_queue afs osl aft mood score attribute blob ringbuffer
 playlist sha1 rbtree sched audiod grab_client filter_chain wav compress
 http_recv dccp_recv recv_common write_common file_write audiod_command
 client_common recv stdout filter stdin audioc write client fsck exec"
 all_executables="server audiod recv filter audioc write client fsck"
 
-
 recv_cmdline_objs="recv.cmdline http_recv.cmdline dccp_recv.cmdline"
 recv_errlist_objs="http_recv recv_common recv time string net dccp_recv
-	dccp fd sched stdout"
+	fd sched stdout"
 recv_ldflags=""
 
 receivers=" http dccp"
@@ -101,7 +110,7 @@ audiod_cmdline_objs="audiod.cmdline grab_client.cmdline compress_filter.cmdline
 	http_recv.cmdline dccp_recv.cmdline file_write.cmdline client.cmdline
 	audiod_command_list"
 audiod_errlist_objs="audiod signal string daemon stat net
-	time grab_client filter_chain wav compress http_recv dccp dccp_recv
+	time grab_client filter_chain wav compress http_recv dccp_recv
 	recv_common fd sched write_common file_write audiod_command crypt
 	client_common"
 audiod_ldflags=""
@@ -110,7 +119,7 @@ audiod_audio_formats=""
 server_cmdline_objs="server.cmdline server_command_list afs_command_list"
 server_errlist_objs="server afh_common mp3_afh vss command net string signal
 	time daemon stat crypt http_send close_on_fork
-	ipc dccp dccp_send fd user_list chunk_queue afs osl aft mood score attribute
+	ipc dccp_send fd user_list chunk_queue afs osl aft mood score attribute
 	blob playlist sha1 rbtree sched"
 server_ldflags=""
 server_audio_formats=" mp3"
@@ -271,35 +280,6 @@ if test ${have_core_audio} = yes; then
 	default_writer="OSX_WRITE"
 	AC_DEFINE(HAVE_CORE_AUDIO, 1, define to 1 on Mac Os X)
 fi
-########################################################################### gtk2
-build_para_krell="yes"
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-pkg_modules="gtk+-2.0 >= 2.0.0"
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.0.4], [], [build_para_krell="no"])
-PKG_CHECK_MODULES(GTK, [$pkg_modules], [], [build_para_krell="no"])
-CPPFLAGS="$GTK_CFLAGS $GLIB_CFLAGS"
-LDFLAGS="$LDFLAGS $GTK_LIBS"
-AC_CHECK_HEADER(gkrellm2/gkrellm.h, [], [build_para_krell="no"])
-if test "$build_para_krell" = "yes"; then
-	AC_SUBST(GTK_CFLAGS)
-	AC_SUBST(GTK_LIBS)
-	extras="$extras para_krell.so"
-else
-	AC_MSG_WARN([can not build para_krell])
-fi
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
-########################################################################### sdl
-# FIXME
-AC_CHECK_LIB([SDL_image], [SDL_Init], [extras="$extras para_sdl_gui"], [
-	AC_MSG_WARN([libSDL_image not found, cannot build para_sdl_gui])
-])
-AC_CHECK_HEADER(SDL/SDL.h, [], 
-	[AC_MSG_WARN([SDL/SDL.h not found])])
-
 ########################################################################### ogg
 have_ogg="yes"
 OLD_CPPFLAGS="$CPPFLAGS"
@@ -510,28 +490,6 @@ fi
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
-########################################################################### zmw
-build_slider="yes"
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-PKG_CHECK_MODULES(GTK, [$pkg_modules], [], [build_para_slider="no"])
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.0.4], [], [build_slider="no"])
-CPPFLAGS="$GTK_CFLAGS $GLIB_CFLAGS"
-LDFLAGS="$LDFLAGS $GTK_LIBS"
-AC_CHECK_HEADERS([zmw/zmw.h], [], [build_slider="no"])
-AC_CHECK_LIB([zmw], [zmw_init], [], [build_slider="no"])
-if test "$build_slider" = "no"; then
-	AC_MSG_WARN([will not build para_slider])
-else
-	extras="$extras para_slider"
-fi
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
-
-
-
 
 
 AC_SUBST(extra_binaries, [$extras])
@@ -541,10 +499,11 @@ AC_SUBST(install_sh, [$INSTALL])
 AC_CONFIG_FILES([Makefile])
 
 
-
 AC_DEFUN([add_dot_o],[$(for i in $@; do printf "$i.o "; done)])
 AC_DEFUN([objlist_to_errlist],[$(for i in $@; do printf "DEFINE_ERRLIST($(echo $i| tr 'a-z' 'A-Z'));"; done) [const char **para_errlist[[]]] = {$(for i in $@; do printf "PARA_ERRLIST($(echo $i | tr 'a-z' 'A-Z')), "; done) }])
 
+############################################################# error2.h
+
 AC_DEFUN([define_safe_error_enums],
 [
 	exe=""
@@ -584,6 +543,7 @@ AC_DEFUN([define_safe_error_enums],
 ]
 )
 
+
 AC_MSG_NOTICE(creating error2.h)
 for obj in $all_errlist_objs; do
 	SS="$SS SS_$(echo $obj | tr 'a-z' 'A-Z'),"
@@ -596,6 +556,38 @@ AC_DEFINE_UNQUOTED(DEFINE_ERRLIST_OBJECT_ENUM,
 	[list of all objects that use paraslash's error facility]
 )
 
+################################################################## status items
+
+status_items="basename status num_played mtime bitrate frequency file_size
+status_flags format score audio_file_info taginfo1 taginfo2 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"
+
+# $1: prefix, $2: items
+AC_DEFUN([make_enum_items], [$(
+	for i in $2; do
+		printf "$1_$(echo $i | tr 'a-z' 'A-Z'), "
+	done
+)])
+
+# $1: prefix, $2: items
+AC_DEFUN([make_enum_array], [$(
+	for i in $2; do
+		printf "\"$i\", "
+	done
+)])
+
+AC_DEFINE_UNQUOTED(STATUS_ITEM_ENUM,
+	make_enum_items(SI,  $status_items),
+	[enum of all status items]
+)
+AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY,
+	make_enum_array(SI,  $status_items),
+	[char * array of all status items]
+)
+
 
 recv_objs="$recv_cmdline_objs $recv_errlist_objs"
 filter_objs="$filter_cmdline_objs $filter_errlist_objs"