build: fix doctor build

Include pixman-1 library in doctor build

Change-Id: Ifad0e50a442e9bf47b699139ce05afc946a2cc53

diff --git a/configure.ac b/configure.ac
index 61a7f17cc8eaf90bbd0f1283185dcd219ef0fb51..332fca1d4260406ea59311d211d1b33d88a9e846 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -144,7 +144,7 @@ if test x$enable_x11 = xyes; then
 fi
 
 # doctor
-DOCTOR_REQUIRES="wayland-server"
+DOCTOR_REQUIRES="wayland-server pixman-1"
 PKG_CHECK_MODULES(DOCTOR, [$DOCTOR_REQUIRES])
 DOCTOR_REQUIRES="$DOCTOR_REQUIRES pepper pepper-drm pepper-desktop-shell"
 

diff --git a/src/bin/doctor/Makefile.am b/src/bin/doctor/Makefile.am
index 6d93adabf511ad5b6af115f30c757984c1bc0528..e08aec69e299905a0d521034250b3185f11c7055 100644 (file)
--- a/src/bin/doctor/Makefile.am
+++ b/src/bin/doctor/Makefile.am
@@ -1,9 +1,6 @@
 bin_PROGRAMS = doctor
 
-doctor_CFLAGS  = $(DOCTOR_CFLAGS) $(PEPPER_INTERNAL_CFLAGS) $(PEPPER_DRM_INTERNAL_CFLAGS)
-doctor_CFLAGS += $(PEPPER_DESKTOP_SHELL_INTERNAL_CFLAGS)
-
-doctor_LDADD  = $(DOCTOR_LIBS) $(PEPPER_INTERNAL_LIBS) $(PEPPER_DRM_INTERNAL_LIBS)
-doctor_LDADD += $(PEPPER_DESKTOP_SHELL_INTERNAL_LIBS)
+doctor_CFLAGS  = $(DOCTOR_CFLAGS)
+doctor_LDADD  = $(DOCTOR_LIBS)
 
 doctor_SOURCES = server.c