From c25a495d3b69186484055a5932bd5237b88de2fa Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Wed, 21 Dec 2011 12:44:59 -0500 Subject: [PATCH] configure script for WebCit now requires expat --- webcit/configure.ac | 17 +++++++++++++++++ webcit/dav_propfind.c | 20 ++++++-------------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/webcit/configure.ac b/webcit/configure.ac index e41910c47..38b8f2186 100644 --- a/webcit/configure.ac +++ b/webcit/configure.ac @@ -248,6 +248,23 @@ AC_CHECK_HEADER(libcitadel.h, ) +dnl Checks for the Expat XML parser. +AC_CHECK_HEADER(expat.h, + [AC_CHECK_LIB(expat, XML_ParserCreateNS, + [ + SERVER_LIBS="-lexpat $SERVER_LIBS" + ], + [ + AC_MSG_ERROR(The Expat XML parser was not found and is required. More info: http://www.citadel.org/doku.php/installation:start) + ] + , + )], + [ + AC_MSG_ERROR(expat.h was not found and is required. More info: http://www.citadel.org/doku.php/installation:start) + ] +) + + found_ssl=no # The big search for OpenSSL diff --git a/webcit/dav_propfind.c b/webcit/dav_propfind.c index 96129045c..e6d0abb5e 100644 --- a/webcit/dav_propfind.c +++ b/webcit/dav_propfind.c @@ -12,19 +12,14 @@ * * Copyright (c) 2005-2011 by the citadel.org team * - * This program is open source software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * This program is open source software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "webcit.h" @@ -463,8 +458,7 @@ void dav_propfind(void) StrBufExtract_token(dav_uid, WCC->Hdr->HR.ReqLine, 1, '/'); /* - * If the room name is blank, the client is requesting a - * folder list. + * If the room name is blank, the client is requesting a folder list. */ if (StrLength(dav_roomname) == 0) { dav_collection_list(); @@ -482,9 +476,7 @@ void dav_propfind(void) dav_common_headers(); hprintf("Date: %s\r\n", datestring); hprintf("Content-Type: text/plain\r\n"); - wc_printf("There is no folder called \"%s\" on this server.\r\n", - ChrPtr(dav_roomname) - ); + wc_printf("There is no folder called \"%s\" on this server.\r\n", ChrPtr(dav_roomname)); end_burst(); FreeStrBuf(&dav_roomname); FreeStrBuf(&dav_uid); @@ -571,9 +563,9 @@ void dav_propfind(void) dav_common_headers(); hprintf("Date: %s\r\n", datestring); hprintf("Content-type: text/xml\r\n"); - if (DisableGzip || (!WCC->Hdr->HR.gzip_ok)) + if (DisableGzip || (!WCC->Hdr->HR.gzip_ok)) { hprintf("Content-encoding: identity\r\n"); - + } begin_burst(); wc_printf("" -- 2.30.2