diff --git a/m4/acx_pthread.m4 b/m4/acx_pthread.m4 index 5feab5ed4be3a350e7f42b211cf7d6384025395f..eba50c7281e4be5cbb5b04edac60560266772edf 100644 --- a/m4/acx_pthread.m4 +++ b/m4/acx_pthread.m4 @@ -162,7 +162,7 @@ if test "x$acx_pthread_ok" = xyes; then esac AC_MSG_RESULT(${flag}) if test "x$flag" != xno; then - PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" + PTHREAD_CPPFLAGS="$flag $PTHREAD_CPPFLAGS" fi AC_CHECK_TYPES(pthread_rwlock_t,,,[#include ]) @@ -177,6 +177,7 @@ 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: diff --git a/m4/xiph_compiler.m4 b/m4/xiph_compiler.m4 new file mode 100644 index 0000000000000000000000000000000000000000..692629386729df9fa91bc1e0ecdff806dfdc4655 --- /dev/null +++ b/m4/xiph_compiler.m4 @@ -0,0 +1,149 @@ +dnl xiph_compiler.m4 +dnl $Id: xiph_compiler.m4,v 1.1 2003/06/24 00:58:10 brendan Exp $ + +dnl XIPH_CLEAN_CCFLAGS +dnl Brendan Cully 20030612 +dnl +# XIPH_CLEAN_CCFLAGS(flag-list, dest-shell-var-name) +# Filters out duplicate compiler flags +# Operates right-to-left on -l flags, left-to-right on everything else +# eg XIPH_CLEAN_CCFLAGS([-L/opt/lib -lfoo -lm -L/opt/lib -lbar -lm], [MY_LDFLAGS]) +# => MY_LDFLAGS="-L/opt/lib -lfoo -lbar -lm" +# the cat< /dev/null + then + xcc_REV_FLAGS="$flag $xcc_REV_FLAGS" + fi + esac +done + +for flag in $xcc_REV_FLAGS +do + if { cat < /dev/null + then + $2="$flag $$2" + fi +done +])dnl XIPH_CLEAN_CCFLAGS + +dnl XIPH_FUNC_VA_COPY +dnl Karl Heyes +dnl +# XIPH_FUNC_VA_COPY +# Test for implementation of va_copy, or define appropriately if missing +AC_DEFUN([XIPH_FUNC_VA_COPY], +[dnl +AC_MSG_CHECKING([for va_copy]) +AC_TRY_LINK([#include ], [va_list ap1, ap2; va_copy(ap1, ap2);], + AC_MSG_RESULT([va_copy]), + [dnl + AH_TEMPLATE([va_copy], [define if va_copy is not available]) + AC_TRY_LINK([#include ], [va_list ap1, ap2; __va_copy(ap1, ap2);], + [dnl + AC_DEFINE([va_copy], [__va_copy]) + AC_MSG_RESULT([__va_copy])], + [dnl + AC_DEFINE([va_copy(dest,src)], [memcpy(&dest,&src,sizeof(va_list))]) + AC_MSG_RESULT([memcpy]) + ]) + ]) +]) +])dnl XIPH_FUNC_VA_COPY + +dnl XIPH_C_ATTRIBUTE +dnl Karl Heyes +dnl +# XIPH_C_ATTRIBUTE +# 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]) +]) +])dnl XIPH_C_ATTRIBUTE + +dnl XIPH_GCC_INCLUDE_WARNING +dnl Karl Heyes +dnl +# XIPH_GCC_INCLUDE_WARNING(include-dir, action-if-warning, action-if-not) +# Tests whether GCC emits a warning if explicitly asked to put include-dir +# in its include path, because GCC is already including that path by default +AC_DEFUN([XIPH_GCC_INCLUDE_WARNING], +[AC_REQUIRE([AC_PROG_CC]) +xgiw_warning=no +if test x"$GCC" = "xyes" +then + save_cflags="$CFLAGS" + CFLAGS="-Werror -I$1" + AC_TRY_COMPILE(,,,xgiw_warning=yes) + CFLAGS="$save_cflags" +fi +if test "$xgiw_warning" = "yes" +then + ifelse([$2],,:,[$2]) +else + ifelse([$3],,:,[$3]) +fi +])dnl XIPH_GCC_INCLUDE_WARNING + +dnl XIPH_VAR_APPEND +dnl Karl Heyes +dnl +# XIPH_VAR_APPEND(shell-var, list) +# Append each item in list to shell-var iff shell-var doesn't already have it +# eg XIPH_VAR_APPEND([CFLAGS], [-O2 -I/opt/packages/include]) +AC_DEFUN([XIPH_VAR_APPEND], +[dnl +AC_REQUIRE([AC_PROG_FGREP]) +for arg in $2 +do + if { cat < /dev/null + then + $1="$$1 $arg" + fi +done +])dnl XIPH_VAR_APPEND + +dnl XIPH_VAR_PREPEND +dnl Karl Heyes +dnl +# XIPH_VAR_PREPEND(shell-var, list) +# see XIPH_VAR_APPEND +AC_DEFUN([XIPH_VAR_PREPEND], +[dnl +AC_REQUIRE([AC_PROG_FGREP]) +xvp_compare="$1" +filtered="" +for arg in $2 +do + if { cat < /dev/null + then + compare="$arg $compare" + filtered="$filtered $arg" + fi +done +$1="$filtered $$1" +])dnl XIPH_VAR_PREPEND