diff options
| author | Guenter Knauf <fuankg@apache.org> | 2011-03-29 12:57:36 +0000 |
|---|---|---|
| committer | Guenter Knauf <fuankg@apache.org> | 2011-03-29 12:57:36 +0000 |
| commit | 6217ed4e04edee682ba0b7637b2a9d6843f3695b (patch) | |
| tree | 5a9a235931025b05b1de49ba11d5110e5a5ff1ca | |
| parent | e3e81da330cce738f24fe5e2debebb8e0e00613e (diff) | |
| download | apr-6217ed4e04edee682ba0b7637b2a9d6843f3695b.tar.gz | |
Backport some configure magic from HEAD.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.3.x@1086571 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | configure.in | 18 | ||||
| -rw-r--r-- | include/apr.h.in | 8 |
2 files changed, 18 insertions, 8 deletions
diff --git a/configure.in b/configure.in index 3a1b056ea..2c36ede92 100644 --- a/configure.in +++ b/configure.in @@ -2484,13 +2484,23 @@ dnl Check for langinfo support AC_CHECK_HEADERS(langinfo.h) AC_CHECK_FUNCS(nl_langinfo) +dnl ------------------------------ Defaults for some platform nuances + dnl Do we have a Win32-centric Unicode FS? +APR_SETIFNULL(have_unicode_fs, [0]) +AC_SUBST(have_unicode_fs) -if test -z "$have_unicode_fs"; then - have_unicode_fs="0" -fi +APR_SETIFNULL(apr_has_xthread_files, [0]) +AC_SUBST(apr_has_xthread_files) -AC_SUBST(have_unicode_fs) +APR_SETIFNULL(apr_procattr_user_set_requires_password, [0]) +AC_SUBST(apr_procattr_user_set_requires_password) + +APR_SETIFNULL(apr_thread_func, []) +AC_SUBST(apr_thread_func) + +APR_SETIFNULL(apr_has_user, [1]) +AC_SUBST(apr_has_user) dnl ----------------------------- Finalize the variables diff --git a/include/apr.h.in b/include/apr.h.in index c77429ce6..1ff814ed6 100644 --- a/include/apr.h.in +++ b/include/apr.h.in @@ -239,12 +239,12 @@ extern "C" { #define APR_HAS_SO_ACCEPTFILTER @acceptfilter@ #define APR_HAS_UNICODE_FS @have_unicode_fs@ #define APR_HAS_PROC_INVOKED @have_proc_invoked@ -#define APR_HAS_USER 1 +#define APR_HAS_USER @apr_has_user@ #define APR_HAS_LARGE_FILES @aprlfs@ -#define APR_HAS_XTHREAD_FILES 0 +#define APR_HAS_XTHREAD_FILES @apr_has_xthread_files@ #define APR_HAS_OS_UUID @osuuid@ -#define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD 0 +#define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD @apr_procattr_user_set_requires_password@ /* APR sets APR_FILES_AS_SOCKETS to 1 on systems where it is possible * to poll on files/pipes. @@ -381,7 +381,7 @@ typedef apr_uint32_t apr_uintptr_t; * * </PRE> */ -#define APR_THREAD_FUNC +#define APR_THREAD_FUNC @apr_thread_func@ /** * The public APR functions are declared with APR_DECLARE(), so they may |