diff options
| author | jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68> | 2003-03-10 09:50:38 +0000 |
|---|---|---|
| committer | jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68> | 2003-03-10 09:50:38 +0000 |
| commit | bb1525726a359cf06ca943a7830cf8c897d023e7 (patch) | |
| tree | d56a662674f72f9b141865452143349d2b50f996 | |
| parent | a15f7f013989ade2f86968d0033f2e3b0fe59334 (diff) | |
| download | libapr-bb1525726a359cf06ca943a7830cf8c897d023e7.tar.gz | |
Tidy up langinfo checks: the results of these checks aren't exported
via apr.h, so there is no need to use APR_FLAG_*, and no need to check
for CODESET in configure.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64411 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | misc/unix/charset.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 52a4d9e68..85074066f 100644 --- a/configure.in +++ b/configure.in @@ -1835,9 +1835,8 @@ AC_SUBST(have_ipv6) dnl Check for langinfo support -APR_FLAG_HEADERS(langinfo.h) -APR_FLAG_FUNCS(nl_langinfo) -APR_CHECK_DEFINE(CODESET, langinfo.h, [CODESET defined in langinfo.h]) +AC_CHECK_HEADERS(langinfo.h) +AC_CHECK_FUNCS(nl_langinfo) dnl ----------------------------- Finalize the variables diff --git a/misc/unix/charset.c b/misc/unix/charset.c index aa41a79f4..90528e022 100644 --- a/misc/unix/charset.c +++ b/misc/unix/charset.c @@ -103,7 +103,7 @@ APR_DECLARE(const char*) apr_os_default_encoding (apr_pool_t *pool) APR_DECLARE(const char*) apr_os_locale_encoding (apr_pool_t *pool) { -#if defined(HAVE_NL_LANGINFO) && defined(HAVE_CODESET) +#if defined(HAVE_NL_LANGINFO) && defined(CODESET) const char *charset; charset = nl_langinfo(CODESET); |