[PATCH] configure: Run wine64 apps from the build tree

[Detlef Riekenberg]

---
 configure.ac         |    6 ++++++
 tools/make_makefiles |    1 +
 tools/winewrapper    |    6 +++++-
 3 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 51d0533..353b1f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,6 +139,7 @@ case $host in
       AS="${AS:-as} -arch x86_64"
       host_cpu="x86_64"
       notice_platform="64-bit "
+      symlink_wine64="yes"
       AC_SUBST(TARGETFLAGS,"-m64")
     else
       CC="$CC -m32"
@@ -175,6 +176,7 @@ case $host in
                           [AC_MSG_RESULT([no])
                            AC_MSG_ERROR([You need gcc >= 4.4 to build Wine as 64-bit.])])
       fi
+      symlink_wine64="yes"
       AC_SUBST(TARGETFLAGS,"-m64")
     fi
     ;;
@@ -2346,6 +2348,10 @@ WINE_CONFIG_SYMLINK(fonts/tahoma.ttf,,enable_fonts)
 WINE_CONFIG_SYMLINK(fonts/tahomabd.ttf,,enable_fonts)
 WINE_CONFIG_SYMLINK(tools/l_intl.nls)
 WINE_CONFIG_SYMLINK(wine,tools/winewrapper)
+if test "$symlink_wine64" = "yes"
+then
+WINE_CONFIG_SYMLINK(wine64,tools/winewrapper)
+fi
 
 WINE_CONFIG_EXTRA_DIR(dlls/gdi32/dibdrv)
 WINE_CONFIG_EXTRA_DIR(dlls/gdi32/enhmfdrv)
diff --git a/tools/make_makefiles b/tools/make_makefiles
index 182aef5..718dbe3 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -88,6 +88,7 @@ my @ignores = (
     "/TAGS",
     "/tags",
     "/wine",
+    "/wine64",
     "Makefile",
     "dlldata.c",
     "dlls/*/*.def",
diff --git a/tools/winewrapper b/tools/winewrapper
index a4d17ac..9aea1d1 100755
--- a/tools/winewrapper
+++ b/tools/winewrapper
@@ -81,7 +81,11 @@ else
   export LD_LIBRARY_PATH
 fi
 
-if [ -x "$topdir/loader/wine" ]
+winename=`basename "$0"`
+
+if [ -x "$topdir/loader/$winename" ]
+then WINELOADER="$topdir/loader/$winename"
+elif [ -x "$topdir/loader/wine" ]
 then WINELOADER="$topdir/loader/wine"
 elif [ -x "$topdir/loader/wine64" ]
 then WINELOADER="$topdir/loader/wine64"
-- 
1.7.1