diff options
| author |  Alexey Yakovenko <waker@users.sourceforge.net> | 2014-02-09 21:19:24 +0100 |
|---|---|---|
| committer | Alexey Yakovenko <waker@users.sourceforge.net> | 2014-02-09 21:19:24 +0100 |
| commit | c26dc595bdb77add53b6b4da3c6091e91ad1d6cd (patch) | |
| tree | 4d8d5b276c590c12b8861f4a08b1e1f4b127fe78 | |
| parent | d2517d4a98c1d1f5425c6760ccbd6f7665b3a7b8 (diff) | |
hotkeys/xlib static build fix
| -rw-r--r-- | configure.ac | 19 | ||||
| -rw-r--r-- | plugins/hotkeys/Makefile.am | 2 |
2 files changed, 16 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 1b665032..d3843254 100644 --- a/configure.ac +++ b/configure.ac @@ -447,11 +447,22 @@ AS_IF([test "${enable_ffmpeg}" != "no"], [ ]) AS_IF([test "${enable_hotkeys}" != "no"], [ - AC_CHECK_HEADER([X11/Xlib.h], HAVE_XLIB_H=yes) AS_IF([test "${HAVE_XLIB_H}" = "yes"], [ - HOTKEYS_LIBS="-lX11" - AC_SUBST(HOTKEYS_LIBS) - HAVE_HOTKEYS=yes + AS_IF([test "${enable_staticlink}" = "no"], [ + HOTKEYS_CFLAGS="-I../../$LIB/include" + HOTKEYS_LIBS="-lX11" + AC_SUBST(HOTKEYS_CFLAGS) + AC_SUBST(HOTKEYS_LIBS) + HAVE_HOTKEYS=yes + ], + [ + AC_CHECK_HEADER([X11/Xlib.h], HAVE_XLIB_H=yes) + AS_IF([test "${HAVE_XLIB_H}" = "yes"], [ + HOTKEYS_LIBS="-lX11" + AC_SUBST(HOTKEYS_LIBS) + HAVE_HOTKEYS=yes + ]) + ]) ]) ]) diff --git a/plugins/hotkeys/Makefile.am b/plugins/hotkeys/Makefile.am index 5f5fb965..2fd1ad34 100644 --- a/plugins/hotkeys/Makefile.am +++ b/plugins/hotkeys/Makefile.am @@ -7,5 +7,5 @@ hotkeys_la_LDFLAGS = -module -avoid-version EXTRA_hotkeys_la_SOURCES = keysyms.inc hotkeys_la_LIBADD = $(LDADD) $(HOTKEYS_LIBS) -AM_CFLAGS = $(CFLAGS) -std=c99 +AM_CFLAGS = $(CFLAGS) $(HOTKEYS_CFLAGS) -std=c99 endif |