From b5e3601f8615576d2e5a06c2177331a476de2ef6 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Sun, 8 May 2005 22:38:35 +0000
Subject: file is probably in /usr/bin, but don't assume so. [Bug no. 1195539]

CVS patchset: 7532
CVS date: 2005/05/08 22:38:35
---
 ChangeLog    | 1 +
 configure.ac | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index a09ed8bf9..7a47c508f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@ xine-lib (1.0.2)
   * improve xxmc cpu-usage for IDCT / MOCOMP acceleration through better locking
     [bug #1195282]
   * gcc4 build patches [bug #1175002]
+  * don't assume that file is in /usr/bin (build fix) [bug #1195539]
 
 xine-lib (1.0.1)
   * Big XvMC quality / correctness / cpu-usage fix. [bug #1114517] 
diff --git a/configure.ac b/configure.ac
index f281d2524..9dc4ae2c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,6 +117,7 @@ dnl ---------------------------------------------
 dnl Save CFLAGS, AC_ISC_POSIX set some unwanted default CFLAGS
 saved_CFLAGS="$CFLAGS"
 AC_ISC_POSIX
+AC_PATH_MAGIC
 CFLAGS="$saved_CFLAGS"
 AC_PROG_CC
 AC_HEADER_STDC
@@ -281,7 +282,7 @@ case $host in
  echo 'int i;' > conftest.$ac_ext
  xine_cv_cc_64bit_output=no
  if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.$ac_objext` in
+ case `"$MAGIC_CMD" conftest.$ac_objext` in
  *"ELF 64"*)
    xine_cv_cc_64bit_output=yes
    ;;
-- 
cgit v1.2.3