Commit b9aa043e authored by Karl Heyes's avatar Karl Heyes
Browse files

various cleanups of the ices build. Things like make dist should provide

a useable archive. This will be useful for people with older auto tools.
Only the log subdirectory needs to build as the rest are actually in
libshout.

The sun module can now be manually disabled, in case autodetection has a
problem. Only OpenBSD has shown this currently.

svn path=/trunk/ices/; revision=4544
parent 5112e574
......@@ -62,12 +62,20 @@ fi
dnl Check for Sun audio
AC_CHECK_HEADER(sys/audioio.h, have_sun_audio=yes, have_sun_audio=no)
AM_CONDITIONAL(HAVE_SUN_AUDIO,test "$have_sun_audio" = yes)
AC_ARG_ENABLE(sun-audio,
AC_HELP_STRING([--enable-sun-audio],
[Enable sun audio input (default autodetect)]),
enable_sun="$enableval",
enable_sun=yes
)
if test x$enable_sun = xyes; then
AC_CHECK_HEADER(sys/audioio.h, have_sun_audio=yes, have_sun_audio=no)
if test "$have_sun_audio" = yes; then
AC_DEFINE(HAVE_SUN_AUDIO,,[Define to enable sun audio input module])
if test "$have_sun_audio" = yes; then
AC_DEFINE(HAVE_SUN_AUDIO,,[Define to enable sun audio input module])
fi
fi
AM_CONDITIONAL(HAVE_SUN_AUDIO,test "$have_sun_audio" = yes)
dnl Check for ALSA audio
......@@ -96,7 +104,6 @@ dnl don't trick the check
ACX_PTHREAD([
LIBS="$PTHREAD_LIBS $LIBS"
XIPH_CFLAGS="$XIPH_CFLAGS $PTHREAD_CFLAGS"
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
CC="$PTHREAD_CC"
])
......@@ -143,9 +150,13 @@ AM_PATH_VORBIS(, AC_MSG_ERROR(must have Vorbis installed!))
LIBS="$VORBIS_LIBS $VORBISENC_LIBS $LIBS"
XIPH_CFLAGS="$XIPH_CFLAGS $VORBIS_CFLAGS $VORBISENC_CFLAGS"
dnl we expect thread support in libshout
save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
AM_PATH_SHOUT(, AC_MSG_ERROR(must have libshout installed!))
LIBS="$SHOUT_LIBS $LIBS"
XIPH_CFLAGS="$XIPH_CFLAGS $SHOUT_CFLAGS"
CFLAGS=$save_CFLAGS
dnl Make substitutions
......
......@@ -2,44 +2,33 @@
AUTOMAKE_OPTIONS = foreign
if HAVE_OSS
SUBDIRS = log
bin_PROGRAMS = ices
AM_CFLAGS = @XIPH_CFLAGS@
ossheaders = im_oss.h
osssources = im_oss.c
EXTRA_DIST = thread net timing avl
EXTRA_ices_SOURCES = im_oss.c im_sun.c im_alsa.c
if HAVE_OSS
oss = im_oss.c
endif
if HAVE_SUN_AUDIO
sunheaders = im_sun.h
sunsources = im_sun.c
sun = im_sun.c
endif
if HAVE_ALSA
alsaheaders = im_alsa.h
alsasources = im_alsa.c
alsa = im_alsa.c
endif
SUBDIRS = avl thread net log timing
bin_PROGRAMS = ices
AM_CFLAGS = @XIPH_CFLAGS@
noinst_HEADERS = cfgparse.h input.h inputmodule.h im_playlist.h signals.h stream.h reencode.h encode.h playlist_basic.h logging.h im_stdinpcm.h $(ossheaders) $(sunheaders) $(alsaheaders) event.h stream_shared.h metadata.h audio.h resample.h
ices_SOURCES = input.c cfgparse.c stream.c ices.c signals.c im_playlist.c reencode.c encode.c playlist_basic.c im_stdinpcm.c $(osssources) $(sunsources) $(alsasources) stream_shared.c metadata.c playlist_script.c audio.c resample.c
ices_LDADD = net/libicenet.la thread/libicethread.la log/libicelog.la\
avl/libiceavl.la timing/libicetiming.la @ALSA_LIBS@
dist_noinst_HEADERS = cfgparse.h input.h inputmodule.h im_playlist.h signals.h stream.h reencode.h encode.h playlist_basic.h logging.h im_stdinpcm.h event.h stream_shared.h metadata.h audio.h resample.h im_sun.h im_oss.h im_alsa.h
## LIBS = @LIBS@ @SOCKET_LIBS@ @XML_LIBS@ @OGG_LIBS@ @VORBIS_LIBS@\
## @VORBISENC_LIBS@ @SHOUT_LIBS@ @ALSA_LIBS@
ices_SOURCES = input.c cfgparse.c stream.c ices.c signals.c im_playlist.c reencode.c encode.c playlist_basic.c im_stdinpcm.c stream_shared.c metadata.c playlist_script.c audio.c resample.c $(oss) $(sun) $(alsa)
## CFLAGS = @CFLAGS@ @XML_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@ @SHOUT_CFLAGS@
ices_LDADD = log/libicelog.la @ALSA_LIBS@
INCLUDES = -Inet -Ithread -Iavl -Ilog -Itiming $(OSS_CFLAGS) $(SUN_CFLAGS) $(ALSA_CFLAGS)
INCLUDES = -Inet -Ithread -Iavl -Ilog -Itiming
debug:
$(MAKE) all CFLAGS="@DEBUG@"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment