49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
|
webdav.c: fix iconv calls
|
||
|
|
|
||
|
|
Replace HAVE_ICONV_H by HAVE_ICONV to fix build with iconv indeed
|
||
|
|
HAVE_ICONV_H is never set as AC_CHECK_HEADERS is not called to check for
|
||
|
|
iconv.h
|
||
|
|
|
||
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||
|
|
[Upstream status: https://savannah.nongnu.org/bugs/index.php?56178]
|
||
|
|
|
||
|
|
diff -Naurp davfs2-1.5.4-orig/src/webdav.c davfs2-1.5.4/src/webdav.c
|
||
|
|
--- davfs2-1.5.4-orig/src/webdav.c 2019-04-20 12:12:38.252599230 +0200
|
||
|
|
+++ davfs2-1.5.4/src/webdav.c 2019-04-20 12:13:33.012925300 +0200
|
||
|
|
@@ -25,7 +25,7 @@
|
||
|
|
#ifdef HAVE_FCNTL_H
|
||
|
|
#include <fcntl.h>
|
||
|
|
#endif
|
||
|
|
-#ifdef HAVE_ICONV_H
|
||
|
|
+#ifdef HAVE_ICONV
|
||
|
|
#include <iconv.h>
|
||
|
|
#endif
|
||
|
|
#ifdef HAVE_LANGINFO_H
|
||
|
|
@@ -231,7 +231,7 @@ static int initialized;
|
||
|
|
Needed by ssl_verify() which may be called at any time. */
|
||
|
|
static int have_terminal;
|
||
|
|
|
||
|
|
-#ifdef HAVE_ICONV_H
|
||
|
|
+#ifdef HAVE_ICONV
|
||
|
|
/* Handle to convert character encoding from utf-8 to LC_CTYPE.
|
||
|
|
If NULL no conversion is done. */
|
||
|
|
static iconv_t from_utf_8;
|
||
|
|
@@ -264,7 +264,7 @@ static char **cookie_list;
|
||
|
|
/* Private function prototypes and inline functions */
|
||
|
|
/*==================================================*/
|
||
|
|
|
||
|
|
-#ifdef HAVE_ICONV_H
|
||
|
|
+#ifdef HAVE_ICONV
|
||
|
|
static void
|
||
|
|
convert(char **s, iconv_t conv);
|
||
|
|
#endif
|
||
|
|
@@ -337,7 +337,7 @@ dav_init_webdav(const dav_args *args)
|
||
|
|
if (args->neon_debug & ~NE_DBG_HTTPPLAIN)
|
||
|
|
syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "Initializing webdav");
|
||
|
|
|
||
|
|
-#ifdef HAVE_ICONV_H
|
||
|
|
+#ifdef HAVE_ICONV
|
||
|
|
char *lc_charset = nl_langinfo(CODESET);
|
||
|
|
if (lc_charset && strcasecmp(lc_charset, "UTF-8") != 0) {
|
||
|
|
from_utf_8 = iconv_open(lc_charset, "UTF-8");
|