[xiph-cvs] cvs commit: ices/src Makefile.am

[Karl Heyes]

karl        03/03/26 17:40:10

  Modified:    .        configure.in
               src      Makefile.am
  Log:
  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.

Revision  Changes    Path
1.21      +16 -5     ices/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/ices/configure.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- configure.in	26 Mar 2003 12:19:16 -0000	1.20
+++ configure.in	26 Mar 2003 22:40:10 -0000	1.21
@@ -62,12 +62,20 @@
 
 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 @@
 ACX_PTHREAD([
      LIBS="$PTHREAD_LIBS $LIBS"
      XIPH_CFLAGS="$XIPH_CFLAGS $PTHREAD_CFLAGS"
-     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
      CC="$PTHREAD_CC"
 ])
 
@@ -143,9 +150,13 @@
 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
 

<p><p>1.15      +14 -25    ices/src/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ices/src/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile.am	22 Mar 2003 02:27:55 -0000	1.14
+++ Makefile.am	26 Mar 2003 22:40:10 -0000	1.15
@@ -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@"

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.