Resubmit, try 2: correct X11 library path on x86_64

[Pavel Roskin]

Hello!

When compiling Wine on x86_64, it's compiled for i386 by default.
However, when configure looks for the location of the X11 libraries, it
finds the directory where 64-bit libraries are located.

This is a bug in imake that uses /lib/cpp rather than "$CC -E", and in
autoconf that doesn't try to work around this bug in imake.  I think it
would be easier to fix Wine for now rather than wait for autoconf.

Fedora uses /usr/X11R6/lib64 for 64-bit and /usr/X11R6/lib for 32-bit.
Ubuntu uses /usr/X11R6/lib for 64-bit and /usr/X11R6/lib32 for 32-bit.

This patch adds both /usr/X11R6/lib and /usr/X11R6/lib32 to the linker
search path.  Having extra paths won't hurt, even if they are missing.
The linker will find files for the right architecture.

ChangeLog:
	Workaround autoconf failure to find correct path to X11
	libraries when compiling on x64_64 for i386.

--- configure.ac
+++ configure.ac
@@ -40,6 +40,7 @@
       test -n "$LD" || LD="ld -m elf_i386"
       test -n "$AS" || AS="as --32"
       host_cpu="i386"
+      LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L/usr/X11R6/lib32"
     fi
     ;;
 esac



-- 
Regards,
Pavel Roskin