summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikko Ylinen <mikko.ylinen@intel.com>2014-05-13 10:49:48 +0300
committerMikko Ylinen <mikko.ylinen@intel.com>2014-05-13 10:49:48 +0300
commitf7ee23ef2eb558c1519ac74708ac95c7808a4549 (patch)
tree628d3c0e1bccc525ec34101374c5ae204a8cc997
parent20653f38bffb6f745f635ec3ebf0391615b3b1f1 (diff)
downloadico-uxf-weston-plugin-f7ee23ef2eb558c1519ac74708ac95c7808a4549.tar.gz
ico-uxf-weston-plugin-f7ee23ef2eb558c1519ac74708ac95c7808a4549.tar.bz2
ico-uxf-weston-plugin-f7ee23ef2eb558c1519ac74708ac95c7808a4549.zip
Fix EGL build issue when no X11 headers are available
Change-Id: I2e24033de86bb9dc9f9d6f4f46b1c5ad72c2fdfd Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>
-rw-r--r--configure.ac4
-rw-r--r--packaging/ico-uxf-weston-plugin.spec1
2 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 08bf5e9..a246aec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,9 @@ AC_CHECK_HEADERS([execinfo.h])
AC_CHECK_FUNCS([mkostemp strchrnul])
PKG_CHECK_MODULES([PLUGIN], [weston >= 1.4 pixman-1])
+PKG_CHECK_MODULES([EGL], [egl])
+
+CFLAGS="$CFLAGS $EGL_CFLAGS"
if test "x$GCC" = "xyes"; then
my_common_gcc_flags="-Wall -Wextra -Wno-unused-parameter \
@@ -39,6 +42,7 @@ if test "x$GCC" = "xyes"; then
-Wstrict-prototypes -Wmissing-prototypes"
GCC_CXXFLAGS="$my_common_gcc_flags"
fi
+AC_SUBST(CFLAGS)
AC_SUBST(GCC_CFLAGS)
AC_SUBST(GCC_CXXFLAGS)
diff --git a/packaging/ico-uxf-weston-plugin.spec b/packaging/ico-uxf-weston-plugin.spec
index 7f13643..2ee31cb 100644
--- a/packaging/ico-uxf-weston-plugin.spec
+++ b/packaging/ico-uxf-weston-plugin.spec
@@ -12,6 +12,7 @@ BuildRequires: pkgconfig(pixman-1)
BuildRequires: pkgconfig(evas)
BuildRequires: pkgconfig(aul)
BuildRequires: pkgconfig(ecore)
+BuildRequires: pkgconfig(egl)
BuildRequires: mesa-devel
BuildRequires: genivi-shell-devel
BuildRequires: weston-ivi-shell-devel