[xiph-commits] r7012 - icecast/branches/kh/m4
brendan at dactyl.lonelymoon.com
brendan
Mon Jul 5 23:35:44 PDT 2004
Author: brendan
Date: Mon Jul 5 23:35:44 2004
New Revision: 7012
Modified:
icecast/branches/kh/m4/ogg.m4
icecast/branches/kh/m4/shout.m4
icecast/branches/kh/m4/theora.m4
icecast/branches/kh/m4/vorbis.m4
icecast/branches/kh/m4/xiph_compiler.m4
icecast/branches/kh/m4/xiph_types.m4
Log:
Reimport of KH branch.
Modified: icecast/branches/kh/m4/ogg.m4
===================================================================
--- icecast/branches/kh/m4/ogg.m4 2004-07-06 06:24:02 UTC (rev 7011)
+++ icecast/branches/kh/m4/ogg.m4 2004-07-06 06:34:58 UTC (rev 7012)
@@ -6,7 +6,7 @@
dnl XIPH_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl Test for libogg, and define OGG_CFLAGS OGG_LDFLAGS and OGG_LIBS
dnl
-AC_DEFUN([XIPH_PATH_OGG],
+AC_DEFUN(XIPH_PATH_OGG,
[dnl
AC_ARG_VAR([OGG_PREFIX],[path to ogg installation])
AC_ARG_WITH(ogg,
Modified: icecast/branches/kh/m4/shout.m4
===================================================================
--- icecast/branches/kh/m4/shout.m4 2004-07-06 06:24:02 UTC (rev 7011)
+++ icecast/branches/kh/m4/shout.m4 2004-07-06 06:34:58 UTC (rev 7012)
@@ -3,15 +3,15 @@
dnl Rewritten for libshout 2
dnl Brendan Cully <brendan at xiph.org> 20030612
dnl
-dnl $Id: shout.m4,v 1.12 2003/07/11 01:26:31 brendan Exp $
+dnl $Id: shout.m4,v 1.11 2003/07/01 18:02:19 brendan Exp $
# XIPH_PATH_SHOUT([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
# Test for libshout, and define SHOUT_CPPFLAGS SHOUT_CFLAGS SHOUT_LIBS, and
-# SHOUT_THREADSAFE
+# SHOUT_THREADED
AC_DEFUN([XIPH_PATH_SHOUT],
[dnl
xt_have_shout="no"
-SHOUT_THREADSAFE="no"
+SHOUT_THREADED="no"
SHOUT_CPPFLAGS=""
SHOUT_CFLAGS=""
SHOUT_LIBS=""
@@ -61,11 +61,7 @@
ifelse([$1], , :, [$1])
xt_have_shout="yes"
])
- AC_EGREP_CPP([yes], [#include <shout/shout.h>
-#if SHOUT_THREADSAFE
-yes
-#endif
-], [SHOUT_THREADSAFE="yes"])
+ AC_CHECK_FUNC([thread_initialize], [SHOUT_THREADED="yes"])
])
CPPFLAGS="$ac_save_CPPFLAGS"
CFLAGS="$ac_save_CFLAGS"
Modified: icecast/branches/kh/m4/theora.m4
===================================================================
--- icecast/branches/kh/m4/theora.m4 2004-07-06 06:24:02 UTC (rev 7011)
+++ icecast/branches/kh/m4/theora.m4 2004-07-06 06:34:58 UTC (rev 7012)
@@ -1,8 +1,10 @@
# Configure paths for libtheora
-# Karl Heyes 02-Feb-2004
+# Jack Moffitt <jack at icecast.org> 10-21-2000
+# updated by Karl Heyes 02-Feb-2004
dnl XIPH_PATH_THEORA([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl Test for libtheora, and define THEORA_CFLAGS THEORA_LIBS
+dnl THEORA_THEORAENC_LIBS THEORA_THEORAFILE_LIBS THEORA_LDFLAGS
dnl
AC_DEFUN([XIPH_PATH_THEORA],
Modified: icecast/branches/kh/m4/vorbis.m4
===================================================================
--- icecast/branches/kh/m4/vorbis.m4 2004-07-06 06:24:02 UTC (rev 7011)
+++ icecast/branches/kh/m4/vorbis.m4 2004-07-06 06:34:58 UTC (rev 7012)
@@ -47,9 +47,9 @@
LDFLAGS="$LDFLAGS $VORBIS_LDFLAGS"
LIBS="$LIBS $VORBIS_LIBS"
AC_MSG_CHECKING([for libvorbis])
-AC_TRY_LINK_FUNC(vorbis_info_init, [AC_MSG_RESULT([ok])],
+AC_TRY_LINK_FUNC(ogg_stream_init, [AC_MSG_RESULT([ok])],
[LIBS="$LIBS $OGG_LIBS -lm"
- AC_TRY_LINK_FUNC(vorbis_info_init,
+ AC_TRY_LINK_FUNC(ogg_stream_init,
[AC_MSG_RESULT([found, adding extra libs])
VORBIS_LIBS="$VORBIS_LIBS $OGG_LIBS -lm"],
[ifelse([$2], , AC_MSG_ERROR([Unable to link to libvorbis]), [$2])
Modified: icecast/branches/kh/m4/xiph_compiler.m4
===================================================================
--- icecast/branches/kh/m4/xiph_compiler.m4 2004-07-06 06:24:02 UTC (rev 7011)
+++ icecast/branches/kh/m4/xiph_compiler.m4 2004-07-06 06:34:58 UTC (rev 7012)
@@ -1,5 +1,5 @@
dnl xiph_compiler.m4
-dnl $Id: xiph_compiler.m4,v 1.5 2003/07/17 09:23:44 karl Exp $
+dnl $Id: xiph_compiler.m4,v 1.4 2003/06/26 16:03:37 brendan Exp $
dnl XIPH_FUNC_VA_COPY
dnl Karl Heyes
@@ -32,12 +32,15 @@
# Define __attribute__ to be empty if the compiler does not support it
AC_DEFUN([XIPH_C_ATTRIBUTE],
[dnl
-AC_TRY_COMPILE([int func(void) __attribute__((unused));],
- [int x __attribute__ ((unused));],,[dnl
- AC_DEFINE([__attribute__(x)],, [Define to empty if __attribute__ is not supported])
+# check for __attribute__
+AC_TRY_COMPILE([int func(void) __attribute__((unused));],[int x __attribute__ ((unused));],,
+??? [ AH_TEMPLATE([__attribute__], [Compile away if __attribute__ keyword is not supported])
+??? AC_DEFINE([__attribute__(x)],[/**/])
+??? ])
])
])dnl XIPH_C_ATTRIBUTE
+
dnl XIPH_GCC_WARNING
dnl Karl Heyes
dnl
Modified: icecast/branches/kh/m4/xiph_types.m4
===================================================================
--- icecast/branches/kh/m4/xiph_types.m4 2004-07-06 06:24:02 UTC (rev 7011)
+++ icecast/branches/kh/m4/xiph_types.m4 2004-07-06 06:34:58 UTC (rev 7012)
@@ -36,24 +36,26 @@
])
dnl XIPH_TYPE_SOCKLEN_T
-dnl Brendan Cully
+dnl Karl Heyes
dnl
# XIPH_TYPE_SOCKLEN_T
# Check for socklen_t, or define as int if missing
AC_DEFUN([XIPH_TYPE_SOCKLEN_T],
[dnl
AC_CHECK_HEADERS([sys/socket.h])
-AC_CHECK_TYPES([socklen_t],,,
- [#if HAVE_SYS_TYPES_H
+AH_VERBATIM([HAVE_SOCKLEN_T],
+[/* define if you have the socklen_t type */
+#undef HAVE_SOCKLEN_T
+
+#ifndef HAVE_SOCKLEN_T
+ typedef int socklen_t;
+ #define HAVE_SOCKLEN_T
+#endif])
+AC_TRY_COMPILE([
+#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
-#if HAVE_SYS_SOCKET_H
+#ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
-#endif
- ])
-AH_VERBATIM([X_HAVE_SOCKLEN_T],
- [#ifndef HAVE_SOCKLEN_T
-typedef int socklen_t;
-#endif
- ])
+#endif], [socklen_t s = 0;], [AC_DEFINE([HAVE_SOCKLEN_T])])
])
More information about the commits
mailing list