X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=6b1439293fa334831c73c4e87f991f8302c3c8f5;hp=abd40385cf47982055e6b2400d5d937938d1731e;hb=34dd40a9067df6ca4fe18424b73e0a968be65f6c;hpb=36932585ba94f26e24e1eadf0e3e620568479fd1

diff --git a/configure.ac b/configure.ac
index abd40385..6b143929 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 AC_PREREQ(2.53)
 
 
-AC_INIT(paraslash, [0.2.13], maan@systemlinux.org)
+AC_INIT(paraslash, [git], maan@systemlinux.org)
 AC_CONFIG_HEADER([config.h])
 
 ########################################################################### generic
@@ -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"], 
@@ -154,6 +154,31 @@ 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"
@@ -233,7 +258,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 +281,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 +303,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 +458,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:
 ~~~~~~~~~~~~~~~~~~~~~~~~