On the back of PR 45513
(https://issues.apache.org/bugzilla/show_bug.cgi?id=45513), shouldn't we
be moving that piece of code that manually overrides detection for
particular platforms to the very end, like we had it in 1.2.x?
Patch is attached. Please review, as it would be a good idea to put this
into 1.3.3.
--
Bojan
Index: configure.in
===================================================================
--- configure.in (revision 683725)
+++ configure.in (working copy)
@@ -1345,48 +1345,6 @@
socklen_t_value="int"
fi
-# Basically, we have tried to figure out the correct format strings
-# for APR types which vary between platforms, but we don't always get
-# it right.
-case $host in
- s390*linux*)
- # uniquely, the 31-bit Linux/s390 uses "unsigned long int"
- # for size_t rather than "unsigned int":
- size_t_fmt="lu"
- ssize_t_fmt="ld"
- ;;
- *-os2*)
- size_t_fmt="lu"
- ;;
- *-solaris*)
- if test "$ac_cv_sizeof_long" = "8"; then
- pid_t_fmt="d"
- else
- pid_t_fmt="ld"
- fi
- ;;
- *aix4*|*aix5*)
- ssize_t_fmt="ld"
- size_t_fmt="lu"
- ;;
- *beos*)
- ssize_t_fmt="ld"
- size_t_fmt="ld"
- ;;
- *apple-darwin*)
- osver=`uname -r`
- case $osver in
- [[0-7]].*)
- ssize_t_fmt="d"
- ;;
- *)
- ssize_t_fmt="ld"
- ;;
- esac
- size_t_fmt="lu"
- ;;
-esac
-
APR_CHECK_TYPES_COMPATIBLE(ssize_t, int, [ssize_t_fmt="d"])
APR_CHECK_TYPES_COMPATIBLE(ssize_t, long, [ssize_t_fmt="ld"])
APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned int, [size_t_fmt="u"])
@@ -1526,6 +1484,48 @@
have_iovec=1
fi
+# Basically, we have tried to figure out the correct format strings
+# for APR types which vary between platforms, but we don't always get
+# it right.
+case $host in
+ s390*linux*)
+ # uniquely, the 31-bit Linux/s390 uses "unsigned long int"
+ # for size_t rather than "unsigned int":
+ size_t_fmt="lu"
+ ssize_t_fmt="ld"
+ ;;
+ *-os2*)
+ size_t_fmt="lu"
+ ;;
+ *-solaris*)
+ if test "$ac_cv_sizeof_long" = "8"; then
+ pid_t_fmt='#define APR_PID_T_FMT "d"'
+ else
+ pid_t_fmt='#define APR_PID_T_FMT "ld"'
+ fi
+ ;;
+ *aix4*|*aix5*)
+ ssize_t_fmt="ld"
+ size_t_fmt="lu"
+ ;;
+ *beos*)
+ ssize_t_fmt="ld"
+ size_t_fmt="ld"
+ ;;
+ *apple-darwin*)
+ osver=`uname -r`
+ case $osver in
+ [[0-7]].*)
+ ssize_t_fmt="d"
+ ;;
+ *)
+ ssize_t_fmt="ld"
+ ;;
+ esac
+ size_t_fmt="lu"
+ ;;
+esac
+
AC_SUBST(voidp_size)
AC_SUBST(short_value)
AC_SUBST(int_value)
