projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ogg_afh.c: add documentation of struct ogg_datasource
[paraslash.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 1fa5ac4f2f71c9fe949862278e25a51a8a5b0fb5..316f95c74679613748e0fcc0f12c00b707d2f4a2 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-7,7
+7,16
@@
AC_PREREQ(2.60)
AC_INIT(paraslash, [git], maan@systemlinux.org)
AC_CONFIG_HEADER([config.h])
AC_INIT(paraslash, [git], maan@systemlinux.org)
AC_CONFIG_HEADER([config.h])
-########################################################################### generic
+AC_PATH_PROG(UNAMEPATH, uname, no)
+if test "$UNAMEPATH" = "no"; then
+ AC_MSG_ERROR(unable to determine system type)
+fi
+AC_MSG_CHECKING(os type)
+OSTYPE="`$UNAMEPATH -s`"
+AC_MSG_RESULT("$OSTYPE")
+
+AC_C_BIGENDIAN()
+
AC_PROG_CC
AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_CC
AC_PROG_CPP
AC_PROG_INSTALL
@@
-84,7
+93,7
@@
audiod_audio_formats=""
server_cmdline_objs="server.cmdline server_command_list random_selector_command_list
playlist_selector_command_list"
server_errlist_objs="server mp3_afh vss command net string signal random_selector
server_cmdline_objs="server.cmdline server_command_list random_selector_command_list
playlist_selector_command_list"
server_errlist_objs="server mp3_afh vss command net string signal random_selector
- time daemon stat crypt http_send
db
close_on_fork playlist_selector
+ time daemon stat crypt http_send
afs
close_on_fork playlist_selector
ipc dccp dccp_send fd user_list"
server_ldflags=""
server_audio_formats=" mp3"
ipc dccp dccp_send fd user_list"
server_ldflags=""
server_audio_formats=" mp3"
@@
-93,6
+102,7
@@
write_cmdline_objs="write.cmdline file_write.cmdline"
write_errlist_objs="write write_common file_write time fd string sched stdin"
write_ldflags=""
writers=" file"
write_errlist_objs="write write_common file_write time fd string sched stdin"
write_ldflags=""
writers=" file"
+default_writer="FILE_WRITE"
client_cmdline_objs="client.cmdline"
client_errlist_objs="client net string crypt fd sched stdin stdout client_common"
client_cmdline_objs="client.cmdline"
client_errlist_objs="client net string crypt fd sched stdin stdout client_common"
@@
-184,6
+194,7
@@
if test ${have_core_audio} = yes; then
write_cmdline_objs="$write_cmdline_objs osx_write.cmdline"
write_ldflags="$write_ldflags $f"
writers="$writers osx"
write_cmdline_objs="$write_cmdline_objs osx_write.cmdline"
write_ldflags="$write_ldflags $f"
writers="$writers osx"
+ default_writer="OSX_WRITE"
AC_DEFINE(HAVE_CORE_AUDIO, 1, define to 1 on Mac Os X)
fi
########################################################################### gtk2
AC_DEFINE(HAVE_CORE_AUDIO, 1, define to 1 on Mac Os X)
fi
########################################################################### gtk2
@@
-276,6
+287,9
@@
AC_CHECK_HEADERS([ogg/ogg.h vorbis/codec.h], [], [ have_ogg="no" ])
if test "$have_ogg" = "yes"; then
AC_DEFINE(HAVE_OGGVORBIS, 1, define to 1 to turn on ogg vorbis support)
filters="$filters oggdec"
if test "$have_ogg" = "yes"; then
AC_DEFINE(HAVE_OGGVORBIS, 1, define to 1 to turn on ogg vorbis support)
filters="$filters oggdec"
+ if test "$OSTYPE" = "Darwin"; then
+ oggvorbis_libs="-Wl,-bind_at_load $oggvorbis_libs"
+ fi
server_ldflags="$server_ldflags $oggvorbis_libs -logg -lvorbis -lvorbisfile"
filter_ldflags="$filter_ldflags $oggvorbis_libs -lvorbis -lvorbisfile"
audiod_ldflags="$audiod_ldflags $oggvorbis_libs -lvorbis -lvorbisfile"
server_ldflags="$server_ldflags $oggvorbis_libs -logg -lvorbis -lvorbisfile"
filter_ldflags="$filter_ldflags $oggvorbis_libs -lvorbis -lvorbisfile"
audiod_ldflags="$audiod_ldflags $oggvorbis_libs -lvorbis -lvorbisfile"
@@
-405,6
+419,7
@@
if test "$have_alsa" = "yes"; then
write_cmdline_objs="$write_cmdline_objs alsa_write.cmdline"
write_ldflags="$write_ldflags -lasound"
writers="$writers alsa"
write_cmdline_objs="$write_cmdline_objs alsa_write.cmdline"
write_ldflags="$write_ldflags -lasound"
writers="$writers alsa"
+ default_writer="ALSA_WRITE"
fi
CPPFLAGS="$OLD_CPPFLAGS"
LDFLAGS="$OLD_LDFLAGS"
fi
CPPFLAGS="$OLD_CPPFLAGS"
LDFLAGS="$OLD_LDFLAGS"
@@
-532,6
+547,7
@@
AC_DEFINE_UNQUOTED(INIT_AUDIOC_ERRLISTS,
enum="$(for i in $writers; do printf "${i}_WRITE, " | tr '[a-z]' '[A-Z]'; done)"
AC_DEFINE_UNQUOTED(WRITER_ENUM, $enum NUM_SUPPORTED_WRITERS,
enum of supported writers)
enum="$(for i in $writers; do printf "${i}_WRITE, " | tr '[a-z]' '[A-Z]'; done)"
AC_DEFINE_UNQUOTED(WRITER_ENUM, $enum NUM_SUPPORTED_WRITERS,
enum of supported writers)
+AC_DEFINE_UNQUOTED(DEFAULT_WRITER, $default_writer, use this writer if none was specified)
names="$(for i in $writers; do printf \"$i\",' ' ; done)"
AC_DEFINE_UNQUOTED(WRITER_NAMES, $names, supported writer names)
inits="$(for i in $writers; do printf 'extern void '$i'_write_init(struct writer *); '; done)"
names="$(for i in $writers; do printf \"$i\",' ' ; done)"
AC_DEFINE_UNQUOTED(WRITER_NAMES, $names, supported writer names)
inits="$(for i in $writers; do printf 'extern void '$i'_write_init(struct writer *); '; done)"