X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=721c5c0c16b982af7d4f01257968fb192a9fd6d8;hp=3e6e91a55ea0dfcfeb25b9afe7f9e3168c99fecd;hb=b829b61f516298a0de3907cd4c30aef189dd8dd4;hpb=7c3bec32f4a34753a40e2c22086ce2353e8a7b9c

diff --git a/configure.ac b/configure.ac
index 3e6e91a5..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)
@@ -154,14 +154,44 @@ if test ${have_ucred} = yes; then
 	AC_DEFINE(HAVE_UCRED, 1, define to 1 you have struct ucred)
 fi
 
+########################################################################### osx
+
+AC_MSG_CHECKING(for CoreAudio (MacOs))
+AC_TRY_LINK([
+	#include <CoreAudio/CoreAudio.h>
+],[
+	AudioDeviceID id;
+],[have_core_audio=yes],[have_core_audio=no])
+AC_MSG_RESULT($have_core_audio)
+if test ${have_core_audio} = yes; then
+	f1="-framework CoreAudio"
+	f2="-framework AudioToolbox"
+	f3="-framework AudioUnit"
+	f4="-framework CoreServices"
+	f="$f1 $f2 $f3 $f4"
+	audiod_errlist_objs="$audiod_errlist_objs osx_writer"
+	audiod_cmdline_objs="$audiod_cmdline_objs osx_write.cmdline"
+	audiod_ldflags="$audiod_ldflags $f"
+
+	write_errlist_objs="$write_errlist_objs osx_writer"
+	write_cmdline_objs="$write_cmdline_objs osx_write.cmdline"
+	write_ldflags="$write_ldflags $f"
+	write_writers="$write_writers osx"
+	AC_DEFINE(HAVE_CORE_AUDIO, 1, define to 1 on MacOs)
+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"], [
@@ -233,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"
@@ -256,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"
 ])
@@ -266,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
@@ -419,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:
 ~~~~~~~~~~~~~~~~~~~~~~~~