X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=61b1808ae74a48d71584230f186227808c84d1ee;hp=f6b8733eb06e9f84f7e4810934b0acd3b89168d0;hb=002e302f18b73e57e8a5ff5e9dc97c68bb85216d;hpb=d7cda933daa35663b2b9b61d62cb514afa37fd18

diff --git a/configure.ac b/configure.ac
index f6b8733e..61b1808a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,8 +51,6 @@ AC_CHECK_FUNCS([atexit dup2 gethostbyname inet_ntoa memchr memmove memset \
 AC_CHECK_LIB([ncurses], [initscr], [], 
 	[AC_MSG_ERROR([libncurses not found])])
 
-AC_CHECK_LIB([readline], [readline], [], 
-	[AC_MSG_ERROR([libreadline not found])])
 AC_CHECK_LIB([menu], [new_menu], [extras="$extras para_dbadm"],
 	[AC_MSG_WARN([libmenu not found,  cannot build para_dbadm])])
 
@@ -78,6 +76,10 @@ server_errlist_objs="server mp3 afs command net string signal random_selector
 	ipc dccp dccp_send fd"
 server_ldflags=""
 
+play_cmdline_objs="play.cmdline"
+play_errlist_objs="play time fd string"
+play_ldflags=""
+
 ########################################################################### ssl
 dnl @synopsis CHECK_SSL
 dnl
@@ -126,6 +128,20 @@ if test "$enable_ssldir" = "yes"; then enable_ssldir=""; fi
 CHECK_SSL($enable_ssldir)
 server_ldflags="$srver_ldflags $SSL_LDFLAGS $SSL_LIBS"
 
+########################################################################### ucred
+
+AC_MSG_CHECKING(for struct ucred)
+AC_TRY_LINK([
+	#include <sys/types.h>
+	#include <sys/socket.h>
+],[
+	struct ucred sucred; sucred.pid=0;
+],[have_ucred=yes],[have_ucred=no])
+AC_MSG_RESULT($have_ucred)
+if test ${have_ucred} = yes; then
+	AC_DEFINE(HAVE_UCRED, 1, define to 1 you have struct ucred)
+fi
+
 ########################################################################### gtk2
 
 pkg_modules="gtk+-2.0 >= 2.0.0"
@@ -201,19 +217,20 @@ else
 	AC_MSG_WARN([no mp3dec support in para_audiod/para_filter])
 fi
 ########################################################################### alsa
-play="para_play"
-msg="will not build para_play"
+have_alsa="yes"
+msg="=> no para_play"
 AC_CHECK_HEADERS([alsa/asoundlib.h], [], [
-	AC_MSG_WARN([no alsa/asoundlib, $msg])
-	play=""
+	AC_MSG_WARN([no alsa/asoundlib $msg])
+	have_alsa="no"
 ])
 AC_CHECK_LIB([asound], [snd_pcm_open], [], [
-	AC_MSG_WARN([no libasound, $msg])
-	play=""
+	AC_MSG_WARN([no libasound $msg])
+	have_alsa="no"
 ])
-extras="$extras $play"
-
-
+if test "$have_alsa" = "yes"; then
+	extras="$extras para_play"
+	play_ldflags="$play_ldflags -lasound"
+fi
 ########################################################################### ortp
 have_ortp="yes"
 AC_CHECK_HEADERS([ortp/ortp.h], [], [
@@ -276,6 +293,7 @@ recv_objs="$recv_cmdline_objs $recv_errlist_objs"
 filter_objs="$filter_cmdline_objs $filter_errlist_objs"
 audiod_objs="$audiod_cmdline_objs $audiod_errlist_objs"
 server_objs="$server_cmdline_objs $server_errlist_objs"
+play_objs="$play_cmdline_objs $play_errlist_objs"
 
 AC_SUBST(recv_objs, add_dot_o($recv_objs))
 AC_SUBST(recv_ldflags, $recv_ldflags)
@@ -284,7 +302,7 @@ AC_DEFINE_UNQUOTED(INIT_RECV_ERRLISTS, objlist_to_errlist($recv_errlist_objs),
 
 AC_SUBST(filter_objs, add_dot_o($filter_objs))
 AC_SUBST(filter_ldflags, $filter_ldflags)
-AC_DEFINE_UNQUOTED(INIT_FILTER_ERRLISTS, 
+AC_DEFINE_UNQUOTED(INIT_FILTER_ERRLISTS,
 	objlist_to_errlist($filter_errlist_objs), errors used by para_filter)
 
 AC_SUBST(audiod_objs, add_dot_o($audiod_objs))
@@ -294,8 +312,22 @@ AC_DEFINE_UNQUOTED(INIT_AUDIOD_ERRLISTS, objlist_to_errlist($audiod_errlist_objs
 
 AC_SUBST(server_objs, add_dot_o($server_objs))
 AC_SUBST(server_ldflags, $server_ldflags)
-AC_DEFINE_UNQUOTED(INIT_SERVER_ERRLISTS, 
+AC_DEFINE_UNQUOTED(INIT_SERVER_ERRLISTS,
 	objlist_to_errlist($server_errlist_objs), errors used by para_server)
+
+AC_SUBST(play_objs, add_dot_o($play_objs))
+AC_SUBST(play_ldflags, $play_ldflags)
+AC_DEFINE_UNQUOTED(INIT_PLAY_ERRLISTS,
+	objlist_to_errlist($play_errlist_objs), errors used by para_play)
+
+gui_cmdline_objs="gui.cmdline"
+gui_errlist_objs="exec close_on_fork signal string stat ringbuffer fd"
+gui_other_objs="gui gui_common gui_theme"
+gui_objs="$gui_cmdline_objs $gui_errlist_objs $gui_other_objs"
+AC_DEFINE_UNQUOTED(INIT_GUI_ERRLISTS,
+	objlist_to_errlist($gui_errlist_objs), errors used by para_gui)
+AC_SUBST(gui_objs, add_dot_o($gui_objs))
+
 AC_OUTPUT
 AC_MSG_NOTICE([creating Makefile.deps])
 gcc -MM -MG *.c > Makefile.deps
@@ -306,4 +338,6 @@ mysql support: $have_mysql
 ogg vorbis support: $have_ogg
 mp3dec support (libmad): $have_mad
 ortp support: $have_ortp
+unix socket credentials: $have_ucred
+alsa support (para_play): $have_alsa
 ])