Don't assume iconv is enabled. I didn't realize there was a configuration

control to turn it off and it wasn't being respected.

Pointed out by:	gshapiro
This commit is contained in:
Peter Wemm 2015-08-10 00:46:24 +00:00
parent 1838fc920f
commit 92ec33c978
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=286561
2 changed files with 2 additions and 2 deletions

View File

@ -122,7 +122,7 @@
#define APU_HAVE_NSS 0 #define APU_HAVE_NSS 0
#define APU_HAVE_APR_ICONV 0 #define APU_HAVE_APR_ICONV 0
#define APU_HAVE_ICONV 1 #define APU_HAVE_ICONV 0
#define APR_HAS_XLATE (APU_HAVE_APR_ICONV || APU_HAVE_ICONV) #define APR_HAS_XLATE (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
#endif /* APU_H */ #endif /* APU_H */

View File

@ -41,7 +41,7 @@
/* #undef HAVE_FREETDS_SYBDB_H */ /* #undef HAVE_FREETDS_SYBDB_H */
/* Define to 1 if you have the <iconv.h> header file. */ /* Define to 1 if you have the <iconv.h> header file. */
#define HAVE_ICONV_H 1 /* #undef HAVE_ICONV_H */
/* Define to 1 if you have the <inttypes.h> header file. */ /* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1 #define HAVE_INTTYPES_H 1