Epic Git migration commit

Added .gitignore and submodules
Changed paths to match new location of things

.gitignore

+src/icecast
+src/.deps
+src/.libs
+config.h
+conf/*.dist
+*.o
+.DS_Store
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+compile
+config.cache
+config.guess
+config.sub
+config.h.in
+config.log
+config.status
+configure
+depcomp
+install-sh
+libtool
+ltconfig
+ltmain.sh
+missing
+mkinstalldirs
+*.tar.gz

.gitmodules

+[submodule "m4"]
+	path = m4
+	url = https://git.xiph.org/icecast/m4.git
+[submodule "src/common"]
+	path = src/common
+	url = https://git.xiph.org/icecast/common.git

configure.in

@@ -158,9 +158,9 @@ AC_SUBST(ICECAST_OPTIONAL)
 AC_SUBST(HAVE_KATE)
 AC_SUBST(KATE_LIBS)
 
-AC_OUTPUT([Makefile conf/Makefile src/Makefile src/avl/Makefile
-src/httpp/Makefile src/thread/Makefile src/log/Makefile
-src/net/Makefile src/timing/Makefile doc/Makefile doc/img/Makefile
+AC_OUTPUT([Makefile conf/Makefile src/Makefile src/common/avl/Makefile
+src/common/httpp/Makefile src/common/thread/Makefile src/common/log/Makefile
+src/common/net/Makefile src/common/timing/Makefile doc/Makefile doc/img/Makefile
 doc/assets/Makefile doc/assets/css/Makefile doc/assets/font/Makefile 
 doc/assets/img/Makefile web/Makefile admin/Makefile win32/Makefile 
 win32/res/Makefile examples/Makefile])

m4 @ 06ff01f6

+Subproject commit 06ff01f6acf3b644061eecdb5509cb899048e70c

m4/acx_pthread.m4

-dnl Available from the GNU Autoconf Macro Archive at:
-dnl http://www.gnu.org/software/ac-archive/htmldoc/acx_pthread.html
-dnl
-AC_DEFUN([ACX_PTHREAD], [
-AC_REQUIRE([AC_CANONICAL_HOST])
-AC_LANG_SAVE
-AC_LANG_C
-acx_pthread_ok=no
-
-# We used to check for pthread.h first, but this fails if pthread.h
-# requires special compiler flags (e.g. on True64 or Sequent).
-# It gets checked for in the link test anyway.
-
-# First of all, check if the user has set any of the PTHREAD_LIBS,
-# etcetera environment variables, and if threads linking works using
-# them:
-if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
-        save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        save_LIBS="$LIBS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
-        AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes)
-        AC_MSG_RESULT($acx_pthread_ok)
-        if test x"$acx_pthread_ok" = xno; then
-                PTHREAD_LIBS=""
-                PTHREAD_CFLAGS=""
-        fi
-        LIBS="$save_LIBS"
-        CFLAGS="$save_CFLAGS"
-fi
-
-# We must check for the threads library under a number of different
-# names; the ordering is very important because some systems
-# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
-# libraries is broken (non-POSIX).
-
-# Create a list of thread flags to try.  Items starting with a "-" are
-# C compiler flags, and other items are library names, except for "none"
-# which indicates that we try without any flags at all, and "pthread-config"
-# which is a program returning the flags for the Pth emulation library.
-
-acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-
-# The ordering *is* (sometimes) important.  Some notes on the
-# individual items follow:
-
-# pthreads: AIX (must check this before -lpthread)
-# none: in case threads are in libc; should be tried before -Kthread and
-#       other compiler flags to prevent continual compiler warnings
-# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
-# -pthreads: Solaris/gcc
-# -mthreads: Mingw32/gcc, Lynx/gcc
-# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
-#      doesn't hurt to check since this sometimes defines pthreads too;
-#      also defines -D_REENTRANT)
-#      ... -mt is also the pthreads flag for HP/aCC
-# pthread: Linux, etcetera
-# --thread-safe: KAI C++
-# pthread-config: use pthread-config program (for GNU Pth library)
-
-case "${host_cpu}-${host_os}" in
-        *solaris*)
-
-        # On Solaris (at least, for some versions), libc contains stubbed
-        # (non-functional) versions of the pthreads routines, so link-based
-        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
-        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
-        # a function called by this macro, so we could check for that, but
-        # who knows whether they'll stub that too in a future libc.)  So,
-        # we'll just look for -pthreads and -lpthread first:
-
-        acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags"
-        ;;
-esac
-
-if test x"$acx_pthread_ok" = xno; then
-for flag in $acx_pthread_flags; do
-
-        case $flag in
-                none)
-                AC_MSG_CHECKING([whether pthreads work without any flags])
-                ;;
-
-                -*)
-                AC_MSG_CHECKING([whether pthreads work with $flag])
-                PTHREAD_CFLAGS="$flag"
-                ;;
-
-                pthread-config)
-                AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no)
-                if test x"$acx_pthread_config" = xno; then continue; fi
-                PTHREAD_CFLAGS="`pthread-config --cflags`"
-                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-                ;;
-
-                *)
-                AC_MSG_CHECKING([for the pthreads library -l$flag])
-                PTHREAD_LIBS="-l$flag"
-                ;;
-        esac
-
-        save_LIBS="$LIBS"
-        save_CFLAGS="$CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-
-        # Check for various functions.  We must include pthread.h,
-        # since some functions may be macros.  (On the Sequent, we
-        # need a special flag -Kthread to make this header compile.)
-        # We check for pthread_join because it is in -lpthread on IRIX
-        # while pthread_create is in libc.  We check for pthread_attr_init
-        # due to DEC craziness with -lpthreads.  We check for
-        # pthread_cleanup_push because it is one of the few pthread
-        # functions on Solaris that doesn't have a non-functional libc stub.
-        # We try pthread_create on general principles.
-        AC_TRY_LINK([#include <pthread.h>],
-                    [pthread_t th; pthread_join(th, 0);
-                     pthread_attr_init(0); pthread_cleanup_push(0, 0);
-                     pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
-                    [acx_pthread_ok=yes])
-
-        LIBS="$save_LIBS"
-        CFLAGS="$save_CFLAGS"
-
-        AC_MSG_RESULT($acx_pthread_ok)
-        if test "x$acx_pthread_ok" = xyes; then
-                break;
-        fi
-
-        PTHREAD_LIBS=""
-        PTHREAD_CFLAGS=""
-done
-fi
-
-# Various other checks:
-if test "x$acx_pthread_ok" = xyes; then
-        save_LIBS="$LIBS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-
-        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-        AC_MSG_CHECKING([for joinable pthread attribute])
-        attr_name=unknown
-        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-            AC_TRY_LINK([#include <pthread.h>], [int attr=$attr; return attr;],
-                        [attr_name=$attr; break])
-        done
-        AC_MSG_RESULT($attr_name)
-        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
-            AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
-                               [Define to necessary symbol if this constant
-                                uses a non-standard name on your system.])
-        fi
-
-        AC_MSG_CHECKING([if more special flags are required for pthreads])
-        flag=no
-        case "${host_cpu}-${host_os}" in
-            *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
-            *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
-        esac
-        AC_MSG_RESULT(${flag})
-        if test "x$flag" != xno; then
-            PTHREAD_CPPFLAGS="$flag $PTHREAD_CPPFLAGS"
-        fi
-
-        AC_CHECK_FUNCS([pthread_spin_lock])
-        LIBS="$save_LIBS"
-        CFLAGS="$save_CFLAGS"
-
-        # More AIX lossage: must compile with xlc_r or cc_r
-        if test x"$GCC" != xyes; then
-          AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC})
-        else
-          PTHREAD_CC=$CC
-        fi
-else
-        PTHREAD_CC="$CC"
-fi
-
-AC_SUBST(PTHREAD_LIBS)
-AC_SUBST(PTHREAD_CFLAGS)
-AC_SUBST(PTHREAD_CPPFLAGS)
-AC_SUBST(PTHREAD_CC)
-
-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-if test x"$acx_pthread_ok" = xyes; then
-        ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
-        :
-else
-        acx_pthread_ok=no
-        $2
-fi
-AC_LANG_RESTORE
-])dnl ACX_PTHREAD

m4/ogg.m4

-# Configure paths for libogg
-# updated by Karl Heyes 10-Jun-2003
-# Jack Moffitt <jack@icecast.org> 10-21-2000
-# Shamelessly stolen from Owen Taylor and Manish Singh
-
-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],
-[dnl 
-AC_ARG_VAR([OGG_PREFIX],[path to ogg installation])
-AC_ARG_WITH(ogg,
-    [AC_HELP_STRING([--with-ogg=PREFIX],
-        [Prefix where libogg is installed (optional)])],
-    ogg_prefix="$withval",
-    ogg_prefix="$OGG_PREFIX"
-    )
-if test "x$ogg_prefix" = "x" -o "x$ogg_prefix" = "xyes"; then
-    if test "x$prefix" = "xNONE"; then
-        ogg_prefix=/usr/local
-    else
-        ogg_prefix="$prefix"
-    fi
-fi
-
-XIPH_GCC_WARNING([-I$ogg_prefix/include],,
-    [ OGG_CFLAGS="-I$ogg_prefix/include"
-      OGG_LDFLAGS="-L$ogg_prefix/lib"
-      ])
-AC_CACHE_CHECK([for libogg], xt_cv_lib_ogg,
-[dnl
-OGG_LIBS="-logg"
-
-#
-# check if the installed Ogg is sufficiently new.
-#
-ac_save_CFLAGS="$CFLAGS"
-ac_save_LIBS="$LIBS"
-ac_save_LDFLAGS="$LDFLAGS"
-CFLAGS="$CFLAGS $OGG_CFLAGS"
-LIBS="$LIBS $OGG_LIBS"
-LDFLAGS="$LDFLAGS $OGG_LDFLAGS"
-AC_TRY_LINK_FUNC(ogg_sync_init,
-    [ xt_cv_lib_ogg=ok ],
-    [ AC_TRY_LINK([#include <ogg/ogg.h>],, 
-        [ xt_cv_lib_ogg="pre v1.0, needs updating" ],
-        [ xt_cv_lib_ogg="not found" ])
-    ])
-CFLAGS="$ac_save_CFLAGS"
-LDFLAGS="$ac_save_LDFLAGS"
-LIBS="$ac_save_LIBS"
-])
-if test "x$xt_cv_lib_ogg" = "xok"; then
-    ifelse([$1],,,[$1])
-    AC_DEFINE([HAVE_OGG], [1], [Define if you have libogg installed])
-else
-    OGG_LIBS=""
-    OGG_CFLAGS=""
-    OGG_LDFLAGS=""
-    ifelse([$2],,,[$2])
-fi
-AC_SUBST(OGG_LIBS)
-AC_SUBST(OGG_CFLAGS)
-AC_SUBST(OGG_LDFLAGS)
-])

m4/ogg2.m4

-# Configure paths for libogg2
-# Arc Riley <arc@xiph.org> 03-03-2004
-# Shamelessly stolen from Jack Moffitt
-# Who shamelessly stole it from Owen Taylor and Manish Singh
-# Isn't Free Software awesome?
-
-dnl XIPH_PATH_OGG2([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS
-dnl
-dnl $Id$
-dnl
-AC_DEFUN([XIPH_PATH_OGG2],
-[dnl 
-dnl Get the cflags and libraries
-dnl
-AC_ARG_WITH(ogg,[  --with-ogg=PFX   Prefix where libogg2 is installed (optional)], ogg_prefix="$withval", ogg_prefix="")
-AC_ARG_WITH(ogg-libraries,[  --with-ogg-libraries=DIR   Directory where libogg2 library is installed (optional)], ogg_libraries="$withval", ogg_libraries="")
-AC_ARG_WITH(ogg-includes,[  --with-ogg-includes=DIR   Directory where libogg2 header files are installed (optional)], ogg_includes="$withval", ogg_includes="")
-AC_ARG_ENABLE(oggtest, [  --disable-oggtest       Do not try to compile and run a test Ogg program],, enable_oggtest=yes)
-
-  if test "x$ogg_libraries" != "x" ; then
-    OGG_LIBS="-L$ogg_libraries"
-  elif test "x$ogg_prefix" != "x" ; then
-    OGG_LIBS="-L$ogg_prefix/lib"
-  elif test "x$prefix" != "xNONE" ; then
-    OGG_LIBS="-L$prefix/lib"
-  fi
-
-  OGG_LIBS="$OGG_LIBS -logg2"
-
-  if test "x$ogg_includes" != "x" ; then
-    OGG_CFLAGS="-I$ogg_includes"
-  elif test "x$ogg_prefix" != "x" ; then
-    OGG_CFLAGS="-I$ogg_prefix/include"
-  elif test "$prefix" != "xNONE"; then
-    OGG_CFLAGS="-I$prefix/include"
-  fi
-
-  AC_MSG_CHECKING(for Ogg2)
-  no_ogg=""
-
-
-  if test "x$enable_oggtest" = "xyes" ; then
-    ac_save_CFLAGS="$CFLAGS"
-    ac_save_LIBS="$LIBS"
-    CFLAGS="$CFLAGS $OGG_CFLAGS"
-    LIBS="$LIBS $OGG_LIBS"
-dnl
-dnl Now check if the installed Ogg is sufficiently new.
-dnl
-      rm -f conf.oggtest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ogg2/ogg.h>
-
-int main ()
-{
-  system("touch conf.oggtest");
-  return 0;
-}
-
-],, no_ogg=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-  fi
-
-  if test "x$no_ogg" = "x" ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$1], , :, [$1])     
-  else
-     AC_MSG_RESULT(no)
-     if test -f conf.oggtest ; then
-       :
-     else
-       echo "*** Could not run Ogg test program, checking why..."
-       CFLAGS="$CFLAGS $OGG_CFLAGS"
-       LIBS="$LIBS $OGG_LIBS"
-       AC_TRY_LINK([
-#include <stdio.h>
-#include <ogg2/ogg.h>
-],     [ return 0; ],
-       [ echo "*** The test program compiled, but did not run. This usually means"
-       echo "*** that the run-time linker is not finding Ogg or finding the wrong"
-       echo "*** version of Ogg. If it is not finding Ogg, you'll need to set your"
-       echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-       echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-       echo "*** is required on your system"
-       echo "***"
-       echo "*** If you have an old version installed, it is best to remove it, although"
-       echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-       [ echo "*** The test program failed to compile or link. See the file config.log for the"
-       echo "*** exact error that occured. This usually means Ogg was incorrectly installed"
-       echo "*** or that you have moved Ogg since it was installed." ])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-     OGG_CFLAGS=""
-     OGG_LIBS=""
-     ifelse([$2], , :, [$2])
-  fi
-  AC_SUBST(OGG_CFLAGS)
-  AC_SUBST(OGG_LIBS)
-  rm -f conf.oggtest
-])

m4/shout.m4

-dnl XIPH_PATH_SHOUT
-dnl Jack Moffitt <jack@icecast.org> 08-06-2001
-dnl Rewritten for libshout 2
-dnl Brendan Cully <brendan@xiph.org> 20030612
-dnl 
-dnl $Id$
-
-# XIPH_PATH_SHOUT([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-# Test for libshout, and define SHOUT_CPPFLAGS SHOUT_CFLAGS SHOUT_LIBS, and
-# SHOUT_THREADSAFE
-AC_DEFUN([XIPH_PATH_SHOUT],
-[dnl
-xt_have_shout="no"
-SHOUT_THREADSAFE="no"
-SHOUT_CPPFLAGS=""
-SHOUT_CFLAGS=""
-SHOUT_LIBS=""
-
-# NB: PKG_CHECK_MODULES exits if pkg-config is unavailable on the target
-# system, so we can't use it.
-
-# seed pkg-config with the default libshout location
-PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/local/lib/pkgconfig}
-export PKG_CONFIG_PATH
-
-# Step 1: Use pkg-config if available
-AC_PATH_PROG([PKGCONFIG], [pkg-config], [no])
-if test "$PKGCONFIG" != "no" && `$PKGCONFIG --exists shout`
-then
-  SHOUT_CFLAGS=`$PKGCONFIG --variable=cflags_only shout`
-  SHOUT_CPPFLAGS=`$PKGCONFIG --variable=cppflags shout`
-  SHOUT_LIBS=`$PKGCONFIG --libs shout`
-  xt_have_shout="maybe"
-else
-  if test "$PKGCONFIG" != "no"
-  then
-    AC_MSG_NOTICE([$PKGCONFIG couldn't find libshout. Try adjusting PKG_CONFIG_PATH.])
-  fi
-  # pkg-config unavailable, try shout-config
-  AC_PATH_PROG([SHOUTCONFIG], [shout-config], [no])
-  if test "$SHOUTCONFIG" != "no" && test `$SHOUTCONFIG --package` = "libshout"
-  then
-    SHOUT_CPPFLAGS=`$SHOUTCONFIG --cppflags`
-    SHOUT_CFLAGS=`$SHOUTCONFIG --cflags-only`
-    SHOUT_LIBS=`$SHOUTCONFIG --libs`
-    xt_have_shout="maybe"
-  fi
-fi
-
-# Now try actually using libshout
-if test "$xt_have_shout" != "no"
-then
-  ac_save_CPPFLAGS="$CPPFLAGS"
-  ac_save_CFLAGS="$CFLAGS"
-  ac_save_LIBS="$LIBS"
-  CPPFLAGS="$CPPFLAGS $SHOUT_CPPFLAGS"
-  CFLAGS="$CFLAGS $SHOUT_CFLAGS"
-  LIBS="$SHOUT_LIBS $LIBS"
-  AC_CHECK_HEADERS([shout/shout.h], [
-    AC_CHECK_FUNC([shout_new], [
-      ifelse([$1], , :, [$1])
-      xt_have_shout="yes"
-    ])
-    AC_EGREP_CPP([yes], [#include <shout/shout.h>
-#if SHOUT_THREADSAFE
-yes
-#endif
-], [SHOUT_THREADSAFE="yes"])
-  ])
-  CPPFLAGS="$ac_save_CPPFLAGS"
-  CFLAGS="$ac_save_CFLAGS"
-  LIBS="$ac_save_LIBS"
-fi
-
-if test "$xt_have_shout" != "yes"
-then
-  ifelse([$2], , :, [$2])
-fi
-])dnl XIPH_PATH_SHOUT

m4/speex.m4

-# Configure paths for libspeex
-# updated by Karl Heyes 02-Feb-2004
-
-dnl XIPH_PATH_SPEEX([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for libspeex, and define SPEEX_CFLAGS SPEEX_LIBS
-dnl SPEEX_SPEEXENC_LIBS SPEEX_SPEEXFILE_LIBS SPEEX_LDFLAGS
-dnl
-
-AC_DEFUN([XIPH_PATH_SPEEX],
-[
-AC_REQUIRE([XIPH_PATH_OGG])
-
-dnl Get the cflags and libraries for speex
-dnl
-AC_ARG_VAR([SPEEX],[path to speex installation])
-AC_ARG_WITH(speex,
-    AC_HELP_STRING([--with-speex=PREFIX],
-        [Prefix where libspeex is installed (optional)]),
-    speex_prefix="$withval",
-    speex_prefix="$SPEEX_PREFIX"
-    )
-if test "x$with_speex" = "xno"
-then
-  AC_MSG_RESULT([Speex support disabled by request])
-else
-  if test "x$speex_prefix" = "x" -o "x$speex_prefix" = "xyes"; then
-      if test "x$prefix" = "xNONE"; then
-          speex_prefix="/usr/local"
-      else
-          speex_prefix="$prefix"
-      fi
-  fi
-
-  SPEEX_CFLAGS="$OGG_CFLAGS"
-  SPEEX_LDFLAGS="$OGG_LDFLAGS"
-  if test "x$speex_prefix" != "x$ogg_prefix"; then
-      XIPH_GCC_WARNING(-I"$speex_prefix/include",,
-              [SPEEX_CFLAGS="$SPEEX_CFLAGS -I$speex_prefix/include"
-              SPEEX_LDFLAGS="-L$speex_prefix/lib $SPEEX_LDFLAGS"
-              ])
-  fi
-
-  SPEEX_LIBS="-lspeex"
-
-  xt_save_LIBS="$LIBS"
-  xt_save_LDFLAGS="$LDFLAGS"
-  LDFLAGS="$LDFLAGS $SPEEX_LDFLAGS"
-  LIBS="$LIBS $SPEEX_LIBS"
-  xt_have_speex="yes"
-  AC_MSG_CHECKING([for libspeex])
-  AC_TRY_LINK_FUNC(ogg_stream_init, [AC_MSG_RESULT([ok])],
-          [LIBS="$LIBS $OGG_LIBS"
-          AC_TRY_LINK_FUNC(ogg_stream_init,
-              [SPEEX_LIBS="$SPEEX_LIBS $OGG_LIBS"],
-              [xt_have_speex="no"])
-          ])
-  if test "x$xt_have_speex" = "xyes"
-  then
-      AC_LINK_IFELSE([AC_LANG_PROGRAM(
-                  [#include <speex/speex_header.h>],
-                  [void *p = speex_packet_to_header;])],
-              [],
-              [xt_have_speex="no"])
-  fi
-
-  LIBS="$xt_save_LIBS"
-  LDFLAGS="$xt_save_LDFLAGS"
-  
-  if test "x$xt_have_speex" = "xyes"
-  then
-      AC_MSG_RESULT([ok])
-      AC_DEFINE([HAVE_SPEEX],[1],[Define if Speex support is available])
-      $1
-  else
-      ifelse([$2], , AC_MSG_ERROR([Unable to link to libspeex]), [$2])
-      SPEEX_CFLAGS=""
-      SPEEX_LDFLAGS=""
-      SPEEX_LIBS=""
-  fi
-  AC_SUBST(SPEEX_CFLAGS)
-  AC_SUBST(SPEEX_LDFLAGS)
-  AC_SUBST(SPEEX_LIBS)
-fi
-])

m4/theora.m4

-# Configure paths for libtheora
-# 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
-
-AC_DEFUN([XIPH_PATH_THEORA],
-[
-AC_REQUIRE([XIPH_PATH_OGG])
-
-dnl Get the cflags and libraries for theora
-dnl
-AC_ARG_VAR([THEORA],[path to theora installation])
-AC_ARG_WITH(theora,
-    AC_HELP_STRING([--with-theora=PREFIX],
-        [Prefix where libtheora is installed (optional)]),
-    theora_prefix="$withval",
-    theora_prefix="$THEORA_PREFIX"
-    )
-
-if test "x$with_theora" = "xno"
-then
-  AC_MSG_RESULT([Theora support disabled by request])
-else
-  if test "x$theora_prefix" = "x" -o "x$theora_prefix" = "xyes"; then
-    if test "x$prefix" = "xNONE"; then
-        theora_prefix="/usr/local"
-    else
-        theora_prefix="$prefix"
-    fi
-  fi
-
-  THEORA_CFLAGS="$OGG_CFLAGS"
-  THEORA_LDFLAGS="$OGG_LDFLAGS"
-  if test "x$theora_prefix" != "x$ogg_prefix"; then
-      XIPH_GCC_WARNING(-I"$theora_prefix/include",,
-              [THEORA_CFLAGS="$THEORA_CFLAGS -I$theora_prefix/include"
-              THEORA_LDFLAGS="-L$theora_prefix/lib $THEORA_LDFLAGS"
-              ])
-  fi
-
-  THEORA_LIBS="-ltheora -logg"
-
-  ac_save_LIBS="$LIBS"
-  ac_save_LDFLAGS="$LDFLAGS"
-  LDFLAGS="$LDFLAGS $THEORA_LDFLAGS"
-  LIBS="$LIBS $THEORA_LIBS"
-  AC_MSG_CHECKING([for libtheora])
-  AC_TRY_LINK_FUNC(theora_decode_header, [xt_have_theora="yes"],
-          [xt_have_theora="Not found"])
-  if test "x$xt_have_theora" = "xyes"
-  then
-    AC_TRY_LINK_FUNC(theora_packet_isheader, [xt_have_theora="yes"],
-          [xt_have_theora="newer version required"])
-  fi
-
-  LIBS="$ac_save_LIBS"
-  LDFLAGS="$ac_save_LDFLAGS"
-
-  if test "x$xt_have_theora" = "xyes"
-  then
-    AC_MSG_RESULT([ok])
-    AC_DEFINE([HAVE_THEORA],[1],[Define if Theora support is available])
-    $1
-  else
-    THEORA_CFLAGS=""
-    THEORA_LDFLAGS=""
-    THEORA_LIBS=""
-    AC_MSG_RESULT([$xt_have_theora])
-    $2
-  fi
-fi
-AC_SUBST(THEORA_CFLAGS)
-AC_SUBST(THEORA_LDFLAGS)
-AC_SUBST(THEORA_LIBS)
-])

m4/vorbis.m4

-# Configure paths for libvorbis
-# Jack Moffitt <jack@icecast.org> 10-21-2000
-# updated by Karl Heyes 31-Mar-2003
-# Shamelessly stolen from Owen Taylor and Manish Singh
-
-dnl XIPH_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for libvorbis, and define VORBIS_CFLAGS VORBIS_LIBS
-dnl VORBIS_VORBISENC_LIBS VORBIS_VORBISFILE_LIBS VORBIS_LDFLAGS
-dnl
-
-AC_DEFUN([XIPH_PATH_VORBIS],
-[dnl
-AC_REQUIRE([XIPH_PATH_OGG])
-
-dnl Get the cflags and libraries for vorbis
-dnl
-AC_ARG_VAR([VORBIS_PREFIX],[path to vorbis installation])
-AC_ARG_WITH(vorbis,
-    AC_HELP_STRING([--with-vorbis=PREFIX],
-        [Prefix where libvorbis is installed (optional)]),
-    vorbis_prefix="$withval",
-    vorbis_prefix="$VORBIS_PREFIX"
-    )
-if test "x$vorbis_prefix" = "x" -o "x$vorbis_prefix" = "xyes"; then
-    if test "x$prefix" = "xNONE"; then
-        vorbis_prefix="/usr/local"
-    else
-        vorbis_prefix="$prefix"
-    fi
-fi
-
-VORBIS_CFLAGS="$OGG_CFLAGS"
-VORBIS_LDFLAGS="$OGG_LDFLAGS"
-if test "x$vorbis_prefix" != "x$ogg_prefix"; then