[xiph-commits] r15892 - in icecast/trunk/ices: . src

[karl at svn.xiph.org]

Author: karl
Date: 2009-03-31 18:34:43 -0700 (Tue, 31 Mar 2009)
New Revision: 15892

Modified:
   icecast/trunk/ices/autogen.sh
   icecast/trunk/ices/configure.in
   icecast/trunk/ices/src/input.c
   icecast/trunk/ices/src/metadata.c
Log:
minor build cleanups


Modified: icecast/trunk/ices/autogen.sh
===================================================================
--- icecast/trunk/ices/autogen.sh	2009-04-01 01:16:57 UTC (rev 15891)
+++ icecast/trunk/ices/autogen.sh	2009-04-01 01:34:43 UTC (rev 15892)
@@ -18,7 +18,7 @@
         echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
         DIE=1
 }
-VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9]\).*/\1/"
+VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9]*\).*/\1/"
                                                                                 
 # do we need automake?
 if test -r Makefile.am; then
@@ -79,7 +79,7 @@
 	DIE=1
 }
 
-if test "$DIE" -eq 1; then
+if test $DIE -eq 1; then
         exit 1
 fi
 

Modified: icecast/trunk/ices/configure.in
===================================================================
--- icecast/trunk/ices/configure.in	2009-04-01 01:16:57 UTC (rev 15891)
+++ icecast/trunk/ices/configure.in	2009-04-01 01:34:43 UTC (rev 15892)
@@ -14,12 +14,6 @@
 
 dnl BSD headers break when _XOPEN_SOURCE is defined but without it seems
 dnl to be fine
-case "$host" in
-    *bsd*|*irix*)
-    ;;
-    *) AC_DEFINE(_XOPEN_SOURCE, 600, [Define if you have POSIX and XPG specifications])
-    ;;
-esac
 if test -n "$GCC"; then
     AC_DEFINE(_GNU_SOURCE, ,[Define if you have POSIX and GNU specifications])
     XIPH_VAR_APPEND([XIPH_CPPFLAGS], [-ffast-math -fsigned-char])
@@ -52,7 +46,7 @@
 
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([stropts.h sys/timeb.h])
+AC_CHECK_HEADERS([stropts.h sys/timeb.h sys/select.h])
 
 dnl Check for OSS
 

Modified: icecast/trunk/ices/src/input.c
===================================================================
--- icecast/trunk/ices/src/input.c	2009-04-01 01:16:57 UTC (rev 15891)
+++ icecast/trunk/ices/src/input.c	2009-04-01 01:34:43 UTC (rev 15892)
@@ -19,7 +19,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
-#ifdef HAVE_STDINT_H
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#elif defined(HAVE_STDINT_H)
 # include <stdint.h>
 #endif
 #include <ogg/ogg.h>

Modified: icecast/trunk/ices/src/metadata.c
===================================================================
--- icecast/trunk/ices/src/metadata.c	2009-04-01 01:16:57 UTC (rev 15891)
+++ icecast/trunk/ices/src/metadata.c	2009-04-01 01:34:43 UTC (rev 15892)
@@ -20,6 +20,9 @@
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
 
 #include "cfgparse.h"
 #include "inputmodule.h"