diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-12-27 17:22:30 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-12-27 17:22:30 +0000 |
| commit | 30336aacf67d08014b6b17e4a1a50eccc9a05a92 (patch) | |
| tree | 7c48212e1f40e8653ade01294ee199b44153f15b /configure.ac | |
| parent | 1b34510447e4e91a1075e15ec2d31161f5419fea (diff) | |
| download | xine-lib-30336aacf67d08014b6b17e4a1a50eccc9a05a92.tar.gz xine-lib-30336aacf67d08014b6b17e4a1a50eccc9a05a92.tar.bz2 | |
**BUGFIX** (<- testing whether my automated-merging-idea works)
fix xine-lib builds without X11: HAVE_XV must not be defined conditionally,
otherwise configure will complain
also fix the Xv test for old shells with broken handling of empty variables
CVS patchset: 7307
CVS date: 2004/12/27 17:22:30
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 349da779f..9ca5ef69c 100644 --- a/configure.ac +++ b/configure.ac @@ -495,9 +495,6 @@ dnl ---------------------------------------------- dnl With recent XFree86 or Xorg, dynamic linking is preferred! dnl Only dynamic linking is possible when using libtool < 1.4.0 -dnl ---------------------------------------------- -dnl SECTION: Check for Xv and XvMC support (iconv is also tested here?) -dnl ---------------------------------------------- AC_ARG_WITH(xv-path, AC_HELP_STRING([--with-xv-path=path], [where libXv is installed]), xv_path="$withval",) @@ -507,13 +504,9 @@ AC_ARG_ENABLE(shared-xv, xv_prefer_shared="yes") if test x"$no_x" != "xyes"; then - - dnl ----------------------------------------------- - dnl Finding install Xv library - dnl ----------------------------------------------- AC_FIND_LIBXV - fi +AM_CONDITIONAL(HAVE_XV, test x$ac_have_xv = "xyes") host_or_hostalias="$host" |