diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index dfb9ce14b..f654e91d4 100644 --- a/configure.ac +++ b/configure.ac @@ -659,7 +659,7 @@ case "$host_or_hostalias" in hppa*) if test x$ac_have_xv_static = "xyes"; then echo "warning: hppa linker - disabling static libXv" - XV_LIB="libXv.so" + XV_LIBS="libXv.so" fi ;; @@ -694,7 +694,7 @@ if test x$x_includes != "x"; then CPPFLAGS="$CPPFLAGS -I$x_includes" fi -XXMC_LIB="-L$xxmc_path -l$xxmc_stub" +XXMC_LIBS="-L$xxmc_path -l$xxmc_stub" AC_MSG_CHECKING(whether to enable the xxmc plugin with vld extensions) AC_MSG_RESULT() dnl Check if vld "extended" XvMC is available @@ -703,15 +703,15 @@ if test x$xxmc_stub == "xXvMCW" && test x$ac_have_xv == "xyes"; then ac_have_xxmc="yes", [ac_have_xxmc="no" AC_MSG_RESULT([*** Could not link with -l$xxmc_stub for vld extensions.])], - [-L$xxmc_path $X_LIBS $X_PRE_LIBS $XV_LIB -lXext $X_EXTRA_LIBS]) + [-L$xxmc_path $X_LIBS $X_PRE_LIBS $XV_LIBS -lXext $X_EXTRA_LIBS]) else if test x$ac_have_xv = "xyes"; then AC_CHECK_LIB($xxmc_stub, XvMCPutSlice, [ac_have_xxmc="yes" - XXMC_LIB="$XXMC_LIB -lXvMC"], + XXMC_LIBS="$XXMC_LIBS -lXvMC"], [ac_have_xxmc="no" AC_MSG_RESULT([*** Could not link with -l$xxmc_stub -lXvMC for vld extensions.])], - [-L$xxmc_path -lXvMC $X_LIBS $X_PRE_LIBS $XV_LIB -lXext $X_EXTRA_LIBS]) + [-L$xxmc_path -lXvMC $X_LIBS $X_PRE_LIBS $XV_LIBS -lXext $X_EXTRA_LIBS]) else ac_have_xxmc="no", fi @@ -733,15 +733,15 @@ if test x$ac_have_xxmc = "xno"; then ac_have_xxmc="yes", [ac_have_xxmc="no" AC_MSG_RESULT([*** Could not link with -l$xxmc_stub for standard XvMC.])], - [-L$xxmc_path $X_LIBS $X_PRE_LIBS $XV_LIB -lXext $X_EXTRA_LIBS]) + [-L$xxmc_path $X_LIBS $X_PRE_LIBS $XV_LIBS -lXext $X_EXTRA_LIBS]) else if test x$ac_have_xv = "xyes"; then AC_CHECK_LIB($xxmc_stub, XvMCCreateContext, [ac_have_xxmc="yes" - XXMC_LIB="$XXMC_LIB -lXvMC"], + XXMC_LIBS="$XXMC_LIBS -lXvMC"], [ac_have_xxmc="no" AC_MSG_RESULT([*** Could not link with -lXvMC for standard XvMC.])], - [-L$xxmc_path -lXvMC $X_LIBS $X_PRE_LIBS $XV_LIB -lXext $X_EXTRA_LIBS]) + [-L$xxmc_path -lXvMC $X_LIBS $X_PRE_LIBS $XV_LIBS -lXext $X_EXTRA_LIBS]) else ac_have_xxmc="no", fi @@ -765,7 +765,7 @@ LIBS="$saved_libs" fi AM_CONDITIONAL(HAVE_VLDXVMC, test x$ac_have_vldxvmc_h = "xyes") AM_CONDITIONAL(HAVE_XXMC, test x$ac_have_xxmc = "xyes") -AC_SUBST(XXMC_LIB) +AC_SUBST(XXMC_LIBS) dnl dnl Check if we can enable the xvmc plugin. @@ -779,7 +779,7 @@ AC_ARG_WITH(xvmc-lib, AC_HELP_STRING([--with-xvmc-lib=XXXX], [The name of the Xv libXXXX.so for the xvmc plugin.]),xvmc_stub="$withval", xvmc_stub="XvMCW") saved_libs="$LIBS" -XVMC_LIB="-L$xvmc_path -l$xvmc_stub" +XVMC_LIBS="-L$xvmc_path -l$xvmc_stub" AC_MSG_CHECKING(whether to enable the xvmc plugin) AC_MSG_RESULT() if test x$xvmc_stub == "xXvMCW"; then @@ -787,15 +787,15 @@ if test x$xvmc_stub == "xXvMCW"; then ac_have_xvmc="yes", [ac_have_xvmc="no" AC_MSG_RESULT([*** Could not link with -l$xvmc_stub.])], - [-L$xvmc_path $X_LIBS $X_PRE_LIBS $XV_LIB -lXext $X_EXTRA_LIBS]) + [-L$xvmc_path $X_LIBS $X_PRE_LIBS $XV_LIBS -lXext $X_EXTRA_LIBS]) else if test x$ac_have_xv = "xyes"; then AC_CHECK_LIB($xvmc_stub, XvMCCreateContext, [ac_have_xvmc="yes" - XVMC_LIB="$XVMC_LIB -lXvMC"], + XVMC_LIBS="$XVMC_LIBS -lXvMC"], [ac_have_xvmc="no" AC_MSG_RESULT([*** Could not link with -lXvMC.])], - [-L$xvmc_path -lXvMC $X_LIBS $X_PRE_LIBS $XV_LIB -lXext $X_EXTRA_LIBS]) + [-L$xvmc_path -lXvMC $X_LIBS $X_PRE_LIBS $XV_LIBS -lXext $X_EXTRA_LIBS]) else ac_have_xvmc="no", fi @@ -814,7 +814,7 @@ CPPFLAGS="$saved_CPPFLAGS" LIBS="$saved_libs" fi AM_CONDITIONAL(HAVE_XVMC, test x$ac_have_xvmc = "xyes") -AC_SUBST(XVMC_LIB) +AC_SUBST(XVMC_LIBS) dnl --------------------------------------------- |