gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-06 00:48:18 -07:00
Code Issues Projects Releases Wiki Activity

dev-libs/wayland: Try to avoid maintenance mode autotools regen

Browse Source 
while still trying to avoid full eautoreconf call and autotools build deps

Gentoo-bug: 576198
This commit is contained in:
Mart Raudsepp
2016-03-02 09:14:12 +02:00
parent 7f63c92ae1
commit e72bae8bfa
1 changed files with 47 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
dev-libs/wayland/files/1.10.0-build-fix-configure-disable-dtd-validation.patch
View File

@@ -57,6 +57,53 @@ index e850abc..49e25a6 100644
src/dtddata.o: protocol/wayland.dtd
if USE_HOST_SCANNER
diff --git a/configure.ac b/configure.ac
index f54a8b9..b27f34b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,7 +76,7 @@ AC_ARG_ENABLE([dtd-validation],
[AC_HELP_STRING([--disable-dtd-validation],
[Disable DTD validation of the protocol])],
[],
- [enable_dtdvalidation=yes])
+ [enable_dtd_validation=yes])
AM_CONDITIONAL(USE_HOST_SCANNER, test "x$with_host_scanner" = xyes)
@@ -112,7 +112,8 @@ PKG_CHECK_MODULES(EXPAT, [expat], [],
AC_SUBST(EXPAT_LIBS)
])
-if test "x$enable_dtdvalidation" = "xyes"; then
+AM_CONDITIONAL([DTD_VALIDATION], [test "x$enable_dtd_validation" = "xyes"])
+if test "x$enable_dtd_validation" = "xyes"; then
PKG_CHECK_MODULES(LIBXML, [libxml-2.0])
AC_DEFINE(HAVE_LIBXML, 1, [libxml-2.0 is available])
AC_CONFIG_LINKS([src/wayland.dtd.embed:protocol/wayland.dtd])
diff --git a/aclocal.m4 b/aclocal.m4
index 71ca3dc..86eace8 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1327,6 +1327,7 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+#timestamp update to avoid regen
m4_include([m4/libtool.m4])
m4_include([m4/ltoptions.m4])
m4_include([m4/ltsugar.m4])
diff --git a/config.h.in b/config.h.in
index 1400592..33f0e99 100644
--- a/config.h.in
+++ b/config.h.in
@@ -15,6 +15,7 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
+/* Timestamp update */
/* libxml-2.0 is available */
#undef HAVE_LIBXML
diff --git a/Makefile.in b/Makefile.in
index 6d9ffb2..32e6d51 100644
--- a/Makefile.in
@@ -124,29 +171,6 @@ index 6d9ffb2..32e6d51 100644
@ENABLE_LIBRARIES_TRUE@lib_LTLIBRARIES = libwayland-server.la \
@ENABLE_LIBRARIES_TRUE@ libwayland-client.la \
@ENABLE_LIBRARIES_TRUE@ libwayland-cursor.la
diff --git a/configure.ac b/configure.ac
index f54a8b9..b27f34b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,7 +76,7 @@ AC_ARG_ENABLE([dtd-validation],
[AC_HELP_STRING([--disable-dtd-validation],
[Disable DTD validation of the protocol])],
[],
- [enable_dtdvalidation=yes])
+ [enable_dtd_validation=yes])
AM_CONDITIONAL(USE_HOST_SCANNER, test "x$with_host_scanner" = xyes)
@@ -112,7 +112,8 @@ PKG_CHECK_MODULES(EXPAT, [expat], [],
AC_SUBST(EXPAT_LIBS)
])
-if test "x$enable_dtdvalidation" = "xyes"; then
+AM_CONDITIONAL([DTD_VALIDATION], [test "x$enable_dtd_validation" = "xyes"])
+if test "x$enable_dtd_validation" = "xyes"; then
PKG_CHECK_MODULES(LIBXML, [libxml-2.0])
AC_DEFINE(HAVE_LIBXML, 1, [libxml-2.0 is available])
AC_CONFIG_LINKS([src/wayland.dtd.embed:protocol/wayland.dtd])
diff --git a/configure b/configure
index 83e4971..6340d4f 100755
--- a/configure