SXE_DUMP_LIBS
SXE_LANG_WERROR([off])
- dnl SXE_PREPEND([-I$x_includes], [c_switch_site])
- dnl SXE_PREPEND([-L$x_libraries], [ld_switch_site])
+ dnl SXE_PREPEND_UNDUP([-I$x_includes], [c_switch_site])
+ dnl SXE_PREPEND_UNDUP([-L$x_libraries], [ld_switch_site])
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
LDFLAGS="$LDFLAGS $X_LIBS"
SXE_DUMP_LIBS
SXE_LANG_WERROR([off])
- dnl SXE_PREPEND([-I$x_includes], [c_switch_site])
- dnl SXE_PREPEND([-L$x_libraries], [ld_switch_site])
+ dnl SXE_PREPEND_UNDUP([-I$x_includes], [c_switch_site])
+ dnl SXE_PREPEND_UNDUP([-L$x_libraries], [ld_switch_site])
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
LDFLAGS="$LDFLAGS $X_LIBS"
SXE_MSG_CHECKING([for workable png version information])
SXE_DUMP_LIBS
- LDFLAGS="$LDFLAGS $PNG_LDFLAGS"
- LIBS="$LIBS $PNG_LIBS"
+ CPPFLAGS="$PNG_CPPFLAGS"
+ LDFLAGS="$PNG_LDFLAGS"
+ LIBS="$PNG_LIBS"
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#if defined HAVE_PNG_H
# include <png.h>
SXE_DUMP_LIBS
SXE_LANG_WERROR([off])
- dnl SXE_PREPEND([-I$x_includes], [c_switch_site])
- dnl SXE_PREPEND([-L$x_libraries], [ld_switch_site])
+ dnl SXE_PREPEND_UNDUP([-I$x_includes], [c_switch_site])
+ dnl SXE_PREPEND_UNDUP([-L$x_libraries], [ld_switch_site])
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
LDFLAGS="$LDFLAGS $X_LIBS"
sxe_cv_feat_ffmpeg=
## we can't use that one since we have to check multiple headers
-dnl _SXE_MM_CHECK_pkgconfig_based([ffmpeg], [libavformat], [49.0.0], [dnl
-dnl av_open_input_file av_close_input_file av_find_stream_info dnl
-dnl url_fopen av_probe_input_format avcodec_find_decoder dnl
-dnl avcodec_open av_read_frame av_seek_frame av_register_all dnl
-dnl avcodec_decode_audio avcodec_decode_audio2], [avformat.h],
-dnl [sxe_cv_feat_ffmpeg=yes], [sxe_cv_feat_ffmpeg=no])
+dnl _SXE_MM_CHECK_pkgconfig_based([ffmpeg], [libavformat], [49.0.0], [dnl
+dnl av_open_input_file av_close_input_file av_find_stream_info dnl
+dnl url_fopen av_probe_input_format avcodec_find_decoder dnl
+dnl avcodec_open av_read_frame av_seek_frame av_register_all dnl
+dnl avcodec_decode_audio avcodec_decode_audio2], [avformat.h],
+dnl [sxe_cv_feat_ffmpeg=yes], [sxe_cv_feat_ffmpeg=no])
-dnl Dropped in favour of sxe-pkgconfig.m4 macros
-dnl _SXE_CHECK_pkgconfig_based([ffmpeg], [libavformat], [49.0.0])
+dnl Dropped in favour of sxe-pkgconfig.m4 macros
+dnl _SXE_CHECK_pkgconfig_based([ffmpeg], [libavformat], [49.0.0])
SXE_PC_CHECK_VERSION_ATLEAST([libavformat], [51.0.0])
SXE_DUMP_LIBS
CPPFLAGS="$CPPFLAGS ${FFMPEG_CPPFLAGS}"
- SXE_LANG_WERROR([on])
+ SXE_LANG_WERROR([off])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#if defined HAVE_ERRNO_H
# include <errno.h>
SXE_DUMP_LIBS
MM_FAIL
SXE_CHECK_HEADERS([machine/soundcard.h sys/soundcard.h linux/soundcard.h soundcard.h])
- if test "$ac_cv_header_linux_soundcard_h"="yes" -o \
+ if test "$ac_cv_header_linux_soundcard_h"="yes" -o \
"$ac_cv_header_machine_soundcard_h"="yes" -o \
"$ac_cv_header_soundcard_h"="yes" -o \
"$ac_cv_header_sys_soundcard_h"="yes"
#else
#include <soundcard.h>
#endif
-]],
+]],
[[ ioctl(0, SNDCTL_DSP_RESET, 0); ]])],
- [oss_ioctl_linked=yes],
- [oss_ioctl_linked=no])
- if test "${oss_ioctl_linked}" = "no"
+ [oss_ioctl_linked=yes],
+ [oss_ioctl_linked=no])
+ if test "${oss_ioctl_linked}" = "no"
then
if test "${opsys}" = "netbsd"
then
ao_open_live ao_close ao_shutdown ao_play], [ao/ao.h], [$1], [$2])
])dnl SXE_MM_CHECK_AO
-AC_DEFUN([SXE_MM_CHECK_ARTS], [
- ## arg #1: action on success
- ## arg #2: action on failure
- pushdef([MM_SUCC], [$1])
- pushdef([MM_FAIL], [$2])
-
- SXE_SEARCH_CONFIG_PROG([artsc-config])
-
- AC_MSG_CHECKING([for aRts support])
- AC_MSG_RESULT([])
-
- if test "$have_artsc_config" = "no" -o -z "$ARTSC_CONFIG"; then
- AS_MESSAGE([*** artsc-config not found.])
- AS_MESSAGE([*** Cannot check for aRts.])
- have_artsc_config=no
- ARTSC_CONFIG=
- MM_FAIL
- fi
-
- if test "$have_artsc_config" = "yes"; then
- ARTS_VERSION=`$ARTSC_CONFIG --arts-version`
- ARTS_MAJOR_VERSION=`echo $ARTS_VERSION | awk -F. '{print $1}'`
- ARTS_MINOR_VERSION=`echo $ARTS_VERSION | awk -F. '{print $2}'`
-
- dnl since we are not using most of the arts features, it suffices
- dnl to have a version 1.x (x >= 0)
- dnl if test "$ARTS_MAJOR_VERSION" -eq 1 -a \
- dnl "$ARTS_MINOR_VERSION" -ge 0; then
-
- SXE_DUMP_LIBS
- ARTS_CPPFLAGS="`$ARTSC_CONFIG --cflags`"
- ARTS_LDFLAGS="-L`$ARTSC_CONFIG --libs`"
- CPPFLAGS="$CPPFLAGS $ARTS_CPPFLAGS"
- LDFLAGS="$CPPFLAGS $ARTS_LDFLAGS"
-
- MM_SUCC
- SXE_CHECK_HEADERS([artsc.h], [:], [MM_FAIL])
- AC_CHECK_LIB([artsc], [arts_init], [:], [MM_FAIL], [$arts_libs])
- AC_CHECK_LIB([artsc], [arts_free], [:], [MM_FAIL], [$arts_libs])
- AC_CHECK_LIB([artsc], [arts_write], [:], [MM_FAIL], [$arts_libs])
- AC_CHECK_LIB([artsc], [arts_play_stream], [:], [MM_FAIL], [$arts_libs])
- AC_CHECK_LIB([artsc], [arts_stream_set], [:], [MM_FAIL], [$arts_libs])
- AC_CHECK_LIB([artsc], [arts_close_stream], [:], [MM_FAIL], [$arts_libs])
-
- ## restore anything
- SXE_RESTORE_LIBS
- fi
-
- popdef([MM_SUCC])
- popdef([MM_FAIL])
-])dnl SXE_MM_CHECK_ARTS
-
AC_DEFUN([SXE_MM_CHECK_ESD], [
## arg #1: action on success
## arg #2: action on failure
SXE_DUMP_LIBS
ESD_CPPFLAGS="`$ESD_CONFIG --cflags`"
ESD_LDFLAGS="-L`$ESD_CONFIG --libs`"
- dnl SXE_APPEND([$esd_c_switch], [c_switch_site])
+ dnl SXE_APPEND_UNDUP([$esd_c_switch], [c_switch_site])
dnl SXE_PREPEND([$esd_libs], [LIBS])
CPPFLAGS="$CPPFLAGS $ESD_CPPFLAGS"
LDFLAGS="$LDFLAGS $ESD_LDFLAGS"
# include <alsa/version.h>
#endif
-int main(int c, char *v[])
+int main(int c, char *v[])
{
fprintf(stdout, SND_LIB_VERSION_STR);
return 0;
AC_MSG_WARN([Your ALSA version is _KNOWN_ to fail! Do not say we have not warned you!])
sxe_mm_alsa_version_supported_p="no"
;;
- 1.0.2 | 1.0.4* | 1.0.5* | 1.0.6* | 1.0.7* | 1.0.8* )
+ 1.0.2 | 1.0.4* | 1.0.5* | 1.0.6* | 1.0.7* | 1.0.8* )
AC_MSG_RESULT([${sxe_mm_alsa_version} (suspicious to break)])
AC_MSG_WARN([Your ALSA version has not been tested. Do not be surprised if it fails!])
sxe_mm_alsa_version_supported_p="no"
projects / sxemacs / blobdiff