Make pango an optional build time dependency

Default to needing it.

diff --git a/configure.ac b/configure.ac
index 6db384480e6705f48f5a252c270de9a307f3b4fc..73db97ffca7222aaddd97b65d93fbcce76348743 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -42,9 +42,14 @@ PLYMOUTH_LIBS="-lm -ldl $IMAGE_LIBS"
 AC_SUBST(PLYMOUTH_CFLAGS)
 AC_SUBST(PLYMOUTH_LIBS)
 
-PKG_CHECK_MODULES(PANGO, [pangocairo >= 1.21.0 ])
-AC_SUBST(PANGO_CFLAGS)
-AC_SUBST(PANGO_LIBS)
+AC_ARG_ENABLE(pango, AS_HELP_STRING([--enable-pango],[enable building with pango, disabled there is no encryption prompts]),enable_pango=$enableval,enable_pango=yes)
+AM_CONDITIONAL(ENABLE_PANGO,  [test "$enable_pango" = yes])
+
+if test x$enable_pango = xyes; then
+  PKG_CHECK_MODULES(PANGO, [pangocairo >= 1.21.0 ])
+  AC_SUBST(PANGO_CFLAGS)
+  AC_SUBST(PANGO_LIBS)
+fi
 
 PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.12.0 ])
 AC_SUBST(GTK_CFLAGS)

diff --git a/src/plugins/controls/Makefile.am b/src/plugins/controls/Makefile.am
index d1c6b96126fc5cd6720f9bd6b00063e393d017b9..f1621f934586d59eb16b0c0cd314d776841a5d8f 100644 (file)
--- a/src/plugins/controls/Makefile.am
+++ b/src/plugins/controls/Makefile.am
@@ -1,2 +1,4 @@
+if ENABLE_PANGO
 SUBDIRS = label
+endif
 MAINTAINERCLEANFILES = Makefile.in