diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 52f31ecb4..552a696a1 100644 --- a/configure.ac +++ b/configure.ac @@ -1081,18 +1081,11 @@ AC_ARG_WITH([pulseaudio], if test "x$with_pulseaudio" != "xno"; then PKG_CHECK_MODULES([PULSEAUDIO], [libpulse], [have_pulseaudio="yes"], [have_pulseaudio="no"]) - if test x"$have_pulseaudio" = xyes; then - AC_MSG_CHECKING([for pulseaudio >= 0.9.7]) - PKG_CHECK_EXISTS([libpulse >= 0.9.7], - [have_pulseaudio_0_9_7="yes"], - [have_pulseaudio_0_9_7="no"]) - AC_MSG_RESULT([$have_pulseaudio_0_9_7]) - if test x"$have_pulseaudio_0_9_7" = xyes; then - AC_DEFINE([HAVE_PULSEAUDIO_0_9_7], 1, [define this if you have pulseaudio >= 0.9.7]) - fi - fi fi + AM_CONDITIONAL(HAVE_PULSEAUDIO, [test "x$have_pulseaudio" = x"yes"]) +AC_SUBST([PULSEAUDIO_CFLAGS]) +AC_SUBST([PULSEAUDIO_LIBS]) dnl --------------------------------------------- dnl check for DirectX @@ -2449,11 +2442,6 @@ XINE_REL_FONTDIR="`makeexpand "$XINE_FONTDIR" | sed -e "s,^${prefix}/,,"`" XINE_REL_LOCALEDIR="`makeexpand "$XINE_LOCALEDIR" | sed -e "s,^${prefix}/,,"`" XINE_PKGCONFIG_DIR="`makeexpand "$pkgconfigdir"`" if test "x$SYS" = "xmingw32" -o "x$SYS" = "xcygwin"; then - dnl polish paths (MinGW runtime accepts both \ and / anyway) - XINE_REL_PLUGINROOT="`echo "$XINE_REL_PLUGINROOT" | sed -e 's/\\//\\\\\\\\/g'`" - XINE_REL_PLUGINDIR="$XINE_REL_PLUGINROOT.$XINE_LT_AGE" - XINE_REL_FONTDIR="`echo "$XINE_REL_FONTDIR" | sed -e 's/\\//\\\\\\\\/g'`" - XINE_REL_LOCALEDIR="`echo "$XINE_REL_LOCALEDIR" | sed -e 's/\\//\\\\\\\\/g'`" dnl prefix in xine-config XINE_CONFIG_PREFIX="\$(cd \$(dirname \$0)/..; pwd)" dnl installation directories (in xine-config) |