summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build/apr_hints.m42
-rwxr-xr-xbuild/config.guess3
-rwxr-xr-xbuild/config.sub2
-rw-r--r--configure.in4
4 files changed, 4 insertions, 7 deletions
diff --git a/build/apr_hints.m4 b/build/apr_hints.m4
index e124ca18c..30fce1616 100644
--- a/build/apr_hints.m4
+++ b/build/apr_hints.m4
@@ -70,7 +70,7 @@ if test "x$apr_preload_done" != "xyes" ; then
*-dg-dgux*)
APR_ADDTO(CPPFLAGS, [-DDGUX])
;;
- *os2_emx*)
+ *-os2*)
APR_SETVAR(SHELL, [sh])
APR_SETIFNULL(apr_gethostbyname_is_thread_safe, [yes])
APR_SETIFNULL(apr_gethostbyaddr_is_thread_safe, [yes])
diff --git a/build/config.guess b/build/config.guess
index 2d285ae1f..d1f30a9e4 100755
--- a/build/config.guess
+++ b/build/config.guess
@@ -304,9 +304,6 @@ EOF
*:OS400:*:* | *:OS/400:*:*)
echo as400-ibm-os400
exit 0 ;;
- *:OS/2:*:*)
- echo "i386-pc-os2_emx"
- exit 0;;
#
# end Apache changes
#########################
diff --git a/build/config.sub b/build/config.sub
index fc44869d4..0d6cce6c9 100755
--- a/build/config.sub
+++ b/build/config.sub
@@ -1095,7 +1095,7 @@ case $os in
########################
# changes for Apache
#
- -os2_emx | -os400* )
+ -os400* )
;;
#
# end Apache changes
diff --git a/configure.in b/configure.in
index d05d64710..956bfd161 100644
--- a/configure.in
+++ b/configure.in
@@ -139,7 +139,7 @@ AC_ARG_ENABLE(experimental-libtool,[ --experimental-libtool Use experimental cu
[experimental_libtool=$enableval],[experimental_libtool=no])
case $host in
-*os2*)
+*-os2*)
# Use a custom-made libtool replacement
echo "using aplibtool"
LIBTOOL="$srcdir/build/aplibtool"
@@ -1196,7 +1196,7 @@ case $host in
s390*linux*)
size_t_fmt='#define APR_SIZE_T_FMT "ld"'
;;
- *os2_emx)
+ *-os2*)
off_t_fmt='#define APR_OFF_T_FMT "ld"'
size_t_fmt='#define APR_SIZE_T_FMT "lu"'
;;