uxtheme-GTK_Theming: Fix configure.ac changes.

This commit is contained in:
Sebastian Lackner 2015-10-24 02:40:56 +02:00
parent bff92e3d44
commit e51ebcc301

View File

@ -1,4 +1,4 @@
From 01290dd262f7cfc9ee7799fb8f20c5b43ce60e86 Mon Sep 17 00:00:00 2001
From 4bf69c6742053c02538bc0a46204701699802cf5 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: uxthemegtk: Add configure check and stub dll.
@ -20,7 +20,7 @@ List of functions updated by Ivan Akulinchev <ivan.akulinchev@gmail.com>.
create mode 100644 dlls/uxtheme-gtk/version.rc
diff --git a/aclocal.m4 b/aclocal.m4
index f7a12f1..770a0d8 100644
index e236c92..4bbf44e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -109,6 +109,26 @@ test -z "$ac_libs" || ac_libs=`echo " $ac_libs" | sed 's/ -L\([[^/]]\)/ -L\$(top
@ -51,7 +51,7 @@ index f7a12f1..770a0d8 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 1329786..6fb4ad0 100644
index bfcf319..97aa018 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,7 @@ AC_ARG_WITH(gnutls, AS_HELP_STRING([--without-gnutls],[do not use GnuTLS (sch
@ -62,7 +62,7 @@ index 1329786..6fb4ad0 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(ldap, AS_HELP_STRING([--without-ldap],[do not use LDAP]),
@@ -1486,6 +1487,26 @@ fi
@@ -1487,6 +1488,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,14 +89,14 @@ index 1329786..6fb4ad0 100644
dnl **** Check for FreeType 2 ****
if test "x$with_freetype" != "xno"
then
@@ -3319,6 +3340,7 @@ WINE_CONFIG_TEST(dlls/usp10/tests)
@@ -3356,6 +3377,7 @@ WINE_CONFIG_TEST(dlls/userenv/tests)
WINE_CONFIG_DLL(usp10,,[implib])
WINE_CONFIG_TEST(dlls/usp10/tests)
WINE_CONFIG_LIB(uuid)
+WINE_CONFIG_DLL(uxtheme-gtk)
WINE_CONFIG_DLL(uxtheme,,[implib])
WINE_CONFIG_TEST(dlls/uxtheme/tests)
+WINE_CONFIG_DLL(uxtheme-gtk)
WINE_CONFIG_DLL(vbscript,,[clean])
WINE_CONFIG_TEST(dlls/vbscript/tests,[clean])
WINE_CONFIG_DLL(vcomp)
diff --git a/dlls/uxtheme-gtk/Makefile.in b/dlls/uxtheme-gtk/Makefile.in
new file mode 100644
index 0000000..07cf3a0f
@ -463,5 +463,5 @@ index 0000000..38db521
+
+#include <wine/wine_common_ver.rc>
--
2.5.0
2.6.1