[PATCH 1/3] Compile oleaut32 for win32 but not for win64

[Pavel Roskin]

From: Pavel Roskin <proski at gnu.org>


---

 configure.ac     |    6 ++++++
 dlls/Makefile.in |    4 ++--
 dlls/make_dlls   |    1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 53a3126..4da5f67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,6 +50,12 @@ then
   WIN16_INSTALL=""
 fi
 
+AC_SUBST(WIN32FILES,"\$(WIN32FILES)")
+if test "x$enable_win64" = "xyes"
+then
+  WIN32FILES=""
+fi
+
 dnl **** Check for some programs ****
 
 AC_PROG_MAKE_SET
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index ff767a4..9824c98 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -11,7 +11,8 @@ GLU32FILES = glu32
 GLUT32FILES = glut32
 OPENGLFILES = opengl32 wined3d
 XFILES = winex11.drv
-EXTRADIRS = @GLU32FILES@ @GLUT32FILES@ @OPENGLFILES@ @XFILES@
+WIN32FILES = oleaut32
+EXTRADIRS = @GLU32FILES@ @GLUT32FILES@ @OPENGLFILES@ @XFILES@ @WIN32FILES@
 
 # Subdir list
 
@@ -126,7 +127,6 @@ BASEDIRS = \
 	odbccp32 \
 	ole32 \
 	oleacc \
-	oleaut32 \
 	olecli32 \
 	oledlg \
 	olepro32 \
diff --git a/dlls/make_dlls b/dlls/make_dlls
index f85fd89..0d40a18 100755
--- a/dlls/make_dlls
+++ b/dlls/make_dlls
@@ -33,6 +33,7 @@ my %special_dlls =
 (
   "glu32"    => "GLU32FILES",
   "glut32"   => "GLUT32FILES",
+  "oleaut32" => "WIN32FILES",
   "opengl32" => "OPENGLFILES",
   "wined3d"  => "OPENGLFILES",
   "winex11.drv" => "XFILES"