diff options
| author | Thomas Kunze <thommycheck@gmx.de> | 2008-08-06 00:22:48 +0000 |
|---|---|---|
| committer | Thomas Kunze <thommycheck@gmx.de> | 2008-08-06 00:22:48 +0000 |
| commit | e223f92fadea7acd6ed74314582dc1842a70c9e1 (patch) | |
| tree | d6213d59df18273e1b36c70f1ff90e32f6202ad7 /packages/fvwm/files/acinclude.m4.patch | |
| parent | 4772c603842e0896dc681dec79d875a6c2ad32a7 (diff) | |
| parent | 71118ac9471391e1236789b451966aa5cb81f00d (diff) | |
merge of '505353d4980790de19d2f2385c848a5402fa919a'
and 'de7fa612bd9d4ae1e7ffb3f036835b8023dfa1ca'
Diffstat (limited to 'packages/fvwm/files/acinclude.m4.patch')
| -rw-r--r-- | packages/fvwm/files/acinclude.m4.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/packages/fvwm/files/acinclude.m4.patch b/packages/fvwm/files/acinclude.m4.patch new file mode 100644 index 0000000000..59c4275bf3 --- /dev/null +++ b/packages/fvwm/files/acinclude.m4.patch @@ -0,0 +1,32 @@ +upstream: OE-only +origin: Yuri Bushmelev <jay4mail at gmail.com> +comment: disable xft-config calls while cross-compiling +--- fvwm-2.5.26/acinclude.m4.orig 2008-06-10 01:53:46.000000000 +0400 ++++ fvwm-2.5.26/acinclude.m4 2008-06-10 01:53:51.000000000 +0400 +@@ -1225,14 +1225,14 @@ + XFT_CONFIG=$xft_config_prefix/bin/xft-config + fi + fi +-AC_PATH_PROG(XFT_CONFIG, xft-config, no) ++dnl AC_PATH_PROG(XFT_CONFIG, xft-config, no) + + min_xft_version=ifelse([$1], ,2.0.0,$1) + AC_MSG_CHECKING(for Xft - version >= $min_xft_version) + no_xft="" + pkg_config_xft_exists="" + +-if test "$XFT_CONFIG" = "no" ; then ++dnl if test "$XFT_CONFIG" = "no" ; then + if test "x$PKG_CONFIG" != "xno" ; then + if $PKG_CONFIG --exists 'xft' ; then + if $PKG_CONFIG --exists 'xft >= $1' ; then +@@ -1249,7 +1249,8 @@ + else + no_xft=yes + fi +-else ++dnl else ++if false; then + XFT_CFLAGS=`$XFT_CONFIG $xft_config_args --cflags` + XFT_LIBS=`$XFT_CONFIG $xft_config_args --libs` + xft_config_major_version=`$XFT_CONFIG $xft_config_args --version | \ |