Fix configure changes

This commit is contained in:
Zebediah Figura
2018-02-23 14:52:23 -06:00
parent e180b2e4dd
commit 7b0a3f25ac
11 changed files with 91 additions and 108 deletions

View File

@@ -1,4 +1,4 @@
From 7ce95ff47cea6dab389a8f7bc7db0d8daddba5e1 Mon Sep 17 00:00:00 2001
From 406f6a268d3b4b831e4daaccc5fa2f4877be151b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 9 Aug 2015 02:38:18 +0200
Subject: [PATCH] uxthemegtk: Add configure check and stub dll.
@@ -6,13 +6,13 @@ Subject: [PATCH] uxthemegtk: Add configure check and stub dll.
List of functions updated by Ivan Akulinchev <ivan.akulinchev@gmail.com>.
---
aclocal.m4 | 20 ++++
configure.ac | 24 ++++-
configure.ac | 22 ++++
dlls/uxtheme-gtk/Makefile.in | 7 ++
dlls/uxtheme-gtk/uxtheme-gtk.spec | 1 +
dlls/uxtheme-gtk/uxtheme.c | 218 ++++++++++++++++++++++++++++++++++++++
dlls/uxtheme-gtk/uxthemegtk.h | 88 +++++++++++++++
dlls/uxtheme-gtk/version.rc | 21 ++++
7 files changed, 378 insertions(+), 1 deletion(-)
7 files changed, 377 insertions(+)
create mode 100644 dlls/uxtheme-gtk/Makefile.in
create mode 100644 dlls/uxtheme-gtk/uxtheme-gtk.spec
create mode 100644 dlls/uxtheme-gtk/uxtheme.c
@@ -51,7 +51,7 @@ index 3688165..fbc5ebf 100644
dnl
dnl Usage: WINE_TRY_ASM_LINK(asm-code,includes,function,[action-if-found,[action-if-not-found]])
diff --git a/configure.ac b/configure.ac
index 59d392a..ef9419c 100644
index 7b796ef..e27f922 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,6 +56,7 @@ AC_ARG_WITH(gsm, AS_HELP_STRING([--without-gsm],[do not use libgsm (GSM 06
@@ -62,7 +62,7 @@ index 59d392a..ef9419c 100644
AC_ARG_WITH(hal, AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)]))
AC_ARG_WITH(jpeg, AS_HELP_STRING([--without-jpeg],[do not use JPEG]))
AC_ARG_WITH(krb5, AS_HELP_STRING([--without-krb5],[do not use krb5 (Kerberos)]))
@@ -1490,6 +1491,26 @@ fi
@@ -1441,6 +1442,26 @@ fi
WINE_NOTICE_WITH(cms,[test "$ac_cv_lib_lcms2_cmsOpenProfileFromFile" != "yes"],
[liblcms2 ${notice_platform}development files not found, Color Management won't be supported.])
@@ -89,19 +89,17 @@ index 59d392a..ef9419c 100644
dnl **** Check for FreeType 2 ****
if test "x$with_freetype" != "xno"
then
@@ -3715,7 +3736,8 @@ WINE_CONFIG_TEST(dlls/userenv/tests)
@@ -3627,6 +3648,7 @@ WINE_CONFIG_TEST(dlls/userenv/tests)
WINE_CONFIG_DLL(usp10)
WINE_CONFIG_TEST(dlls/usp10/tests)
WINE_CONFIG_LIB(uuid)
-WINE_CONFIG_DLL(uxtheme)
+WINE_CONFIG_DLL(uxtheme-gtk)
+WINE_CONFIG_DLL(uxtheme,,[implib])
WINE_CONFIG_DLL(uxtheme)
WINE_CONFIG_TEST(dlls/uxtheme/tests)
WINE_CONFIG_DLL(vbscript)
WINE_CONFIG_TEST(dlls/vbscript/tests)
diff --git a/dlls/uxtheme-gtk/Makefile.in b/dlls/uxtheme-gtk/Makefile.in
new file mode 100644
index 0000000..07cf3a0f
index 0000000..07cf3a0
--- /dev/null
+++ b/dlls/uxtheme-gtk/Makefile.in
@@ -0,0 +1,7 @@
@@ -465,5 +463,5 @@ index 0000000..38db521
+
+#include <wine/wine_common_ver.rc>
--
1.9.1
2.7.4