debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change to detect iconv implementation with autoconf

Browse Source 
Use iconv.m4 (and required macros) form gettext-0.21.
This commit is contained in:
OBATA Akio
2021-09-20 17:46:34 +09:00
parent be6bc0aa54
commit 20c1768a19
14 changed files with 2961 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cde/programs/dtcm/dtcm/RFCMIME.c
View File

@@ -45,6 +45,10 @@ static char sccsid[] = "$TOG: RFCMIME.c /main/11 1999/06/30 12:08:55 mgreess $";
* OBJECT CODE ONLY SOURCE MATERIALS
*/
#ifdef HAVE_CONFIG_H
#include <autotools_config.h>
#endif
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
@@ -61,11 +65,7 @@ static char sccsid[] = "$TOG: RFCMIME.c /main/11 1999/06/30 12:08:55 mgreess $";
#include <locale.h>
#include <LocaleXlate.h>
#ifdef ICONV_INBUF_CONST
# define ICONV_INBUF_TYPE const char **
#else
# define ICONV_INBUF_TYPE char **
#endif
#define ICONV_INBUF_TYPE ICONV_CONST char **
#define WORKSIZE 1024*10
/*

10
cde/programs/dtcm/dtcm/cm_i18n.c
View File

@@ -50,6 +50,10 @@
#ifndef lint
#endif
#ifdef HAVE_CONFIG_H
#include <autotools_config.h>
#endif
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
@@ -128,11 +132,7 @@ static int isFirstCall = ~0;
static iconv_t CD = (iconv_t)-1;
static int amI_932 = ~0;
#ifdef ICONV_INBUF_CONST
# define ICONV_INBUF_TYPE const char **
#else
# define ICONV_INBUF_TYPE char **
#endif
#define ICONV_INBUF_TYPE ICONV_CONST char **
void _converter_( void *from, unsigned long from_len,
void **to, unsigned long *to_len )

10
cde/programs/dthelp/dthelpprint/PrintTopics.c
View File

@@ -38,6 +38,10 @@ $COPYRIGHT$:
==$END$==============================================================*/
#endif
#ifdef HAVE_CONFIG_H
#include <autotools_config.h>
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -523,11 +527,7 @@ cleanup:
return ret;
} /* count lines */
#ifdef ICONV_INBUF_CONST
# define ICONV_INBUF_TYPE const char **
#else
# define ICONV_INBUF_TYPE char **
#endif
#define ICONV_INBUF_TYPE ICONV_CONST char **
#define WORKSIZE 1024*10 /* 10k */

6
cde/programs/dtmail/dtmailpr/Makefile.am
View File

@@ -5,11 +5,7 @@ bin_PROGRAMS = dtmailpr
dtmailpr_CXXFLAGS = -I../include -I../../dtcompat -I../../../. \
-I$(srcdir)/lib
dtmailpr_LDADD = ../libDtMail/libDtMail.a $(DTCLIENTLIBS) $(XTOOLLIB)
if FREEBSD
dtmailpr_LDADD += -liconv
endif
dtmailpr_LDADD = ../libDtMail/libDtMail.a $(DTCLIENTLIBS) $(XTOOLLIB) $(LTLIBICONV)
# FIXME - solaris
#if SOLARIS