Alexandre Julliard : configure: Default to / lib64 as libdir for 64-bit builds, and use plain /lib for 32-bit builds.

Alexandre Julliard julliard at winehq.org
Wed Apr 21 10:40:23 CDT 2010


Module: wine
Branch: master
Commit: b32653235a03d1edca3d5698a1dcbd6ea56e2fb0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b32653235a03d1edca3d5698a1dcbd6ea56e2fb0

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Apr 21 12:28:22 2010 +0200

configure: Default to /lib64 as libdir for 64-bit builds, and use plain /lib for 32-bit builds.

---

 configure    |    4 +++-
 configure.ac |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 93b12c8..783b776 100755
--- a/configure
+++ b/configure
@@ -4123,7 +4123,9 @@ then
     enable_fonts=${enable_fonts:-no}
     enable_server=${enable_server:-no}
     enable_tools=${enable_tools:-no}
-    test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib32"
+elif test "x$enable_win64" = "xyes"
+then
+    test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64"
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the directory containing the Wine tools" >&5
diff --git a/configure.ac b/configure.ac
index 4aa7cfd..83b3240 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,7 +192,9 @@ then
     enable_fonts=${enable_fonts:-no}
     enable_server=${enable_server:-no}
     enable_tools=${enable_tools:-no}
-    test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib32"
+elif test "x$enable_win64" = "xyes"
+then
+    test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64"
 fi
 
 AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir,




More information about the wine-cvs mailing list