aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-11-14 13:55:05 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-11-14 13:57:00 +0700
commita4a2c64196aa1e3336446346f750883bb48d72b1 (patch)
tree8efb48fee0a3f237aa324ee1d65c1d274b4826db
parent53ed11cdfdaa17f0b28cef64d6617955fb4bc2e1 (diff)
system/colord: Add auto detection for vala.
Requested by Christoph Willing. Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--system/colord/README3
-rw-r--r--system/colord/colord.SlackBuild11
2 files changed, 11 insertions, 3 deletions
diff --git a/system/colord/README b/system/colord/README
index 6584b00130448..08a39529f0ca6 100644
--- a/system/colord/README
+++ b/system/colord/README
@@ -12,5 +12,4 @@ BASH_COMPLETION=yes ./colord.SlackBuild
If you want argyllcms support (new dep: argyllcms), use:
ARGYLL=yes ./colord.SlackBuild
-Optional dependency: vala
-
+Optional dependency: vala (autodetected)
diff --git a/system/colord/colord.SlackBuild b/system/colord/colord.SlackBuild
index 48baceb485014..ee722bf3c85bd 100644
--- a/system/colord/colord.SlackBuild
+++ b/system/colord/colord.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=colord
VERSION=${VERSION:-1.2.12}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -80,6 +80,14 @@ else
argyll="--disable-argyllcms-sensor"
fi
+# Check if VALA exists
+vl=`pkg-config --exists vapigen`
+if [ "$?" -eq 0 ]; then
+ vala="--enable-vala"
+else
+ vala=""
+fi
+
set -e
rm -rf $PKG
@@ -111,6 +119,7 @@ CXXFLAGS="$SLKCFLAGS" \
--enable-sane \
--enable-libcolordcompat \
$argyll \
+ $vala \
--disable-systemd-login \
--with-daemon-user=colord \
--build=$ARCH-slackware-linux \