pyrox.dev
1--- a/platforms/unix/plugins/UnicodePlugin/Makefile.inc
2+++ b/platforms/unix/plugins/UnicodePlugin/Makefile.inc
3@@ -1,2 +1,2 @@
4-XCPPFLAGS= -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -I/usr/lib/i386-linux-gnu/glib-2.0/include
5+XCPPFLAGS= [unicode_plugin_cflags]
6-XLDFLAGS= -lpangocairo-1.0 -lcairo -lpango-1.0 -lgobject-2.0 -lglib-2.0
7+XLDFLAGS= [unicode_plugin_libs]
8--- a/platforms/unix/plugins/UnicodePlugin/acinclude.m4
9+++ b/platforms/unix/plugins/UnicodePlugin/acinclude.m4
10@@ -2,9 +2,14 @@
11
12 AC_MSG_CHECKING([for PangoCairo libraries])
13 save_CPPFLAGS="$CPPFLAGS"
14-CPPFLAGS="-I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -I/usr/lib/i386-linux-gnu/glib-2.0/include"
15+CPPFLAGS=`pkg-config --cflags glib-2.0 pangocairo`
16 AC_TRY_COMPILE([#include <pango/pangocairo.h>],[{}],[
17 AC_MSG_RESULT(yes)
18+ PKG_CHECK_MODULES([UNICODE_PLUGIN],[glib-2.0 pangocairo])
19+ AC_SUBST([UNICODE_PLUGIN_CFLAGS])
20+ AC_SUBST([UNICODE_PLUGIN_LIBS])
21+ AC_PLUGIN_DEFINE_UNQUOTED([unicode_plugin_cflags],[$UNICODE_PLUGIN_CFLAGS])
22+ AC_PLUGIN_DEFINE_UNQUOTED([unicode_plugin_libs],[$UNICODE_PLUGIN_LIBS])
23 ],[
24 AC_MSG_RESULT(no)
25 AC_PLUGIN_DISABLE
26--- a/platforms/unix/plugins/XDisplayControlPlugin/acinclude.m4
27+++ b/platforms/unix/plugins/XDisplayControlPlugin/acinclude.m4
28@@ -1,5 +1,3 @@
29 # Require X11
30
31-AC_CHECK_LIB(X11,XOpenDisplay,
32- [AC_PLUGIN_USE_LIB(X11)],
33- [AC_PLUGIN_DISABLE])
34+AC_PLUGIN_CHECK_LIB(X11,XOpenDisplay)