| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From 60c17eb49121bf2aa485acd30750b2fc6c8eb61f Mon Sep 17 00:00:00 2001 |
| 2 | From: Jarmo Jaakkola <jarmo.jaakkola@vincit.fi> |
| 3 | Date: Mon, 19 Jun 2017 16:41:36 +0300 |
| 4 | Subject: [PATCH] Fix compilation for Helix. |
| 5 | |
| 6 | Gnome support, including GNOME_INIT_HOOK, has been removed, but it was |
| 7 | still being called. |
| 8 | |
| 9 | COMPAT_OLD_KEYSYMDEF is a check for a legacy system, which our system |
| 10 | most definitely is not. It is accomplished by trying to execute |
| 11 | a program, which does not work when cross compiling. |
| 12 | |
| 13 | The fvwm(1) man page is created from Docbook XML which is set for |
| 14 | a Windows code page that is not available when compiling. Easiest is |
| 15 | to just not create the man page as those are not needed on the monitor. |
| 16 | |
| 17 | Upstream-Status: inappropriate [OE specific] |
| 18 | Signed-off-by: Jarmo Jaakkola <jarmo.jaakkola@vincit.fi> |
| 19 | Signed-off-by: Riku Hämäläinen <riku.hamalainen@ge.com> |
| 20 | Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> |
| 21 | --- |
| 22 | configure.ac | 20 ++++---------------- |
| 23 | doc/fvwm/Makefile.am | 2 +- |
| 24 | 3 files changed, 7 insertions(+), 17 deletions(-) |
| 25 | |
| 26 | diff --git a/configure.ac b/configure.ac |
| 27 | index 48ce264..fab7b44 100644 |
| 28 | --- a/configure.ac |
| 29 | +++ b/configure.ac |
| Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame^] | 30 | @@ -1413,8 +1413,4 @@ else |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 31 | # Define some compatibility macros needed for config.h. |
| 32 | -mg_DEFINE_IF_NOT([#include <X11/keysym.h>], |
| 33 | - [defined XK_Page_Up && defined XK_Page_Down], |
| 34 | - [COMPAT_OLD_KEYSYMDEF], [$X_CFLAGS], |
| 35 | - [Old AIX systems (3.2.5) don't define some common keysyms.]) |
| 36 | AH_VERBATIM([_COMPAT_OLD_KEYSYMDEF], |
| 37 | [#ifdef COMPAT_OLD_KEYSYMDEF |
| 38 | # define XK_Page_Up XK_Prior |
| 39 | diff --git a/doc/fvwm/Makefile.am b/doc/fvwm/Makefile.am |
| 40 | index cddb102..ff00149 100755 |
| 41 | --- a/doc/fvwm/Makefile.am |
| 42 | +++ b/doc/fvwm/Makefile.am |
| 43 | @@ -10,7 +10,7 @@ XSL_PROFILE = $(srcdir)/../docbook-xsl/profiling/profile.xsl |
| 44 | HTML_FILES = fvwm.man.html |
| 45 | XML_FILES = @DOC_SECTIONS_XML_PATH@ |
| 46 | EXTRA_DIST = @DOC_SECTIONS_XML@ $(man_MANS) sections |
| 47 | -man_MANS = fvwm.1 |
| 48 | +man_MANS = |
| 49 | |
| 50 | if FVWM_BUILD_HTMLDOC |
| 51 | doc_DATA = $(HTML_FILES) |
| 52 | -- |
| 53 | 1.9.1 |
| 54 | |