diff options
| author | brane <brane@13f79535-47bb-0310-9956-ffa450edef68> | 2003-03-07 19:05:54 +0000 |
|---|---|---|
| committer | brane <brane@13f79535-47bb-0310-9956-ffa450edef68> | 2003-03-07 19:05:54 +0000 |
| commit | 24f4b0b5a5284371f4aa99576965981fc6fedf63 (patch) | |
| tree | e895a4fecdaace87e0d02537073e2da08e4998e5 | |
| parent | feaa508d207be10ea108da6fe8ad552371d41e02 (diff) | |
| download | libapr-24f4b0b5a5284371f4aa99576965981fc6fedf63.tar.gz | |
Check for nl_langinfo and friends at configure time, and include
apr_private.h in misc/unix/charset.c so that the Unix version of
apr_os_locale_encoding actually has a chance to return something
different from apr_os_default_encoding.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64408 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | misc/unix/charset.c | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 804325275..52a4d9e68 100644 --- a/configure.in +++ b/configure.in @@ -1833,6 +1833,12 @@ fi 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]) + dnl ----------------------------- Finalize the variables echo "${nl}Restore user-defined environment settings..." diff --git a/misc/unix/charset.c b/misc/unix/charset.c index 96886485f..aa41a79f4 100644 --- a/misc/unix/charset.c +++ b/misc/unix/charset.c @@ -53,6 +53,7 @@ */ #include "apr.h" +#include "apr_private.h" #include "apr_strings.h" #include "apr_portable.h" |