[xiph-cvs] cvs commit: ices configure.in
Karl Heyes
karl at xiph.org
Fri Mar 21 18:28:07 PST 2003
karl 03/03/21 21:28:05
Modified: src audio.c cfgparse.c encode.c ices.c im_alsa.c
im_oss.c im_playlist.c im_stdinpcm.c im_sun.c
input.c metadata.c playlist_basic.c
playlist_script.c reencode.c resample.c signals.c
stream.c stream_shared.c Makefile.am
. configure.in
Log:
updates to configure, it builds the config.h now
Revision Changes Path
1.9 +5 -1 ices/src/audio.c
Index: audio.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/audio.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- audio.c 22 Mar 2003 01:14:35 -0000 1.8
+++ audio.c 22 Mar 2003 02:27:55 -0000 1.9
@@ -2,7 +2,7 @@
* stereo->mono downmixing
* resampling
*
- * $Id: audio.c,v 1.8 2003/03/22 01:14:35 karl Exp $
+ * $Id: audio.c,v 1.9 2003/03/22 02:27:55 karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
*
@@ -11,6 +11,10 @@
* it under the terms of this license. A copy should be included
* with this source.
*/
+
+#ifdef HAVE_CONFIG_H
+ #include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
<p><p>1.2 +5 -1 ices/src/cfgparse.c
Index: cfgparse.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/cfgparse.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cfgparse.c 22 Mar 2003 01:14:35 -0000 1.1
+++ cfgparse.c 22 Mar 2003 02:27:55 -0000 1.2
@@ -1,7 +1,7 @@
/* cfgparse.c
* - cfgparse file reading code, plus default settings.
*
- * $Id: cfgparse.c,v 1.1 2003/03/22 01:14:35 karl Exp $
+ * $Id: cfgparse.c,v 1.2 2003/03/22 02:27:55 karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
*
@@ -10,6 +10,10 @@
* it under the terms of this license. A copy should be included
* with this source.
*/
+
+#ifdef HAVE_CONFIG_H
+ #include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
<p><p>1.16 +5 -1 ices/src/encode.c
Index: encode.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/encode.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- encode.c 22 Mar 2003 01:14:35 -0000 1.15
+++ encode.c 22 Mar 2003 02:27:55 -0000 1.16
@@ -1,7 +1,7 @@
/* encode.c
* - runtime encoding of PCM data.
*
- * $Id: encode.c,v 1.15 2003/03/22 01:14:35 karl Exp $
+ * $Id: encode.c,v 1.16 2003/03/22 02:27:55 karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
*
@@ -10,6 +10,10 @@
* it under the terms of this license. A copy should be included
* with this source.
*/
+
+#ifdef HAVE_CONFIG_H
+ #include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
<p><p>1.8 +5 -1 ices/src/ices.c
Index: ices.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/ices.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ices.c 22 Mar 2003 01:14:35 -0000 1.7
+++ ices.c 22 Mar 2003 02:27:55 -0000 1.8
@@ -1,7 +1,7 @@
/* ices.c
* - Main startup, thread launching, and cleanup code.
*
- * $Id: ices.c,v 1.7 2003/03/22 01:14:35 karl Exp $
+ * $Id: ices.c,v 1.8 2003/03/22 02:27:55 karl Exp $
*
* Copyright (c) 2001-2002 Michael Smith <msmith at labyrinth.net.au>
*
@@ -10,6 +10,10 @@
* it under the terms of this license. A copy should be included
* with this source.
*/
+
+#ifdef HAVE_CONFIG_H
+ #include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
<p><p>1.4 +5 -1 ices/src/im_alsa.c
Index: im_alsa.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/im_alsa.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- im_alsa.c 22 Mar 2003 01:14:35 -0000 1.3
+++ im_alsa.c 22 Mar 2003 02:27:55 -0000 1.4
@@ -1,7 +1,7 @@
/* im_alsa.c
* - Raw PCM input from ALSA devices
*
- * $Id: im_alsa.c,v 1.3 2003/03/22 01:14:35 karl Exp $
+ * $Id: im_alsa.c,v 1.4 2003/03/22 02:27:55 karl Exp $
*
* by Jason Chu <jchu at uvic.ca>, based
* on im_oss.c which is...
@@ -12,6 +12,10 @@
* it under the terms of this license. A copy should be included
* with this source.
*/
+
+#ifdef HAVE_CONFIG_H
+ #include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
<p><p>1.12 +5 -1 ices/src/im_oss.c
Index: im_oss.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/im_oss.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- im_oss.c 22 Mar 2003 01:14:35 -0000 1.11
+++ im_oss.c 22 Mar 2003 02:27:55 -0000 1.12
@@ -1,7 +1,7 @@
/* im_oss.c
* - Raw PCM input from OSS devices
*
- * $Id: im_oss.c,v 1.11 2003/03/22 01:14:35 karl Exp $
+ * $Id: im_oss.c,v 1.12 2003/03/22 02:27:55 karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
*
@@ -10,6 +10,10 @@
* it under the terms of this license. A copy should be included
* with this source.
*/
+
+#ifdef HAVE_CONFIG_H
+ #include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
<p><p>1.10 +5 -1 ices/src/im_playlist.c
Index: im_playlist.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/im_playlist.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- im_playlist.c 22 Mar 2003 01:14:35 -0000 1.9
+++ im_playlist.c 22 Mar 2003 02:27:55 -0000 1.10
@@ -1,7 +1,7 @@
/* playlist.c
* - Basic playlist functionality
*
- * $Id: im_playlist.c,v 1.9 2003/03/22 01:14:35 karl Exp $
+ * $Id: im_playlist.c,v 1.10 2003/03/22 02:27:55 karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
*
@@ -10,6 +10,10 @@
* it under the terms of this license. A copy should be included
* with this source.
*/
+
+#ifdef HAVE_CONFIG_H
+ #include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
<p><p>1.7 +5 -1 ices/src/im_stdinpcm.c
Index: im_stdinpcm.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/im_stdinpcm.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- im_stdinpcm.c 22 Mar 2003 01:14:35 -0000 1.6
+++ im_stdinpcm.c 22 Mar 2003 02:27:55 -0000 1.7
@@ -1,7 +1,7 @@
/* im_stdinpcm.c
* - Raw PCM input from stdin
*
- * $Id: im_stdinpcm.c,v 1.6 2003/03/22 01:14:35 karl Exp $
+ * $Id: im_stdinpcm.c,v 1.7 2003/03/22 02:27:55 karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
*
@@ -10,6 +10,10 @@
* it under the terms of this license. A copy should be included
* with this source.
*/
+
+#ifdef HAVE_CONFIG_H
+ #include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
<p><p>1.10 +5 -1 ices/src/im_sun.c
Index: im_sun.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/im_sun.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- im_sun.c 22 Mar 2003 01:14:35 -0000 1.9
+++ im_sun.c 22 Mar 2003 02:27:55 -0000 1.10
@@ -1,7 +1,7 @@
/* im_sun.c
* - Raw PCM input from Solaris audio devices
*
- * $Id: im_sun.c,v 1.9 2003/03/22 01:14:35 karl Exp $
+ * $Id: im_sun.c,v 1.10 2003/03/22 02:27:55 karl Exp $
*
* by Ciaran Anscomb <ciarana at rd.bbc.co.uk>, based
* on im_oss.c which is...
@@ -12,6 +12,10 @@
* it under the terms of this license. A copy should be included
* with this source.
*/
+
+#ifdef HAVE_CONFIG_H
+ #include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
<p><p>1.27 +5 -1 ices/src/input.c
Index: input.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/input.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- input.c 22 Mar 2003 01:14:35 -0000 1.26
+++ input.c 22 Mar 2003 02:27:55 -0000 1.27
@@ -2,7 +2,7 @@
* - Main producer control loop. Fetches data from input modules, and controls
* submission of these to the instance threads. Timing control happens here.
*
- * $Id: input.c,v 1.26 2003/03/22 01:14:35 karl Exp $
+ * $Id: input.c,v 1.27 2003/03/22 02:27:55 karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
*
@@ -11,6 +11,10 @@
* it under the terms of this license. A copy should be included
* with this source.
*/
+
+#ifdef HAVE_CONFIG_H
+ #include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
<p><p>1.11 +5 -1 ices/src/metadata.c
Index: metadata.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/metadata.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- metadata.c 22 Mar 2003 01:14:35 -0000 1.10
+++ metadata.c 22 Mar 2003 02:27:55 -0000 1.11
@@ -1,7 +1,7 @@
/* metadata.c
* - Metadata manipulation
*
- * $Id: metadata.c,v 1.10 2003/03/22 01:14:35 karl Exp $
+ * $Id: metadata.c,v 1.11 2003/03/22 02:27:55 karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
*
@@ -10,6 +10,10 @@
* it under the terms of this license. A copy should be included
* with this source.
*/
+
+#ifdef HAVE_CONFIG_H
+ #include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
<p><p>1.10 +5 -1 ices/src/playlist_basic.c
Index: playlist_basic.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/playlist_basic.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- playlist_basic.c 22 Mar 2003 01:14:35 -0000 1.9
+++ playlist_basic.c 22 Mar 2003 02:27:55 -0000 1.10
@@ -1,7 +1,7 @@
/* playlist_basic.c
* - Simple built-in unscripted playlist
*
- * $Id: playlist_basic.c,v 1.9 2003/03/22 01:14:35 karl Exp $
+ * $Id: playlist_basic.c,v 1.10 2003/03/22 02:27:55 karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
*
@@ -10,6 +10,10 @@
* it under the terms of this license. A copy should be included
* with this source.
*/
+
+#ifdef HAVE_CONFIG_H
+ #include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
<p><p>1.6 +5 -1 ices/src/playlist_script.c
Index: playlist_script.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/playlist_script.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- playlist_script.c 22 Mar 2003 01:14:35 -0000 1.5
+++ playlist_script.c 22 Mar 2003 02:27:55 -0000 1.6
@@ -2,7 +2,7 @@
* - Gets a filename to play back based on output from a program/shell script
* run each time.
*
- * $Id: playlist_script.c,v 1.5 2003/03/22 01:14:35 karl Exp $
+ * $Id: playlist_script.c,v 1.6 2003/03/22 02:27:55 karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
*
@@ -11,6 +11,10 @@
* it under the terms of this license. A copy should be included
* with this source.
*/
+
+#ifdef HAVE_CONFIG_H
+ #include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
<p><p>1.9 +5 -1 ices/src/reencode.c
Index: reencode.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/reencode.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- reencode.c 22 Mar 2003 01:14:35 -0000 1.8
+++ reencode.c 22 Mar 2003 02:27:55 -0000 1.9
@@ -1,7 +1,7 @@
/* reencode.c
* - runtime reencoding of vorbis audio (usually to lower bitrates).
*
- * $Id: reencode.c,v 1.8 2003/03/22 01:14:35 karl Exp $
+ * $Id: reencode.c,v 1.9 2003/03/22 02:27:55 karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
*
@@ -10,6 +10,10 @@
* it under the terms of this license. A copy should be included
* with this source.
*/
+
+#ifdef HAVE_CONFIG_H
+ #include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
<p><p>1.4 +4 -0 ices/src/resample.c
Index: resample.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/resample.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- resample.c 16 Mar 2003 14:21:49 -0000 1.3
+++ resample.c 22 Mar 2003 02:27:55 -0000 1.4
@@ -1,5 +1,9 @@
/* resample.c: see resample.h for interesting stuff */
+#ifdef HAVE_CONFIG_H
+ #include <config.h>
+#endif
+
#include <math.h>
#include <stdlib.h>
#include <string.h>
<p><p>1.7 +5 -1 ices/src/signals.c
Index: signals.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/signals.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- signals.c 22 Mar 2003 01:14:35 -0000 1.6
+++ signals.c 22 Mar 2003 02:27:55 -0000 1.7
@@ -1,7 +1,7 @@
/* signals.c
* - signal handling/setup
*
- * $Id: signals.c,v 1.6 2003/03/22 01:14:35 karl Exp $
+ * $Id: signals.c,v 1.7 2003/03/22 02:27:55 karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
*
@@ -10,6 +10,10 @@
* it under the terms of this license. A copy should be included
* with this source.
*/
+
+#ifdef HAVE_CONFIG_H
+ #include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
<p><p>1.27 +5 -1 ices/src/stream.c
Index: stream.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/stream.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- stream.c 22 Mar 2003 01:14:35 -0000 1.26
+++ stream.c 22 Mar 2003 02:27:55 -0000 1.27
@@ -1,7 +1,7 @@
/* stream.c
* - Core streaming functions/main loop.
*
- * $Id: stream.c,v 1.26 2003/03/22 01:14:35 karl Exp $
+ * $Id: stream.c,v 1.27 2003/03/22 02:27:55 karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
*
@@ -10,6 +10,10 @@
* it under the terms of this license. A copy should be included
* with this source.
*/
+
+#ifdef HAVE_CONFIG_H
+ #include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
<p><p>1.15 +5 -1 ices/src/stream_shared.c
Index: stream_shared.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/stream_shared.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- stream_shared.c 22 Mar 2003 01:14:35 -0000 1.14
+++ stream_shared.c 22 Mar 2003 02:27:55 -0000 1.15
@@ -1,7 +1,7 @@
/* stream_shared.c
* - Stream utility functions.
*
- * $Id: stream_shared.c,v 1.14 2003/03/22 01:14:35 karl Exp $
+ * $Id: stream_shared.c,v 1.15 2003/03/22 02:27:55 karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
*
@@ -10,6 +10,10 @@
* it under the terms of this license. A copy should be included
* with this source.
*/
+
+#ifdef HAVE_CONFIG_H
+ #include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
<p><p>1.14 +1 -1 ices/src/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ices/src/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile.am 22 Mar 2003 01:18:29 -0000 1.13
+++ Makefile.am 22 Mar 2003 02:27:55 -0000 1.14
@@ -29,7 +29,7 @@
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 stream_rewrite.c playlist_script.c audio.c resample.c
+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@
<p><p>1.19 +53 -45 ices/configure.in
Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/ices/configure.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- configure.in 18 Mar 2003 01:40:40 -0000 1.18
+++ configure.in 22 Mar 2003 02:28:04 -0000 1.19
@@ -1,36 +1,36 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(src/ices.c)
+AC_INIT([IceS], 2.0-Beta2, [icecast at xiph.org])
AC_PREREQ(2.52)
+AC_CONFIG_SRCDIR(src/ices.c)
-AM_INIT_AUTOMAKE(ices,2.0)
+AM_INIT_AUTOMAKE(dist-bzip2)
+AM_CONFIG_HEADER(config.h)
AC_PROG_CC
AM_PROG_LIBTOOL
dnl Set some options based on environment
-SOCKET_LIBS=
-
AC_DEFINE(_XOPEN_SOURCE, 500, [Define if you have POSIX and XPG specifications])
-if test -z "$GCC"; then
- case $host in
- *-*-irix*)
- DEBUG="-g -signed -D_REENTRANT"
- XIPH_CFLAGS="-O2 -w -signed -D_REENTRANT"
- PROFILE="-p -g3 -O2 -signed -D_REENTRANT"
- ;;
- *-*-solaris*)
- DEBUG="-v -g -D_REENTRANT"
- XIPH_CFLAGS="-xO4 -fast -w -fsimple -native -xcg92 -D_REENTRANT"
- PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc -D_REENTRANT"
- ;;
- *)
- DEBUG="-g -D_REENTRANT"
- XIPH_CFLAGS="-O -D_REENTRANT"
- PROFILE="-g -p -D_REENTRANT"
- ;;
- esac
-else
+case $host in
+*-*-irix*)
+ DEBUG="-g -signed -D_REENTRANT"
+ XIPH_CFLAGS="-O2 -w -signed -D_REENTRANT"
+ PROFILE="-p -g3 -O2 -signed -D_REENTRANT"
+;;
+*-*-solaris*)
+ AC_DEFINE(__EXTENSIONS__, 1, [define to 1 for IPv6 functions on solaris])
+ DEBUG="-v -g -D_REENTRANT"
+ XIPH_CFLAGS="-xO4 -fast -w -fsimple -native -xcg92 -D_REENTRANT"
+ PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc -D_REENTRANT"
+;;
+*)
+ DEBUG="-g -D_REENTRANT"
+ XIPH_CFLAGS="-O -D_REENTRANT"
+ PROFILE="-g -p -D_REENTRANT"
+;;
+esac
+if test -n "$GCC"; then
AC_DEFINE(_GNU_SOURCE, ,[Define if you have POSIX and GNU specifications])
XIPH_CFLAGS="-ffast-math -fsigned-char"
DEBUG="-g"
@@ -44,17 +44,13 @@
dnl Checks for header files.
AC_HEADER_STDC
-AC_CHECK_HEADER(stdint.h, AC_DEFINE(HAVE_STDINT_H, 1),,)
-
dnl Check for OSS
AC_CHECK_HEADER(sys/soundcard.h, have_oss=yes, have_oss=no)
AC_CHECK_HEADER(machine/soundcard.h, have_oss=yes, )
AM_CONDITIONAL(HAVE_OSS,test "$have_oss" = yes)
-
-
if test "$have_oss" = yes; then
- OSS_CFLAGS="-DHAVE_OSS"
+ AC_DEFINE(HAVE_OSS,,[Define to enable OSS input module])
fi
dnl Check for Sun audio
@@ -63,7 +59,7 @@
AM_CONDITIONAL(HAVE_SUN_AUDIO,test "$have_sun_audio" = yes)
if test "$have_sun_audio" = yes; then
- SUN_CFLAGS="-DHAVE_SUN_AUDIO"
+ AC_DEFINE(HAVE_SUN_AUDIO,,[Define to enable sun audio input module])
fi
dnl Check for ALSA audio
@@ -72,19 +68,40 @@
AM_CONDITIONAL(HAVE_ALSA,test "$have_alsa" = yes)
if test "$have_alsa" = yes; then
- ALSA_CFLAGS="-DHAVE_ALSA"
ALSA_LIBS="-lasound"
+ AC_DEFINE(HAVE_ALSA, ,[Define to enable ALSA input module])
fi
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
+AC_CHECK_TYPES([socklen_t],,,[
+#include <sys/types.h>
+#include <sys/socket.h>
+])
+AH_BOTTOM([
+#ifndef HAVE_SOCKLEN_T
+ typedef int socklen_t
+#endif
+])
+
+dnl needs to be checked early on, so that additional libraries
+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"
+])
dnl Check for types
+AC_CHECK_TYPES([uint64_t],,AC_ERROR([could not find a uint64_t type]))
dnl Checks for library functions.
AC_CHECK_LIB(nsl, gethostbyname, LIBS="-lnsl $LIBS",)
AC_CHECK_LIB(socket, socket, LIBS="-lsocket $LIBS",)
+AC_CHECK_LIB(rt, nanosleep, LIBS="-lrt $LIBS",)
+AC_CHECK_LIB(resolv, res_query, LIBS="-lresolv $LIBS",)
dnl -- configure options --
@@ -104,7 +121,7 @@
then
XML_LIBS="`$XMLCONFIG --libs`"
XML_CFLAGS="`$XMLCONFIG --cflags`"
- LIBS="$LIBS $XML_LIBS"
+ LIBS="$XML_LIBS $LIBS"
XIPH_CFLAGS="$XIPH_CFLAGS $XML_CFLAGS"
AC_CHECK_FUNC(xmlParseFile,, [AC_MSG_ERROR([There was a problem linking with libxml])])
else
@@ -112,30 +129,21 @@
fi
AM_PATH_OGG(, AC_MSG_ERROR(must have Ogg installed!))
-LIBS="$LIBS $OGG_LIBS"
+LIBS="$OGG_LIBS $LIBS"
XIPH_CFLAGS="$XIPH_CFLAGS $OGG_CFLAGS"
AM_PATH_VORBIS(, AC_MSG_ERROR(must have Vorbis installed!))
-LIBS="$LIBS $VORBIS_LIBS $VORBISENC_LIBS"
+LIBS="$VORBIS_LIBS $VORBISENC_LIBS $LIBS"
XIPH_CFLAGS="$XIPH_CFLAGS $VORBIS_CFLAGS $VORBISENC_CFLAGS"
-ACX_PTHREAD([
- LIBS="$LIBS $PTHREAD_LIBS"
- XIPH_CFLAGS="$XIPH_CFLAGS $PTHREAD_CFLAGS"
- CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- CC="$PTHREAD_CC"
-])
AM_PATH_SHOUT(, AC_MSG_ERROR(must have libshout installed!))
-LIBS="$LIBS $SHOUT_LIBS"
+LIBS="$SHOUT_LIBS $LIBS"
XIPH_CFLAGS="$XIPH_CFLAGS $SHOUT_CFLAGS"
dnl Make substitutions
-AC_SUBST(OSS_CFLAGS)
-AC_SUBST(SUN_CFLAGS)
-AC_SUBST(ALSA_CFLAGS)
+AC_SUBST(ICES_EXTRA_OBJS)
AC_SUBST(ALSA_LIBS)
-AC_SUBST(SOCKET_LIBS)
AC_SUBST(XML_LIBS)
AC_SUBST(SHOUT_LIBS)
AC_SUBST(OGG_CFLAGS)
@@ -146,8 +154,8 @@
AC_SUBST(OPT)
AC_SUBST(LIBS)
AC_SUBST(DEBUG)
-dnl AC_SUBST(CFLAGS)
AC_SUBST(PROFILE)
AC_SUBST(XIPH_CFLAGS)
+AC_SUBST(PTHREAD_CFLAGS)
AC_OUTPUT(Makefile conf/Makefile src/Makefile src/avl/Makefile src/thread/Makefile src/net/Makefile src/log/Makefile src/timing/Makefile)
<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.
More information about the commits
mailing list