From e05ccb9f051fcf4d60203dfcab9f624eece59ffb Mon Sep 17 00:00:00 2001 From: moritz Date: Mon, 26 Feb 2007 02:56:12 +0000 Subject: [PATCH] Remove unused .m4 files and sync the used ones with Icecast. git-svn-id: https://svn.xiph.org/trunk/ezstream@12565 0101bb08-14d6-0310-b084-bc0e0c8e3800 --- m4/ac_config_libconfig_in.m4 | 270 ----------------------------------- m4/acx_pthread.m4 | 192 ------------------------- m4/ogg.m4 | 38 +++-- m4/shout.m4 | 4 +- m4/vorbis.m4 | 51 ++++--- m4/xiph_compiler.m4 | 23 ++- m4/xiph_curl.m4 | 67 --------- m4/xiph_net.m4 | 26 ---- m4/xiph_path_python.m4 | 73 ---------- m4/xiph_types.m4 | 59 -------- m4/xiph_xml2.m4 | 2 +- 11 files changed, 78 insertions(+), 727 deletions(-) delete mode 100644 m4/ac_config_libconfig_in.m4 delete mode 100644 m4/acx_pthread.m4 delete mode 100644 m4/xiph_curl.m4 delete mode 100644 m4/xiph_net.m4 delete mode 100644 m4/xiph_path_python.m4 delete mode 100644 m4/xiph_types.m4 diff --git a/m4/ac_config_libconfig_in.m4 b/m4/ac_config_libconfig_in.m4 deleted file mode 100644 index d0d3424..0000000 --- a/m4/ac_config_libconfig_in.m4 +++ /dev/null @@ -1,270 +0,0 @@ -dnl Available from the GNU Autoconf Macro Archive at: -dnl http://www.gnu.org/software/ac-archive/htmldoc/ac_config_libconfig_in.html -dnl -# AC_CONFIG_LIBCONFIG_IN(LIBRARY, DESTINATION, MODULES) -# ----------------------------------------------------- -# Generate a custom LIBRARY-config script. Create the script in the -# DESTINATION directory, including support for MODULES. -AC_DEFUN([AC_CONFIG_LIBCONFIG_IN], -[# create a custom library-config file ($1-config) -m4_if(AC_CONFIG_LIBCONFIG_IN_USEPKGCONFIG, [true], - [AC_PATH_PROG(PKG_CONFIG, pkg-config)]) -pushdef([LIBCONFIG_DIR], [m4_if([$2], , , [$2/])]) -LIBCONFIG_FILE="LIBCONFIG_DIR[]$1-config.in" -AC_SUBST(target)dnl -AC_SUBST(host)dnl -AC_SUBST(build)dnl -dnl create directory if it does not preexist -m4_if([$2], , , [AS_MKDIR_P([$2])]) -AC_MSG_NOTICE([creating $LIBCONFIG_FILE]) -echo '#! /bin/sh' >$LIBCONFIG_FILE -echo "# $1-config library configuration script" >>$LIBCONFIG_FILE -echo '# generated by ac_config_libconfig_in.m4' >>$LIBCONFIG_FILE -echo ' ' >>$LIBCONFIG_FILE -echo 'template_version="1.0.0"' >>$LIBCONFIG_FILE -echo ' ' >>$LIBCONFIG_FILE -echo 'package="@PACKAGE@"' >>$LIBCONFIG_FILE -echo ' ' >>$LIBCONFIG_FILE -echo '# usage instructions if no options given' >>$LIBCONFIG_FILE -echo 'if test "'"\$""#"'" -eq 0; then' >>$LIBCONFIG_FILE -echo ' cat <>$LIBCONFIG_FILE -m4_if($3, , - [echo 'Usage: $1-config [[OPTIONS]]' >>$LIBCONFIG_FILE], - [echo 'Usage: $1-config [[OPTIONS]] [[LIBRARIES]]' >>$LIBCONFIG_FILE]) -echo 'Options:' >>$LIBCONFIG_FILE -echo ' [[--prefix[=DIR]]]' >>$LIBCONFIG_FILE -echo ' [[--exec-prefix[=DIR]]]' >>$LIBCONFIG_FILE -echo ' [[--package]]' >>$LIBCONFIG_FILE -echo ' [[--version]]' >>$LIBCONFIG_FILE -echo ' [[--cppflags]]' >>$LIBCONFIG_FILE -echo ' [[--cflags-only]]' >>$LIBCONFIG_FILE -echo ' [[--cflags]]' >>$LIBCONFIG_FILE -echo ' [[--libs]]' >>$LIBCONFIG_FILE -echo ' [[--help]]' >>$LIBCONFIG_FILE -m4_if($3, , , - [echo 'Libraries:' >>$LIBCONFIG_FILE - for module in $1 $3 ; do - echo " $module" >>$LIBCONFIG_FILE ; - done]) -echo 'EOF' >>$LIBCONFIG_FILE -echo 'fi' >>$LIBCONFIG_FILE -echo ' ' >>$LIBCONFIG_FILE -echo '# parse options' >>$LIBCONFIG_FILE -echo 'o=""' >>$LIBCONFIG_FILE -echo 'h=""' >>$LIBCONFIG_FILE -echo 'for i' >>$LIBCONFIG_FILE -echo 'do' >>$LIBCONFIG_FILE -echo ' case $i in' >>$LIBCONFIG_FILE -options="prefix exec-prefix eprefix package version cppflags cflags-only cflags libs bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir infodir mandir target host build pkgdatadir pkglibdir pkgincludedir template-version help" -echo ' --prefix=*) prefix=`echo $i | sed -e "s/--prefix=//"` ;;' >>$LIBCONFIG_FILE -echo ' --exec-prefix=*) exec_prefix=`echo $i | sed -e "s/--exec-prefix=//"` ;;' >>$LIBCONFIG_FILE -echo ' --eprefix=*) exec_prefix=`echo $i | sed -e "s/--eprefix=//"` ;;' >>$LIBCONFIG_FILE -for option in $options ; do - case $option in - exec-prefix) echo " --$option) echo_exec_prefix=\"yes\" ;;" >>$LIBCONFIG_FILE ;; - template-version) echo " --$option) echo_template_version=\"yes\" ;;" >>$LIBCONFIG_FILE ;; - cflags-only) echo " --$option) echo_cflags_only=\"yes\" ;;" >>$LIBCONFIG_FILE ;; - *) echo " --$option) echo_$option=\"yes\" ;;" >>$LIBCONFIG_FILE ;; - esac -done -m4_if($3, , , - [for module in $1 $3 ; do - echo " $module) echo_module_$module=\"yes\" ;" >>$LIBCONFIG_FILE ; - echo ' echo_module="yes" ;;' >>$LIBCONFIG_FILE ; - done]) -echo ' //*|/*//*|./*//*) echo_extra="yes" ;;' >>$LIBCONFIG_FILE -echo ' *) eval "echo Unknown option: $i" ; exit 1 ;;' >>$LIBCONFIG_FILE -echo ' esac' >>$LIBCONFIG_FILE -echo 'done' >>$LIBCONFIG_FILE -echo ' ' >>$LIBCONFIG_FILE -# in the order of occurence a standard automake Makefile -echo '# defaults from configure; set only if not set previously' >>$LIBCONFIG_FILE -vars="prefix exec_prefix bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir infodir mandir includedir target host build" -for var in $vars ; do - echo "if test -z \"\$$var\" ; then" >>$LIBCONFIG_FILE - echo " $var=\"@$var@\"" >>$LIBCONFIG_FILE - echo 'fi' >>$LIBCONFIG_FILE -done -echo ' ' >>$LIBCONFIG_FILE -echo '# generate output' >>$LIBCONFIG_FILE -echo 'if test x$echo_module != xyes ; then' >>$LIBCONFIG_FILE -echo ' echo_module_$1="yes"' >>$LIBCONFIG_FILE -echo 'fi' >>$LIBCONFIG_FILE -AC_CONFIG_LIBCONFIG_IN_MODULES(m4_if([$3], , [$1], [m4_translit([$1 $3], [ ], [,])]))dnl -for option in $options extra; do - case $option in - exec-prefix) echo "if test x\$echo_exec_prefix = xyes ; then" >>$LIBCONFIG_FILE ;; - template-version) echo "if test x\$echo_template_version = xyes ; then" >>$LIBCONFIG_FILE ;; - cflags-only) echo "if test x\$echo_cflags_only = xyes ; then" >>$LIBCONFIG_FILE ;; - *) echo "if test x\$echo_$option = xyes ; then" >>$LIBCONFIG_FILE ;; - esac - case $option in - exec-prefix | eprefix) echo ' o="$o $exec_prefix"' >>$LIBCONFIG_FILE ;; - template-version) echo ' o="$o $template_version"' >>$LIBCONFIG_FILE ;; - cflags-only) echo ' o="$o $cflags"' >>$LIBCONFIG_FILE ;; - cppflags) echo ' o="$o $cppflags"' >>$LIBCONFIG_FILE ;; - cflags) -# echo ' i=`eval echo "$includedir"`' >>$LIBCONFIG_FILE ; -# echo ' i=`eval echo "$i"`' >>$LIBCONFIG_FILE ; -# echo ' if test "_$i" != "_/usr/include" ; then' >>$LIBCONFIG_FILE ; -# echo ' o="$o -I$includedir"' >>$LIBCONFIG_FILE ; -# echo ' fi' >>$LIBCONFIG_FILE ; - echo ' o="$o $cppflags $cflags"' >>$LIBCONFIG_FILE ;; - libs) echo ' o="$o -L$libdir $libs"' >>$LIBCONFIG_FILE ;; - help) echo ' h="1"' >>$LIBCONFIG_FILE ;; - pkgdatadir) echo " o=\"$o \${datadir}/\${package}\"" >>$LIBCONFIG_FILE ;; - pkglibdir) echo " o=\"$o \${libdir}/\${package}\"" >>$LIBCONFIG_FILE ;; - pkgincludedir) echo " o=\"$o \${includedir}/\${package}\"" >>$LIBCONFIG_FILE ;; - extra) - echo ' v=`echo $i | sed -e s://:\$:g`' >>$LIBCONFIG_FILE ; - echo ' v=`eval "echo $v"`' >>$LIBCONFIG_FILE ; - echo ' o="$o $v"' >>$LIBCONFIG_FILE ;; - *) echo " o=\"$o \$$option\"" >>$LIBCONFIG_FILE - esac - echo 'fi' >>$LIBCONFIG_FILE -done -echo ' ' >>$LIBCONFIG_FILE -echo '# output data' >>$LIBCONFIG_FILE -echo 'o=`eval "echo $o"`' >>$LIBCONFIG_FILE -echo 'o=`eval "echo $o"`' >>$LIBCONFIG_FILE -echo 'if test -n "$o" ; then ' >>$LIBCONFIG_FILE -echo ' eval "echo $o"' >>$LIBCONFIG_FILE -echo 'fi' >>$LIBCONFIG_FILE -echo ' ' >>$LIBCONFIG_FILE -echo '# help text' >>$LIBCONFIG_FILE -echo 'if test ! -z "$h" ; then ' >>$LIBCONFIG_FILE -echo ' cat <>$LIBCONFIG_FILE -echo 'All available options:' >>$LIBCONFIG_FILE -echo ' --prefix=DIR and change \$prefix and \$exec-prefix' >>$LIBCONFIG_FILE -echo ' --exec-prefix=DIR (affects all other options)' >>$LIBCONFIG_FILE -echo ' --prefix \$prefix $prefix' >>$LIBCONFIG_FILE -echo ' --exec_prefix or... ' >>$LIBCONFIG_FILE -echo ' --eprefix \$exec_prefix $exec_prefix' >>$LIBCONFIG_FILE -echo ' --version \$version $version' >>$LIBCONFIG_FILE -echo ' --cppflags C preprocessor flags' >>$LIBCONFIG_FILE -echo ' --cflags-only C compiler flags' >>$LIBCONFIG_FILE -echo ' --cflags C preprocessor and compiler flags' >>$LIBCONFIG_FILE -echo ' --libs -L\$libdir \$LIBS $libs' >>$LIBCONFIG_FILE -echo ' --package \$package $package' >>$LIBCONFIG_FILE -echo ' --bindir \$bindir $bindir' >>$LIBCONFIG_FILE -echo ' --sbindir \$sbindir $sbindir' >>$LIBCONFIG_FILE -echo ' --libexecdir \$libexecdir $libexecdir' >>$LIBCONFIG_FILE -echo ' --datadir \$datadir $datadir' >>$LIBCONFIG_FILE -echo ' --sysconfdir \$sysconfdir $sysconfdir' >>$LIBCONFIG_FILE -echo ' --sharedstatedir \$sharedstatedir$sharedstatedir' >>$LIBCONFIG_FILE -echo ' --localstatedir \$localstatedir $localstatedir' >>$LIBCONFIG_FILE -echo ' --libdir \$libdir $libdir' >>$LIBCONFIG_FILE -echo ' --infodir \$infodir $infodir' >>$LIBCONFIG_FILE -echo ' --mandir \$mandir $mandir' >>$LIBCONFIG_FILE -echo ' --target \$target $target' >>$LIBCONFIG_FILE -echo ' --host \$host $host' >>$LIBCONFIG_FILE -echo ' --build \$build $build' >>$LIBCONFIG_FILE -echo ' --pkgdatadir \$datadir/\$package ${datadir}/${package}' >>$LIBCONFIG_FILE -echo ' --pkglibdir \$libdir/\$package ${libdir}/${package}' >>$LIBCONFIG_FILE -echo ' --pkgincludedir \$includedir/\$package ${includedir}/${package}' >>$LIBCONFIG_FILE -echo ' --template-version \$template_version $template_version' >>$LIBCONFIG_FILE -echo ' --help' >>$LIBCONFIG_FILE -echo 'EOF' >>$LIBCONFIG_FILE -echo 'fi' >>$LIBCONFIG_FILE -m4_pushdef([LIBCONFIG_UP], [m4_translit([$1], [a-z], [A-Z])])dnl -LIBCONFIG_UP[]_CONFIG="LIBCONFIG_DIR[]$1-config" -AC_SUBST(LIBCONFIG_UP[]_CONFIG) -dnl AC_CONFIG_FILES(LIBCONFIG_DIR[]$1[-config], [chmod +x ]LIBCONFIG_DIR[]$1[-config]) -m4_popdef([LIBCONFIG_DIR]) -m4_popdef([LIBCONFIG_UP]) -]) - - -# AC_CONFIG_LIBCONFIG_IN_MODULES [(MODULE1 [, MODULE2 [, ...]])] -# -------------------------------------------------------------- -#Output shell script using custom module variables. -AC_DEFUN([AC_CONFIG_LIBCONFIG_IN_MODULES], -[m4_if([$1], , , - [# create module definition for $1 -dnl we're going to need uppercase, lowercase and user-friendly versions of the -dnl string `MODULE' -m4_pushdef([MODULE_UP], m4_translit([$1], [a-z], [A-Z]))dnl -m4_pushdef([MODULE_DOWN], m4_translit([$1], [A-Z], [a-z]))dnl -if test -z "$MODULE_DOWN[]_cppflags" ; then - if test -n "$MODULE_UP[]_CPPFLAGS" ; then - MODULE_DOWN[]_cppflags="$MODULE_UP[]_CPPFLAGS" - else -dnl AC_MSG_WARN([variable `MODULE_DOWN[]_cppflags' undefined]) - MODULE_DOWN[]_cppflags='' - fi -fi -AC_SUBST(MODULE_DOWN[]_cppflags) -if test -z "$MODULE_DOWN[]_cflags" ; then - if test -n "$MODULE_UP[]_CFLAGS" ; then - MODULE_DOWN[]_cflags="$MODULE_UP[]_CFLAGS" - else -dnl AC_MSG_WARN([variable `MODULE_DOWN[]_cflags' undefined]) - MODULE_DOWN[]_cflags='' - fi -fi -AC_SUBST(MODULE_DOWN[]_cflags)dnl -if test -z "$MODULE_DOWN[]_libs" ; then - if test -n "$MODULE_UP[]_LIBS" ; then - MODULE_DOWN[]_libs="$MODULE_UP[]_LIBS" - else - AC_MSG_WARN([variable `MODULE_DOWN[]_libs' and `MODULE_UP[]_LIBS' undefined]) - MODULE_DOWN[]_libs='-l$1' - fi - if test -n "$MODULE_UP[]_LIBDEPS" ; then - MODULE_DOWN[]_libs="$MODULE_DOWN[]_libs $MODULE_UP[]_LIBDEPS" - fi -fi -AC_SUBST(MODULE_DOWN[]_libs)dnl -if test -z "$MODULE_UP[]_VERSION" ; then - AC_MSG_WARN([variable `MODULE_UP[]_VERSION' undefined]) - MODULE_UP[]_VERSION="$VERSION" -fi -AC_SUBST(MODULE_UP[]_VERSION)dnl -echo 'if test x$echo_module_$1 = xyes ; then' >>$LIBCONFIG_FILE -AC_CONFIG_LIBCONFIG_IN_MODULES_VARS([cppflags], [MODULE_DOWN[]_cppflags], [cppflags]) -AC_CONFIG_LIBCONFIG_IN_MODULES_VARS([cflags], [MODULE_DOWN[]_cflags], [cflags]) -AC_CONFIG_LIBCONFIG_IN_MODULES_VARS([libs], [MODULE_DOWN[]_libs], [libs]) -AC_CONFIG_LIBCONFIG_IN_MODULES_VARS([version], [MODULE_UP[]_VERSION], [modversion]) -echo 'fi' >>$LIBCONFIG_FILE -m4_popdef([MODULE_UP])dnl -m4_popdef([MODULE_DOWN])dnl -AC_CONFIG_LIBCONFIG_IN_MODULES(m4_shift($@))])dnl -]) - - -# AC_CONFIG_LIBCONFIG_IN_MODULES_VARS [(VAR, SUBSTITUTION, -# PKGCONFIG_ARGS)] -# -------------------------------------------------------- -# Output AC_CONFIG_LIBCONFIG_IN_MODULES variables. -# VAR = variable to set -# SUBSTITUTION = set if pkg-config is not available -# PKGCONFIG_ARGS = args for pkg-config -AC_DEFUN([AC_CONFIG_LIBCONFIG_IN_MODULES_VARS], -[m4_if(AC_CONFIG_LIBCONFIG_IN_USEPKGCONFIG, [true], -[ -echo 'if test -x "`which pkg-config`" ; then' >>$LIBCONFIG_FILE -echo ' if pkg-config --atleast-pkgconfig-version=0.7 --exists "MODULE_DOWN"; then' >>$LIBCONFIG_FILE -echo ' $1="@S|@$1 `pkg-config --$3 MODULE_DOWN`"' >>$LIBCONFIG_FILE -echo ' fi' >>$LIBCONFIG_FILE -echo 'else' >>$LIBCONFIG_FILE -echo ' $1="@S|@$1 @$2@"' >>$LIBCONFIG_FILE -echo 'fi' >>$LIBCONFIG_FILE -], -[echo ' $1="@S|@$1 @$2@"' >>$LIBCONFIG_FILE -])]) - - -# AC_CONFIG_LIBCONFIG_IN_PKGCONFIG -# -------------------------------- -# Enable pkgconfig support in libconfig script (default) -AC_DEFUN([AC_CONFIG_LIBCONFIG_IN_PKGCONFIG], -[m4_define([AC_CONFIG_LIBCONFIG_IN_USEPKGCONFIG], [true]) -])dnl - - -# AC_CONFIG_LIBCONFIG_IN_STATIC -# ----------------------------- -# Disable pkgconfig support in libconfig script -AC_DEFUN([AC_CONFIG_LIBCONFIG_IN_STATIC], -[m4_define([AC_CONFIG_LIBCONFIG_IN_USEPKGCONFIG], [false]) -])dnl diff --git a/m4/acx_pthread.m4 b/m4/acx_pthread.m4 deleted file mode 100644 index eba50c7..0000000 --- a/m4/acx_pthread.m4 +++ /dev/null @@ -1,192 +0,0 @@ -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. - -acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt" - -# 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) -# pthread: Linux, etcetera -# --thread-safe: KAI C++ - -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 -pthread or - # -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="-pthread -pthreads pthread -mt $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" - ;; - - *) - 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_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: threads are created detached by default - # and the JOINABLE attribute has a nonstandard name (UNDETACHED). - AC_MSG_CHECKING([for joinable pthread attribute]) - AC_TRY_LINK([#include ], - [int attr=PTHREAD_CREATE_JOINABLE;], - ok=PTHREAD_CREATE_JOINABLE, ok=unknown) - if test x"$ok" = xunknown; then - AC_TRY_LINK([#include ], - [int attr=PTHREAD_CREATE_UNDETACHED;], - ok=PTHREAD_CREATE_UNDETACHED, ok=unknown) - fi - if test x"$ok" != xPTHREAD_CREATE_JOINABLE; then - AC_DEFINE(PTHREAD_CREATE_JOINABLE, $ok, - [Define to the necessary symbol if this constant - uses a non-standard name on your system.]) - fi - AC_MSG_RESULT(${ok}) - if test x"$ok" = xunknown; then - AC_MSG_WARN([we do not know how to create joinable pthreads]) - fi - - AC_MSG_CHECKING([if more special flags are required for pthreads]) - flag=no - case "${host_cpu}-${host_os}" in - *-aix* | *-freebsd*) 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_TYPES(pthread_rwlock_t,,,[#include ]) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - # More AIX lossage: must compile with cc_r - AC_CHECK_PROG(PTHREAD_CC, cc_r, cc_r, ${CC}) -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 diff --git a/m4/ogg.m4 b/m4/ogg.m4 index 3168e0f..4b00f90 100644 --- a/m4/ogg.m4 +++ b/m4/ogg.m4 @@ -11,11 +11,11 @@ AC_DEFUN([XIPH_PATH_OGG], 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)])], + [Prefix where libogg is installed (optional)])], ogg_prefix="$withval", ogg_prefix="$OGG_PREFIX" -) -if test "x$ogg_prefix" = "x"; then + ) +if test "x$ogg_prefix" = "x" -o "x$ogg_prefix" = "xyes"; then if test "x$prefix" = "xNONE"; then ogg_prefix=/usr/local else @@ -24,15 +24,16 @@ if test "x$ogg_prefix" = "x"; then fi XIPH_GCC_WARNING([-I$ogg_prefix/include],, - [OGG_CFLAGS="-I$ogg_prefix/include" - OGG_LDFLAGS="-L$ogg_prefix/lib" - ]) + [ 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_MSG_CHECKING([for ogg_sync_init in libogg]) ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" ac_save_LDFLAGS="$LDFLAGS" @@ -40,16 +41,25 @@ CFLAGS="$CFLAGS $OGG_CFLAGS" LIBS="$LIBS $OGG_LIBS" LDFLAGS="$LDFLAGS $OGG_LDFLAGS" AC_TRY_LINK_FUNC(ogg_sync_init, - [ifelse([$1],, [AC_MSG_RESULT([ok])], [$1])], - [AC_TRY_LINK([#include ],, - [ ifelse([$2], ,[AC_MSG_ERROR([found, but needs updating])], [$2])], - [ ifelse([$2], ,[AC_MSG_ERROR([not found, maybe you need to set LD_LIBRARY_PATH or /etc/ld.so.conf])], [$2])]) - ]) + [ xt_cv_lib_ogg=ok ], + [ AC_TRY_LINK([#include ],, + [ 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) -AC_SUBST(OGG_LIBS) ]) diff --git a/m4/shout.m4 b/m4/shout.m4 index 1cc5561..9fad512 100644 --- a/m4/shout.m4 +++ b/m4/shout.m4 @@ -3,7 +3,7 @@ dnl Jack Moffitt 08-06-2001 dnl Rewritten for libshout 2 dnl Brendan Cully 20030612 dnl -dnl $Id: shout.m4,v 1.1 2004/01/30 17:19:56 oddsock Exp $ +dnl $Id: shout.m4 7180 2004-07-20 02:50:54Z brendan $ # XIPH_PATH_SHOUT([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) # Test for libshout, and define SHOUT_CPPFLAGS SHOUT_CFLAGS SHOUT_LIBS, and @@ -16,7 +16,7 @@ SHOUT_CPPFLAGS="" SHOUT_CFLAGS="" SHOUT_LIBS="" -# NB: PKG_CHECK_MODULES exits if pkg-config is unavailable on the targe +# 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 diff --git a/m4/vorbis.m4 b/m4/vorbis.m4 index 8daccbd..6401ab6 100644 --- a/m4/vorbis.m4 +++ b/m4/vorbis.m4 @@ -9,8 +9,8 @@ dnl VORBIS_VORBISENC_LIBS VORBIS_VORBISFILE_LIBS VORBIS_LDFLAGS dnl AC_DEFUN([XIPH_PATH_VORBIS], -[ -XIPH_PATH_OGG([$1],[$2]) +[dnl +AC_REQUIRE([XIPH_PATH_OGG]) dnl Get the cflags and libraries for vorbis dnl @@ -21,7 +21,7 @@ AC_ARG_WITH(vorbis, vorbis_prefix="$withval", vorbis_prefix="$VORBIS_PREFIX" ) -if test "x$vorbis_prefix" = "x"; then +if test "x$vorbis_prefix" = "x" -o "x$vorbis_prefix" = "xyes"; then if test "x$prefix" = "xNONE"; then vorbis_prefix="/usr/local" else @@ -42,38 +42,47 @@ VORBIS_LIBS="-lvorbis" VORBISFILE_LIBS="-lvorbisfile" VORBISENC_LIBS="-lvorbisenc" -ac_save_LIBS="$LIBS" -ac_save_LDFLAGS="$LDFLAGS" +xt_save_LIBS="$LIBS" +xt_save_LDFLAGS="$LDFLAGS" +xt_save_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $VORBIS_CFLAGS" LDFLAGS="$LDFLAGS $VORBIS_LDFLAGS" LIBS="$LIBS $VORBIS_LIBS" +xt_lib_vorbis="not found" AC_MSG_CHECKING([for libvorbis]) -AC_TRY_LINK_FUNC(vorbis_info_init, [AC_MSG_RESULT([ok])], +AC_TRY_LINK_FUNC(ogg_stream_init, [xt_lib_vorbis=ok], [LIBS="$LIBS $OGG_LIBS -lm" AC_TRY_LINK_FUNC(vorbis_info_init, - [AC_MSG_RESULT([found, adding extra libs]) + [xt_lib_vorbis=ok VORBIS_LIBS="$VORBIS_LIBS $OGG_LIBS -lm"], - [ifelse([$2], , AC_MSG_ERROR([Unable to link to libvorbis]), [$2]) - ]) + ) ]) -LIBS="$ac_save_LIBS" -LDFLAGS="$ac_save_LDFLAGS" - +AC_MSG_RESULT([$xt_lib_vorbis]) +if test "x$xt_lib_vorbis" = "xok"; then # # Now check if the installed Vorbis is sufficiently new. # -ac_save_CFLAGS="$CFLAGS" -ac_save_LIBS="$LIBS" -CFLAGS="$CFLAGS $VORBIS_CFLAGS" -LIBS="$LIBS $VORBIS_LDFLAGS $VORBIS_LIBS" - -AC_CHECK_TYPES([struct ovectl_ratemanage_arg],[vorbis_ok=yes], - [ifelse([$2], ,[AC_MSG_ERROR([libvorbis needs updating])], [$2])], [ +AC_CHECK_TYPES([struct ovectl_ratemanage_arg],, + [xt_lib_vorbis="old version found"], [ #include #include ]) -CFLAGS="$ac_save_CFLAGS" -LIBS="$ac_save_LIBS" +fi +CPPFLAGS="$xt_save_CPPFLAGS" +LIBS="$xt_save_LIBS" +LDFLAGS="$xt_save_LDFLAGS" + +if test "x$xt_lib_vorbis" = "xok"; then + ifelse([$1], ,[:], [$1]) +else + VORBIS_CFLAGS="" + VORBIS_LDFLAGS="" + VORBIS_LIBS="" + VORBISFILE_LIBS="" + VORBISENC_LIBS="" + ifelse([$2], ,, [$2]) +fi AC_SUBST(VORBIS_CFLAGS) AC_SUBST(VORBIS_LDFLAGS) AC_SUBST(VORBIS_LIBS) diff --git a/m4/xiph_compiler.m4 b/m4/xiph_compiler.m4 index acded7d..ed20782 100644 --- a/m4/xiph_compiler.m4 +++ b/m4/xiph_compiler.m4 @@ -1,5 +1,5 @@ dnl xiph_compiler.m4 -dnl $Id: xiph_compiler.m4,v 1.1 2004/01/30 17:19:56 oddsock Exp $ +dnl $Id: xiph_compiler.m4 8320 2004-11-30 20:36:09Z karl $ dnl XIPH_FUNC_VA_COPY dnl Karl Heyes @@ -34,7 +34,8 @@ 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]) + AH_TEMPLATE([__attribute__],[Define to empty if __attribute__ is not supported]) + AC_DEFINE([__attribute__(x)],[]) ]) ])dnl XIPH_C_ATTRIBUTE @@ -166,3 +167,21 @@ EOF done $1="$xt_filtered $$1" ])dnl XIPH_VAR_PREPEND + +dnl XIPH_C__FUNC__ +dnl Karl Heyes 07/2004 +AC_DEFUN([XIPH_C__FUNC__], +[dnl +AC_MSG_CHECKING([for __func__]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[const char *x = __func__;])], + [ AC_MSG_RESULT([yes])], + [ AH_TEMPLATE([__func__], [Replace __func__ if not supported]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[const char *x = __FUNCTION__;])], + [ AC_DEFINE([__func__],[__FUNCTION__]) + AC_MSG_RESULT([yes])], + [ AC_DEFINE([__func__],[""]) + AC_MSG_RESULT([no]) + ]) + ]) +])dnl XIPH_C__FUNC__ + diff --git a/m4/xiph_curl.m4 b/m4/xiph_curl.m4 deleted file mode 100644 index 5c557f9..0000000 --- a/m4/xiph_curl.m4 +++ /dev/null @@ -1,67 +0,0 @@ -dnl XIPH_PATH_CURL([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -dnl Test for libcurl, and define CURL_CFLAGS and CURL_LIBS -dnl -AC_DEFUN(XIPH_PATH_CURL, -[dnl -dnl Get the cflags and libraries -dnl -AC_ARG_WITH(curl, - AC_HELP_STRING([--with-curl=PFX],[Prefix where libcurl is installed (optional)]), - curl_prefix="$withval", curl_prefix="") -AC_ARG_WITH(curl-config, - AC_HELP_STRING([--with-curl-config=curl-config],[Use curl-config to find libcurl]), - CURL_CONFIG="$withval", [AC_PATH_PROGS(CURL_CONFIG, [curl-config], "")]) - -if test "x$curl_prefix" != "x"; then - CURL_LIBS="-L$curl_prefix/lib -lcurl" - CURL_CFLAGS="-I$curl_prefix/include" -elif test "x$CURL_CONFIG" != "x"; then - if ! test -x "$CURL_CONFIG"; then - AC_MSG_ERROR([$CURL_CONFIG cannot be executed]) - fi - CURL_LIBS="$($CURL_CONFIG --libs)" - CURL_CFLAGS="$($CURL_CONFIG --cflags)" -else - if test "x$prefix" = "xNONE"; then - curl_prefix="/usr/local" - else - curl_prefix="$prefix" - fi - CURL_LIBS="-L$curl_prefix/lib -lcurl" - CURL_CFLAGS="-I$curl_prefix/include" -fi - -curl_ok="yes" - -xt_curl_CPPFLAGS="$CPPFLAGS" -xt_curl_LIBS="$LIBS" -CPPFLAGS="$CPPFLAGS $CURL_CFLAGS" -LIBS="$CURL_LIBS $LIBS" -dnl -dnl Now check if the installed libcurl is sufficiently new. -dnl -AC_CHECK_HEADERS([curl/curl.h],, curl_ok="no") -AC_MSG_CHECKING(for libcurl) -if test "$curl_ok" = "yes" -then - AC_RUN_IFELSE(AC_LANG_SOURCE([ -#include -int main() -{ - return 0; -} -]),,[curl_ok="no"]) -fi -if test "$curl_ok" = "yes"; then - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_CURL, 1, [Define if you have libcurl.]) - ifelse([$1], , :, [$1]) -else - AC_MSG_RESULT(no) - CURL_LIBS="" - CURL_CFLAGS="" - ifelse([$2], , :, [$2]) -fi -CPPFLAGS="$xt_curl_CPPFLAGS" -LIBS="$xt_curl_LIBS" -]) diff --git a/m4/xiph_net.m4 b/m4/xiph_net.m4 deleted file mode 100644 index db63963..0000000 --- a/m4/xiph_net.m4 +++ /dev/null @@ -1,26 +0,0 @@ -# XIPH_NET -# Perform tests required by the net module -AC_DEFUN([XIPH_NET], -[dnl -AC_REQUIRE([XIPH_TYPE_SOCKLEN_T]) -AC_REQUIRE([XIPH_FUNC_VA_COPY]) -AC_CHECK_HEADERS([sys/select.h sys/uio.h]) -AC_CHECK_HEADER([winsock2.h], - [AC_DEFINE([HAVE_WINSOCK2_H], [1], [Define if you have winsock2.h on MINGW]) - LIBS="$LIBS -lwsock32"]) - -# These tests are ordered based on solaris 8 tests -AC_SEARCH_LIBS([sethostent], [nsl], - [AC_DEFINE([HAVE_SETHOSTENT], [1], - [Define if you have the sethostent function])]) -AC_SEARCH_LIBS([getnameinfo], [socket], - [AC_DEFINE([HAVE_GETNAMEINFO], [1], - [Define if you have the getnameinfo function])]) -AC_CHECK_FUNCS([endhostent getaddrinfo inet_aton writev]) - -# Irix defines INET_PTON but not sockaddr_storage! -AC_CHECK_MEMBERS([struct sockaddr_storage.ss_family], - [AC_CHECK_FUNCS([inet_pton])],, - [#include -#include ]) -]) diff --git a/m4/xiph_path_python.m4 b/m4/xiph_path_python.m4 deleted file mode 100644 index dc46760..0000000 --- a/m4/xiph_path_python.m4 +++ /dev/null @@ -1,73 +0,0 @@ -dnl local M4 configure macros -dnl Brendan Cully -dnl $Id: xiph_path_python.m4,v 1.1 2004/01/30 17:19:57 oddsock Exp $ - -# XIPH_PATH_PYTHON(PATH) -# Search for python in PATH, or in the path if none is given. -# Defines PYTHON_CPPFLAGS and PYTHON_LIBS if found -AC_DEFUN([XIPH_PATH_PYTHON], - [ -m4_pushdef([xpp_path], [$1]) - -PYTHON="no" - -if test "xpp_path" != "yes" -then - AC_MSG_CHECKING([python]) - if test -x "xpp_path" - then - PYTHON="xpp_path" - fi - AC_MSG_RESULT([$PYTHON]) -else - AC_PATH_PROGS([PYTHON], [python python2 python2.3 python2.2]) -fi - -m4_popdef([xpp_path]) - -if test "$PYTHON" != "no" -then - # The library we're linking against - PYTHON_LIB="_XIPH_PYTHON_CFG([$PYTHON], [LIBRARY])" - - # if LIBRARY is nonsensical, bail out - if test $? -ne 0 -o -z "$PYTHON_LIB" - then - AC_MSG_WARN([Could not find library for $PYTHON]) - break - fi - # make library linker friendly. This is a hack, but I don't know what's better - PYTHON_LIB=`echo "$PYTHON_LIB" | sed 's/lib//;s/\.a.*//;s/\.so.*//;s/\.dylib.*//'` - - # LDFLAGS - PYTHON_LDFLAGS="-L[]_XIPH_PYTHON_CFG([$PYTHON], [LIBPL])" - - # Extra libraries required by python - PYTHON_EXTRA_LIBS="_XIPH_PYTHON_CFG([$PYTHON], [LIBS])" - PYTHON_EXTRA_LIBS="$PYTHON_EXTRA_LIBS _XIPH_PYTHON_CFG([$PYTHON], [SYSLIBS])" - PYTHON_EXTRA_LIBS="$PYTHON_EXTRA_LIBS _XIPH_PYTHON_CFG([$PYTHON], [SHLIBS])" - - PYTHON_CPPFLAGS="-I[]_XIPH_PYTHON_CFG([$PYTHON], [INCLUDEPY])" - - # test header and library functionality - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS" - AC_CHECK_HEADER([Python.h], - [ - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $PYTHON_LDFLAGS" - AC_CHECK_LIB([$PYTHON_LIB], [Py_Initialize], - [PYTHON_LIBS="-l$PYTHON_LIB $PYTHON_EXTRA_LIBS"], - [AC_MSG_WARN([Could not link to the python library])], - [$PYTHON_EXTRA_LIBS]) - LDFLAGS="$saved_LDFLAGS" - ], - [AC_MSG_WARN([Python.h doesn't appear to be usable])]) - CPPFLAGS="$saved_CPPFLAGS" -fi - ])dnl - -# _XIPH_PYTHON_CFG(PYTHONPATH, CFGVAR) -# Ask python in PYTHONPATH for the definition of CFGVAR -m4_define([_XIPH_PYTHON_CFG], - [`$1 -c 'from distutils.sysconfig import get_config_var; print get_config_var("$2")' | sed 's/None//'`]) diff --git a/m4/xiph_types.m4 b/m4/xiph_types.m4 deleted file mode 100644 index 718bd9a..0000000 --- a/m4/xiph_types.m4 +++ /dev/null @@ -1,59 +0,0 @@ -dnl xiph_types.m4 -dnl macros for type checks not covered by autoconf - -dnl XIPH_C99_INTTYPES -dnl Brendan Cully -dnl -# XIPH_C99_INTTYPES -# Check for C99 integer type definitions, or define if missing -AC_DEFUN([XIPH_C99_INTTYPES], -[dnl -AC_CHECK_HEADERS([inttypes.h]) -AC_CHECK_TYPE([uint32_t], - [AC_DEFINE(HAVE_C99_INTTYPES, 1, [Define if you have the C99 integer types])], - [AC_CHECK_SIZEOF(short) - AC_CHECK_SIZEOF(int) - AC_CHECK_SIZEOF(long) - AC_CHECK_SIZEOF(long long)]) -AH_VERBATIM([X_HAVE_C99_INTTYPES], - [#ifndef HAVE_C99_INTTYPES -# if SIZEOF_SHORT == 4 -typedef unsigned short uint32_t; -# elif SIZEOF_INT == 4 -typedef unsigned int uint32_t; -# elif SIZEOF_LONG == 4 -typedef unsigned long uint32_t; -# endif -# if SIZEOF_INT == 8 -typedef unsigned int uint64_t; -# elif SIZEOF_LONG == 8 -typedef unsigned long uint64_t; -# elif SIZEOF_LONG_LONG == 8 -typedef unsigned long long uint64_t; -# endif -#endif - ]) -]) - -dnl XIPH_TYPE_SOCKLEN_T -dnl Brendan Cully -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 -# include -#endif -#if HAVE_SYS_SOCKET_H -# include -#endif - ]) -AH_VERBATIM([X_HAVE_SOCKLEN_T], - [#ifndef HAVE_SOCKLEN_T -typedef int socklen_t; -#endif - ]) -]) diff --git a/m4/xiph_xml2.m4 b/m4/xiph_xml2.m4 index 0c992b6..1dbdaf3 100644 --- a/m4/xiph_xml2.m4 +++ b/m4/xiph_xml2.m4 @@ -52,7 +52,7 @@ ac_xslt_save_LIBS="$LIBS" ac_xslt_save_CFLAGS="$CFLAGS" LIBS="$XSLT_LIBS $LIBS" CFLAGS="$CFLAGS $XSLT_CFLAGS" -AC_CHECK_FUNC(xsltParseStylesheetFile,,[AC_MSG_ERROR([Unable to link with libxslt])]) +AC_CHECK_FUNCS([xsltSaveResultToString]) CFLAGS="$ac_xslt_save_CFLAGS" LIBS="$ac_xslt_save_LIBS" ])