apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r1086571 - in /apr/apr/branches: 1.3.x/configure.in 1.3.x/include/apr.h.in 1.4.x/configure.in 1.4.x/include/apr.h.in 1.5.x/configure.in 1.5.x/include/apr.h.in
Date Tue, 29 Mar 2011 12:57:36 GMT
Author: fuankg
Date: Tue Mar 29 12:57:36 2011
New Revision: 1086571

URL: http://svn.apache.org/viewvc?rev=1086571&view=rev
Log:
Backport some configure magic from HEAD.

Modified:
    apr/apr/branches/1.3.x/configure.in
    apr/apr/branches/1.3.x/include/apr.h.in
    apr/apr/branches/1.4.x/configure.in
    apr/apr/branches/1.4.x/include/apr.h.in
    apr/apr/branches/1.5.x/configure.in
    apr/apr/branches/1.5.x/include/apr.h.in

Modified: apr/apr/branches/1.3.x/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/configure.in?rev=1086571&r1=1086570&r2=1086571&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/configure.in (original)
+++ apr/apr/branches/1.3.x/configure.in Tue Mar 29 12:57:36 2011
@@ -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
 

Modified: apr/apr/branches/1.3.x/include/apr.h.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/include/apr.h.in?rev=1086571&r1=1086570&r2=1086571&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/include/apr.h.in (original)
+++ apr/apr/branches/1.3.x/include/apr.h.in Tue Mar 29 12:57:36 2011
@@ -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_uin
  *
  * </PRE>
  */
-#define APR_THREAD_FUNC
+#define APR_THREAD_FUNC       @apr_thread_func@
 
 /**
  * The public APR functions are declared with APR_DECLARE(), so they may

Modified: apr/apr/branches/1.4.x/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/configure.in?rev=1086571&r1=1086570&r2=1086571&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/configure.in (original)
+++ apr/apr/branches/1.4.x/configure.in Tue Mar 29 12:57:36 2011
@@ -2675,13 +2675,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
 

Modified: apr/apr/branches/1.4.x/include/apr.h.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/include/apr.h.in?rev=1086571&r1=1086570&r2=1086571&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/include/apr.h.in (original)
+++ apr/apr/branches/1.4.x/include/apr.h.in Tue Mar 29 12:57:36 2011
@@ -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.
@@ -415,7 +415,7 @@ typedef  apr_uint32_t            apr_uin
  *
  * </PRE>
  */
-#define APR_THREAD_FUNC
+#define APR_THREAD_FUNC       @apr_thread_func@
 
 /**
  * The public APR functions are declared with APR_DECLARE(), so they may

Modified: apr/apr/branches/1.5.x/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/configure.in?rev=1086571&r1=1086570&r2=1086571&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/configure.in (original)
+++ apr/apr/branches/1.5.x/configure.in Tue Mar 29 12:57:36 2011
@@ -2675,13 +2675,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
 

Modified: apr/apr/branches/1.5.x/include/apr.h.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/include/apr.h.in?rev=1086571&r1=1086570&r2=1086571&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/include/apr.h.in (original)
+++ apr/apr/branches/1.5.x/include/apr.h.in Tue Mar 29 12:57:36 2011
@@ -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.
@@ -415,7 +415,7 @@ typedef  apr_uint32_t            apr_uin
  *
  * </PRE>
  */
-#define APR_THREAD_FUNC
+#define APR_THREAD_FUNC       @apr_thread_func@
 
 /**
  * The public APR functions are declared with APR_DECLARE(), so they may



Mime
View raw message