Workaround for incorrect X11 library path on FC4/x86_64

Pavel Roskin proski at gnu.org
Mon Jul 11 16:26:55 CDT 2005


Changelog:
	* configure.ac
	when building for 32 bit on a 64 bit platform, AC_PATH_XTRA can
	find path to 64-libraries, which is not suitable for the build.
	This was found on Fedora Core 4 for x86_64.  The right fix
	belongs to autoconf.  The workaround is to scan X_LIBS and
	replace lib64 with lib.

Index: configure.ac
===================================================================
RCS file: /home/wine/wine/configure.ac,v
retrieving revision 1.372
diff -u -r1.372 configure.ac
--- configure.ac	10 Jul 2005 17:42:46 -0000	1.372
+++ configure.ac	11 Jul 2005 21:19:38 -0000
@@ -40,6 +40,7 @@
       test -n "$LD" || LD="ld -m elf_i386"
       test -n "$AS" || AS="as --32"
       host_cpu="i386"
+      m32build=1
     fi
     ;;
 esac
@@ -88,6 +89,9 @@
 AC_SUBST(TOOLSDIR,$wine_cv_toolsdir)
 
 AC_PATH_XTRA
+if test -n "$m32build"; then
+	X_LIBS=`echo $X_LIBS | sed 's,/lib64,/lib,g'`
+fi
 AC_PROG_LEX
 
 dnl **** Just additional warning checks, since AC_PROG just sets 'lex' even


-- 
Regards,
Pavel Roskin




More information about the wine-patches mailing list