X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=721c5c0c16b982af7d4f01257968fb192a9fd6d8;hp=81d1cbba04e4ffc08341cee2528c0313f22bc7b2;hb=4c80bf4a2082c4922094f7e8ce75193edb6be80f;hpb=27638103f249ffbe9768603b9baff199950fd9f6

diff --git a/configure.ac b/configure.ac
index 81d1cbba..721c5c0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.53)
+AC_PREREQ(2.60)
 
 
 AC_INIT(paraslash, [git], maan@systemlinux.org)
@@ -16,7 +16,7 @@ AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS([arpa/inet.h ctype.h fcntl.h limits.h netdb.h netinet/in.h stdlib.h \
-	string.h sys/socket.h sys/time.h sys/timeb.h sys/un.h sys/ipc.h unistd.h utime.h malloc.h], \
+	string.h sys/socket.h sys/time.h sys/timeb.h sys/un.h sys/ipc.h unistd.h utime.h], \
 	[], [AC_MSG_ERROR([$ac_header not found])])
 
 AC_CHECK_HEADER(linux/soundcard.h, [extras="$extras para_fade"], 
@@ -68,10 +68,11 @@ audioc_cmdline_objs="audioc.cmdline"
 audioc_errlist_objs="audioc string net fd"
 
 audiod_cmdline_objs="audiod.cmdline grab_client.cmdline compress_filter.cmdline
-	http_recv.cmdline dccp_recv.cmdline file_write.cmdline"
-audiod_errlist_objs="audiod exec close_on_fork signal string daemon stat net
+	http_recv.cmdline dccp_recv.cmdline file_write.cmdline client.cmdline"
+audiod_errlist_objs="audiod signal string daemon stat net
 	time grab_client filter_chain wav compress http_recv dccp dccp_recv
-	recv_common fd sched write_common file_writer audiod_command"
+	recv_common fd sched write_common file_writer audiod_command crypt
+	client_common"
 audiod_ldflags=""
 
 server_cmdline_objs="server.cmdline"
@@ -137,6 +138,7 @@ if test "$enable_ssldir" = "yes"; then enable_ssldir=""; fi
 CHECK_SSL($enable_ssldir)
 server_ldflags="$srver_ldflags $SSL_LDFLAGS $SSL_LIBS"
 client_ldflags="$client_ldflags $SSL_LDFLAGS $SSL_LIBS"
+audiod_ldflags="$audiod_ldflags $SSL_LDFLAGS $SSL_LIBS"
 
 ########################################################################### ucred
 
@@ -180,11 +182,16 @@ fi
 ########################################################################### gtk2
 
 pkg_modules="gtk+-2.0 >= 2.0.0"
-PKG_CHECK_MODULES(GTK, [$pkg_modules], [extras="$extras para_krell.so"], [
-	AC_MSG_WARN([gtk+-2 not found, can not build para_krell])
-])
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
+build_para_krell="yes"
+PKG_CHECK_MODULES(GTK, [$pkg_modules], [], [build_para_krell="no"])
+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
 
 ########################################################################### sdl
 AC_CHECK_LIB([SDL_image], [SDL_Init], [extras="$extras para_sdl_gui"], [
@@ -256,7 +263,7 @@ if test -n "$enable_faad_headers"; then
 	faad_cppflags="-I$enable_faad_headers"
 	CPPFLAGS="$CPPFLAGS $faad_cppflags"
 fi
-AC_ARG_ENABLE(faad_libs, [AC_HELP_STRING(--enable-fadd-libs=dir,
+AC_ARG_ENABLE(faad_libs, [AC_HELP_STRING(--enable-faad-libs=dir,
 	[look for libfaad also in dir])])
 if test -n "$enable_faad_libs"; then
 	faad_libs="-L$enable_faad_libs"
@@ -279,6 +286,18 @@ else
 fi
 ########################################################################### mad
 have_mad="yes"
+AC_ARG_ENABLE(mad_headers, [AC_HELP_STRING(--enable-mad-headers=dir,
+	[look for mad.h also in dir])])
+if test -n "$enable_mad_headers"; then
+	mad_cppflags="-I$enable_mad_headers"
+	CPPFLAGS="$CPPFLAGS $mad_cppflags"
+fi
+AC_ARG_ENABLE(mad_libs, [AC_HELP_STRING(--enable-mad-libs=dir,
+	[look for libmad also in dir])])
+if test -n "$enable_mad_libs"; then
+	mad_libs="-L$enable_mad_libs"
+	LDFLAGS="$LDFLAGS $mad_libs"
+fi
 AC_CHECK_HEADERS([mad.h], [], [
 	have_mad="no"
 ])
@@ -289,8 +308,10 @@ if test "$have_mad" = "yes"; then
 	AC_DEFINE(HAVE_MAD, 1, define to 1 if you want to build the mp3dec filter)
 	filter_errlist_objs="$filter_errlist_objs mp3dec"
 	audiod_errlist_objs="$audiod_errlist_objs mp3dec"
-	filter_ldflags="$filter_ldflags -lmad"
-	audiod_ldflags="$audiod_ldflags -lmad"
+	filter_ldflags="$filter_ldflags $mad_libs -lmad"
+	audiod_ldflags="$audiod_ldflags $mad_libs -lmad"
+	AC_SUBST(mad_cppflags)
+	AC_SUBST(mad_libs)
 else
 	AC_MSG_WARN([no mp3dec support in para_audiod/para_filter])
 fi
@@ -442,7 +463,7 @@ AC_SUBST(gui_objs, add_dot_o($gui_objs))
 
 AC_OUTPUT
 AC_MSG_NOTICE([creating Makefile.deps])
-gcc -MM -MG $mysql_cppflags $faad_cppflags *.c > Makefile.deps
+gcc -MM -MG $mysql_cppflags $faad_cppflags $mad_cppflags *.c > Makefile.deps
 AC_MSG_NOTICE([
 paraslash configuration:
 ~~~~~~~~~~~~~~~~~~~~~~~~