summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2010-02-21 21:19:30 (UTC)
committer Michael Krelin <hacker@klever.net>2010-02-21 21:19:30 (UTC)
commitce549cc7cc156ff1d6e15bcceb6c6178154af459 (patch) (unidiff)
tree8060239cf3143be7970deea422a501461b652ef9
parent124c70b6d105d1d084bd2253d54c268cfa75f865 (diff)
downloadiii-ce549cc7cc156ff1d6e15bcceb6c6178154af459.zip
iii-ce549cc7cc156ff1d6e15bcceb6c6178154af459.tar.gz
iii-ce549cc7cc156ff1d6e15bcceb6c6178154af459.tar.bz2
don't override default pkg-config if-not-found action
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--configure.ac4
1 files changed, 1 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 515d465..a719cdd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,15 +9,13 @@ AC_PROG_CC
9PKG_PROG_PKG_CONFIG 9PKG_PROG_PKG_CONFIG
10 10
11AC_HEADER_STDC 11AC_HEADER_STDC
12 12
13AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) 13AC_PATH_PROG([XSLTPROC],[xsltproc],[true])
14 14
15PKG_CHECK_MODULES([MODULES],[gsoap++ openssl libconfuse],,[ 15PKG_CHECK_MODULES([MODULES],[gsoap++ openssl libconfuse])
16 AC_MSG_ERROR([one of the build dependencies isn't satisfied])
17])
18PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false]) 16PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false])
19AM_CONDITIONAL([HAVE_UUID],[$have_uuid]) 17AM_CONDITIONAL([HAVE_UUID],[$have_uuid])
20if $have_uuid ; then 18if $have_uuid ; then
21 AC_DEFINE([HAVE_LIBUUID],,[defined in presence of libuuid]) 19 AC_DEFINE([HAVE_LIBUUID],,[defined in presence of libuuid])
22 AC_SUBST([UUID_UUID],[uuid]) 20 AC_SUBST([UUID_UUID],[uuid])
23fi 21fi