summaryrefslogtreecommitdiffabout
path: root/test
authorMichael Krelin <hacker@klever.net>2008-06-25 20:42:33 (UTC)
committer Michael Krelin <hacker@klever.net>2008-06-25 20:42:33 (UTC)
commit7934873589e47f0207916c668ec4a272071e66a0 (patch) (unidiff)
tree85595d46e3e604b6686f5fde6e074e2a443f330c /test
parentaa3a6821f6aaaf4ae63bafbbc76da5f414a75fd4 (diff)
downloadlibopkele-7934873589e47f0207916c668ec4a272071e66a0.zip
libopkele-7934873589e47f0207916c668ec4a272071e66a0.tar.gz
libopkele-7934873589e47f0207916c668ec4a272071e66a0.tar.bz2
do not attempt to build programs dependent on absent libraries
Thanks, Joseph, for spotting it! In addition, thanks for spotting it again in openid20 branch to Brian of Butterfat ;-) Conflicts: test/Makefile.am Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (limited to 'test') (more/less context) (ignore whitespace changes)
-rw-r--r--test/Makefile.am5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index 8fedf48..666cd66 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,7 +1,8 @@
1noinst_PROGRAMS = test idiscover RP.cgi OP.cgi 1noinst_PROGRAMS = test idiscover \
2 ${_dependent_programs_}
2 3
3AM_CPPFLAGS=${CPPFLAGS_DEBUG} 4AM_CPPFLAGS=${CPPFLAGS_DEBUG}
4DEFAULT_INCLUDES = -I${top_builddir} 5DEFAULT_INCLUDES = -I${top_builddir}
5INCLUDES = -I${top_srcdir}/test/ -I${top_builddir}/include/ -I${top_srcdir}/include/ ${KONFORKA_CFLAGS} ${LIBCURL_CPPFLAGS} 6INCLUDES = -I${top_srcdir}/test/ -I${top_builddir}/include/ -I${top_srcdir}/include/ ${KONFORKA_CFLAGS} ${LIBCURL_CPPFLAGS}
6 7
7test_SOURCES = test.cc 8test_SOURCES = test.cc
@@ -15,12 +16,14 @@ idiscover_SOURCES = idiscover.cc
15idiscover_LDADD = ${top_builddir}/lib/libopkele.la 16idiscover_LDADD = ${top_builddir}/lib/libopkele.la
16 17
17if HAVE_SQLITE3 18if HAVE_SQLITE3
18if HAVE_KINGATE 19if HAVE_KINGATE
19if HAVE_UUID 20if HAVE_UUID
20 21
22_dependent_programs_ = RP.cgi OP.cgi
23
21RP_cgi_SOURCES = RP.cc 24RP_cgi_SOURCES = RP.cc
22nodist_RP_cgi_SOURCES = RP-db.cc 25nodist_RP_cgi_SOURCES = RP-db.cc
23RP_cgi_LDADD = ${top_builddir}/lib/libopkele.la \ 26RP_cgi_LDADD = ${top_builddir}/lib/libopkele.la \
24 ${SQLITE3_LIBS} ${KINGATE_LIBS} ${UUID_LIBS} 27 ${SQLITE3_LIBS} ${KINGATE_LIBS} ${UUID_LIBS}
25RP_cgi_CFLAGS = ${SQLITE3_CFLAGS} ${KINGATE_CFLAGS} ${UUID_CFLAGS} 28RP_cgi_CFLAGS = ${SQLITE3_CFLAGS} ${KINGATE_CFLAGS} ${UUID_CFLAGS}
26 29