PATCH: handle lib64 distros with arts/esd

Marcus Meissner marcus at jet.franken.de
Tue Apr 4 02:17:40 CDT 2006


Hi,

This is a fix for bug 4979, where the
configure autodetects artsc and esound, but in the 64bit
directories.

Problem is that arts-config and esd-config cannot handle biarch correctly,
but the development headers could be there just fine.

Ciao, Marcus

Changelog:
	Replace /lib64/ by /lib/ on 64 -> 32bit biarch builds
	for Arts Client and Esound.

Index: configure.ac
===================================================================
RCS file: /home/wine/wine/configure.ac,v
retrieving revision 1.464
diff -u -r1.464 configure.ac
--- configure.ac	30 Mar 2006 11:46:45 -0000	1.464
+++ configure.ac	4 Apr 2006 07:16:01 -0000
@@ -32,6 +32,7 @@
 fi
 
 AC_CANONICAL_HOST
+is64to32build="no"
 case $host in
   x86_64*linux*)
     if test "x$enable_win64" != "xyes"
@@ -39,6 +40,7 @@
       test -n "$CC" || CC="gcc -m32"
       test -n "$LD" || LD="ld -m elf_i386"
       test -n "$AS" || AS="as --32"
+      is64to32build="yes"
       host_cpu="i386"
     fi
     ;;
@@ -709,6 +712,11 @@
       esac
     done
     ARTSC_LIBS=`$ARTSCCONFIG --libs`
+    dnl Fixup the /lib64 from native artsc-config script.
+    if test "$is64to32build" == "yes" ;
+    then
+	ARTSC_LIBS=`echo $ARTSC_LIBS|sed -e "s/lib64/lib/g"`
+    fi
     save_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS $ARTSC_CFLAGS"
     AC_CHECK_LIB(artsc,arts_init,
@@ -732,6 +740,10 @@
       esac
     done
     ESD_LIBS=`$ESDCONFIG --libs`
+    if test "$is64to32build" == "yes" ;
+    then
+	ESD_LIBS=`echo $ESD_LIBS|sed -e "s/lib64/lib/g"`
+    fi
     save_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS $ESD_CFLAGS"
     AC_CHECK_LIB(esd,esd_open_sound,



More information about the wine-patches mailing list