summaryrefslogtreecommitdiffabout
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) (side-by-side diff)
tree85595d46e3e604b6686f5fde6e074e2a443f330c
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 (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,51 +1,54 @@
-noinst_PROGRAMS = test idiscover RP.cgi OP.cgi
+noinst_PROGRAMS = test idiscover \
+ ${_dependent_programs_}
AM_CPPFLAGS=${CPPFLAGS_DEBUG}
DEFAULT_INCLUDES = -I${top_builddir}
INCLUDES = -I${top_srcdir}/test/ -I${top_builddir}/include/ -I${top_srcdir}/include/ ${KONFORKA_CFLAGS} ${LIBCURL_CPPFLAGS}
test_SOURCES = test.cc
test_LDADD = ${top_builddir}/lib/libopkele.la
EXTRA_DIST= \
sqlite.h kingate_openid_message.h \
RP-db.sql OP-db.sql
idiscover_SOURCES = idiscover.cc
idiscover_LDADD = ${top_builddir}/lib/libopkele.la
if HAVE_SQLITE3
if HAVE_KINGATE
if HAVE_UUID
+_dependent_programs_ = RP.cgi OP.cgi
+
RP_cgi_SOURCES = RP.cc
nodist_RP_cgi_SOURCES = RP-db.cc
RP_cgi_LDADD = ${top_builddir}/lib/libopkele.la \
${SQLITE3_LIBS} ${KINGATE_LIBS} ${UUID_LIBS}
RP_cgi_CFLAGS = ${SQLITE3_CFLAGS} ${KINGATE_CFLAGS} ${UUID_CFLAGS}
RP-db.cc: RP-db.sql
( \
echo 'const char * __RP_db_bootstrap = ' && \
sed -e 's/^/"/' -e 's/$$/"/' $< && \
echo ';' \
) >$@
OP_cgi_SOURCES = OP.cc
nodist_OP_cgi_SOURCES = OP-db.cc
OP_cgi_LDADD = ${RP_cgi_LDADD}
OP_cgi_CFLAGS = ${RP_cgi_CFLAGS}
OP-db.cc: OP-db.sql
( \
echo 'const char * __OP_db_bootstrap = ' && \
sed -e 's/^/"/' -e 's/$$/"/' $< && \
echo ';' \
) >$@
clean-local:
rm -f RP-db.cc OP-db.cc
endif #HAVE_UUID
endif #HAVE_KINGATE
endif #HAVE_SQLITE3