← Back to branch summary

~ps-jenkins/libfriends/latestsnapshot-0.1.2daily13.05.08-0ubuntu1

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Ken VanDine
  • Date: 2013-01-14 20:16:19 UTC
  • Revision ID: ken.vandine@canonical.com-20130114201619-t4mojtyj3wee6qaz
handle requiring libvala-0.18 or libvala-0.16

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
136
136
AC_SUBST(BASE_CFLAGS)
137
137
AC_SUBST(BASE_LIBS)
138
138
 
 
139
 
 
140
# valadoc only looks in the vapidir for libvala-0.14 but we need 
 
141
# libvala-0.16 or libvala-0.18.  This checks for either libvala dev 
 
142
# package and sets the package to check for to set the vapidir
 
143
# if documentation is enabled
 
144
PKG_CHECK_MODULES([VALADEV], [libvala-0.18],
 
145
        [LIBVALADEVPKG="libvala-0.18"],
 
146
        [PKG_CHECK_MODULES([VALADEV], [libvala-0.16],
 
147
                [LIBVALADEVPKG="libvala-0.16"])])
 
148
 
139
149
###########################
140
150
# Documentation
141
151
###########################
159
169
])
160
170
 
161
171
AS_IF([test "x$enable_docs" = "xyes" -a "x$have_valadoc" = "xyes"], [
162
 
        VALADOCVAPIDIR=`$PKG_CONFIG --variable=vapidir libvala-0.18`
 
172
        VALADOCVAPIDIR=`$PKG_CONFIG --variable=vapidir $LIBVALADEVPKG`
163
173
        AC_SUBST(VALADOCVAPIDIR)
164
174
])
165
175