From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 26 Sep 2008 13:39:24 +0000 (-0400)
Subject: Make pango an optional build time dependency
X-Git-Tag: 0.6.0~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b183cdf6fe40304fba59cfd869431991b53182db;p=thirdparty%2Fplymouth.git

Make pango an optional build time dependency

Default to needing it.
---

diff --git a/configure.ac b/configure.ac
index 6db38448..73db97ff 100644
--- 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 d1c6b961..f1621f93 100644
--- 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