Add missing files

This commit is contained in:
David W. Chapman Jr. 2001-06-09 01:42:58 +00:00
parent c5ed542490
commit afc8d2a1d4
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=43673
4 changed files with 73 additions and 0 deletions

View File

@ -0,0 +1,11 @@
--- gnupgparse.c.orig Tue Jan 9 07:21:51 2001
+++ gnupgparse.c Sun Feb 4 21:07:30 2001
@@ -44,7 +44,7 @@
#include "mutt.h"
#include "pgp.h"
#include "charset.h"
-#include "iconv.h"
+#include "giconv.h"
/* for hexval */
#include "mime.h"

View File

@ -0,0 +1,11 @@
--- rfc2047.c.orig Sun Feb 4 21:04:05 2001
+++ rfc2047.c Sun Feb 4 21:08:22 2001
@@ -24,7 +24,7 @@
#include <ctype.h>
#include <errno.h>
-#include <iconv.h>
+#include <giconv.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

View File

@ -0,0 +1,11 @@
--- charset.h.orig Tue Mar 6 00:03:04 2001
+++ charset.h Tue Mar 6 00:04:22 2001
@@ -19,7 +19,7 @@
#ifndef _CHARSET_H
#define _CHARSET_H
-#include <iconv.h>
+#include <giconv.h>
int mutt_convert_string (char **, const char *, const char *, int);
void mutt_sanitize_ja_chars (char *, size_t, int);

View File

@ -0,0 +1,40 @@
--- m4/iconv.m4.orig Thu Jun 7 22:00:05 2001
+++ m4/iconv.m4 Fri Jun 8 12:45:23 2001
@@ -19,16 +19,16 @@
am_cv_func_iconv="no, consider installing GNU libiconv"
am_cv_lib_iconv=no
AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
+#include <giconv.h>],
[iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
iconv_close(cd);],
am_cv_func_iconv=yes)
if test "$am_cv_func_iconv" != yes; then
am_save_LIBS="$LIBS"
- LIBS="$LIBS -liconv"
+ LIBS="$LIBS -lgiconv"
AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
+#include <giconv.h>],
[iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
iconv_close(cd);],
@@ -43,7 +43,7 @@
AC_CACHE_VAL(am_cv_proto_iconv, [
AC_TRY_COMPILE([
#include <stdlib.h>
-#include <iconv.h>
+#include <giconv.h>
extern
#ifdef __cplusplus
"C"
@@ -63,7 +63,7 @@
fi
LIBICONV=
if test "$am_cv_lib_iconv" = yes; then
- LIBICONV="-liconv"
+ LIBICONV="-lgiconv"
fi
AC_SUBST(LIBICONV)
])