On Thursday 14 Apr 2005 14:48, Daniel Kristjansson wrote:
> On Thu, 2005-04-14 at 14:35 +0100, Stuart Morgan wrote:
> > On Thursday 14 Apr 2005 14:28, Stuart Morgan wrote:
> > > I mentioned last week on the user list that the new configure script
> > > does not do any checking of the 64bit library path (/usr/lib64/ or
> > > /usr/local/lib64/)
> >
> > Forgot "/usr/X11R6/lib64/" too. (You get the idea :) )
>
> Patch?
Patch attached. My editor trims trailing whitespace from lines and I think
that is the cause of the differences on some lines which were unrelated to my
changes.
With the changes configure detects the lirc, xv and xvmc libs without trouble
on my system.
Feel free to amend the patch as needed.
--
Stuart Morgan
Index: configure
===================================================================
RCS file: /var/lib/mythcvs/mythtv/configure,v
retrieving revision 1.50
diff -u -r1.50 configure
--- configure 13 Apr 2005 20:35:55 -0000 1.50
+++ configure 14 Apr 2005 15:16:13 -0000
@@ -474,7 +474,7 @@
esac
# find source path
-# XXX: we assume an absolute path is given when launching configure,
+# XXX: we assume an absolute path is given when launching configure,
# except in './configure' case.
source_path="`echo $0 | sed -e 's#/configure##'`"
source_path_used="yes"
@@ -491,7 +491,7 @@
for opt do
case "$opt" in
--compile-type=*) compile_type=`echo $opt | cut -d '=' -f 2`
- ;;
+ ;;
--prefix=*) prefix=`echo $opt | cut -d '=' -f 2`
;;
--mandir=*) mandir=`echo $opt | cut -d '=' -f 2`
@@ -765,7 +765,7 @@
else
gcc_version="`$cc -v 2>&1 | grep version | cut -d ' ' -f3-`"
case "$gcc_version" in
- *2.95*)
+ *2.95*)
CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer"
;;
*3.*)
@@ -859,7 +859,7 @@
ARCHFLAGS="-mcpu=$cpu_raw $ARCHFLAGS"
fi
-# AltiVec flags: The FSF version of GCC differs from the Apple version
+# AltiVec flags: The FSF version of GCC differs from the Apple version
if test $cpu = "powerpc"; then
if test $altivec = "yes"; then
if test -n "`$cc -v 2>&1 | grep version | grep Apple`"; then
@@ -914,7 +914,7 @@
optimize="small"
fi
-# if no tune setting and we know cpu class look at $processor
+# if no tune setting and we know cpu class look at $processor
if test x"$tune" = x"generic" -a x"$cpu_overide" != x"yes"; then
# first try to tune based on processor info
@@ -1335,7 +1335,7 @@
# currently only used on i386 for MMX builtins
cat > $TMPC << EOF
#include <xmmintrin.h>
-int main(void) {
+int main(void) {
#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
return 0;
#else
@@ -1609,7 +1609,9 @@
lirc="no"
lirc_c1=`ls /usr/lib/liblirc_client.so* 2> /dev/null | head -n 1`
lirc_c2=`ls /usr/local/lib/liblirc_client.so* 2> /dev/null | head -n 1`
- if test x"$lirc_c1" != x"" -o x"$lirc_c2" != x"" ; then
+ lirc_c3=`ls /usr/lib64/liblirc_client.so* 2> /dev/null | head -n 1`
+ lirc_c4=`ls /usr/local/lib64/liblirc_client.so* 2> /dev/null | head -n 1`
+ if test x"$lirc_c1" != x"" -o x"$lirc_c2" != x"" -o x"$lirc_c3" != x"" -o x"$lirc_c4" != x"" ; then
lirc="yes"
fi
fi
@@ -1633,11 +1635,13 @@
libiec1=`ls /usr/local/lib/libiec61883* 2> /dev/null | head -n 1`
libiec2=`ls /usr/lib/libiec61883* 2> /dev/null | head -n 1`
libiec3=`ls /usr/lib64/libiec61883* 2> /dev/null | head -n 1`
- if test x"$libiec1" != x"" -o x"$libiec2" != x"" -o x"$libiec3" != x"" ; then
+ libiec4=`ls /usr/local/lib64/libiec61883* 2> /dev/null | head -n 1`
+ if test x"$libiec1" != x"" -o x"$libiec2" != x"" -o x"$libiec3" != x"" -o x"$libiec4" != x"" ; then
libraw1=`ls /usr/local/lib/libraw1394* 2> /dev/null | head -n 1`
libraw2=`ls /usr/lib/libraw1394* 2> /dev/null | head -n 1`
libraw3=`ls /usr/lib64/libraw1394* 2> /dev/null | head -n 1`
- if test x"$libraw1" != x"" -o x"$libraw2" != x"" -o x"$libraw3" != x"" ; then
+ libraw3=`ls /usr/local/lib64/libraw1394* 2> /dev/null | head -n 1`
+ if test x"$libraw1" != x"" -o x"$libraw2" != x"" -o x"$libraw3" != x"" -o x"$libraw4" != x"" ; then
firewire_cable_box="yes"
fi
fi
@@ -1665,7 +1669,9 @@
if test x"$xv" = x"yes" ; then
xv="no"
- if test x`ls /usr/X11R6/lib/libXv.* 2> /dev/null | head -n 1` != x"" ; then
+ libxv_c1=`ls /usr/X11R6/lib/libXv.* 2> /dev/null | head -n 1`
+ libxv_c2=`ls /usr/X11R6/lib64/libXv.* 2> /dev/null | head -n 1`
+ if test x"$libxv_c1" != x"" -o x"$libxv_c2" != x"" ; then
xv="yes"
fi
fi
@@ -1673,24 +1679,33 @@
VENDOR_XVMC_LIBS=""
if test x"$xvmc" = x"yes"; then
xvmc="no"
- nvidia_xvmc=`ls /usr/X11R6/lib/libXvMCNVIDIA* 2> /dev/null | head -n 1`
- if test x`ls /usr/X11R6/lib/libXvMCW.* 2> /dev/null | head -n 1` != x"" ; then
+ nvidia_xvmc_c1=`ls /usr/X11R6/lib/libXvMCNVIDIA* 2> /dev/null | head -n 1`
+ nvidia_xvmc_c2=`ls /usr/X11R6/lib64/libXvMCNVIDIA* 2> /dev/null | head -n 1`
+ w_xvmc_c1=`ls /usr/X11R6/lib/libXvMCW.* 2> /dev/null | head -n 1`
+ w_xvmc_c2=`ls /usr/X11R6/lib64/libXvMCW.* 2> /dev/null | head -n 1`
+ I810_xvmc_c1=`ls /usr/X11R6/lib/libI810XvMC.* 2> /dev/null | head -n 1`
+ I810_xvmc_c2=`ls /usr/X11R6/lib64/libI810XvMC.* 2> /dev/null | head -n 1`
+ if test x"$w_xvmc_c1" != x"" -o x"$w_xvmc_c2" != x"" ; then
VENDOR_XVMC_LIBS="-lXvMCW"
xvmc="yes"
- elif test x"$nvidia_xvmc" != x""; then
+ elif test x"$nvidia_xvmc_c1" != x"" -o x"$nvidia_xvmc_c2" != x"" ; then
VENDOR_XVMC_LIBS="-lXvMCNVIDIA"
xvmc="yes"
- elif test x`ls /usr/X11R6/lib/libI810XvMC.* 2> /dev/null | head -n 1` != x"" ; then
+ elif test x"$I810_xvmc_c1" != x"" -o x"$I810_xvmc_c2" != x"" ; then
VENDOR_XVMC_LIBS="-lI810XvMC"
xvmc="yes"
fi
fi
-if test x`ls /usr/X11R6/lib/libviaXvMC.* 2> /dev/null | head -n 1` = x"" ; then
+libviaXvMC_c1=`ls /usr/X11R6/lib/libviaXvMC.* 2> /dev/null | head -n 1`
+libviaXvMC_c2=`ls /usr/X11R6/lib64/libviaXvMC.* 2> /dev/null | head -n 1`
+if test x"$libviaXvMC_c1" = x"" -o x"$libviaXvMC_c2" = x"" ; then
xvmc_vld="no"
fi
if test x"$xvmc_vld" = x"yes" ; then
- if test x`ls /usr/X11R6/lib/libXvMCW.* 2> /dev/null | head -n 1` != x"" ; then
+ libxvmcw_c1=`ls /usr/X11R6/lib/libXvMCW.* 2> /dev/null | head -n 1`
+ libxvmcw_c2=`ls /usr/X11R6/lib64/libXvMCW.* 2> /dev/null | head -n 1`
+ if test x"$libxvmcw_c1" != x"" -o x"$libxvmcw_c2" != x""; then
VENDOR_XVMC_LIBS="-lXvMCW"
else
VENDOR_XVMC_LIBS="-lviaXvMC"
_______________________________________________
mythtv-dev mailing list
[email protected]
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-dev
