summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2011-11-17 14:41:17 +0100
committerBent Bisballe Nyeng <deva@aasimon.org>2011-11-17 14:41:17 +0100
commitff0ebb2f67e51e4ef37088eebef420b0566a45ff (patch)
tree384c3d5bb8342b8464856b04bdee5acaecfdf84b /server
parent64610c7453fc6bc0be7d3f9cb49058fb849be725 (diff)
Fix compilation with new location of server tools.
Diffstat (limited to 'server')
-rw-r--r--server/configure.in2
-rw-r--r--server/src/Makefile.am2
-rw-r--r--server/src/praxisd.cc2
-rw-r--r--server/tools/Makefile.am6
4 files changed, 9 insertions, 3 deletions
diff --git a/server/configure.in b/server/configure.in
index c647aed..d8cb0c0 100644
--- a/server/configure.in
+++ b/server/configure.in
@@ -246,12 +246,12 @@ AC_SUBST(PTHREAD_LIBS)
AC_OUTPUT(
Makefile
src/Makefile
- getdata/Makefile
gentoo/init.d/Makefile
gentoo/init.d/pracrod
gentoo/logrotate.d/Makefile
etc/Makefile
man/Makefile
+ tools/Makefile
xml/templates/Makefile
xml/macros/Makefile
xml/Makefile)
diff --git a/server/src/Makefile.am b/server/src/Makefile.am
index 9f3f100..dbf20da 100644
--- a/server/src/Makefile.am
+++ b/server/src/Makefile.am
@@ -138,7 +138,7 @@ EXTRA_DIST = \
################
TEST_SOURCE_DEPS = ${pracrod_SOURCES} ${EXTRA_DIST}
-TEST_SCRIPT_DIR = $(top_srcdir)/../tools
+TEST_SCRIPT_DIR = $(top_srcdir)/tools
include ${TEST_SCRIPT_DIR}/Makefile.am.test
diff --git a/server/src/praxisd.cc b/server/src/praxisd.cc
index a75ad9f..3ccdf0d 100644
--- a/server/src/praxisd.cc
+++ b/server/src/praxisd.cc
@@ -139,7 +139,7 @@ void Praxisd::journal_add(std::string cpr, std::string entry)
// Unset 'Expect' header, set by CURLOPT_POSTFIELDS
slist = curl_slist_append(slist, "Expect:");
slist = curl_slist_append(slist, "Content-Type: text/xml");
- slist = curl_slist_append(slist, "Connection: keep-alive");
+ // slist = curl_slist_append(slist, "Connection: keep-alive");
curl_easy_setopt(ch, CURLOPT_HTTPHEADER, slist);
std::string uri = host + "/praxisd/1.0/journal/add";
diff --git a/server/tools/Makefile.am b/server/tools/Makefile.am
new file mode 100644
index 0000000..8f54004
--- /dev/null
+++ b/server/tools/Makefile.am
@@ -0,0 +1,6 @@
+EXTRA_DIST = \
+ Makefile.am.test \
+ hexify.cc \
+ test \
+ test.h \
+ testlist