jorton 2004/02/18 02:39:09
Modified: . configure.in
build apr_hints.m4 config.guess config.sub
Log:
Revert to using i386-pc-os2-emx on OS/2 rather than non-standard
...-os2_emx; entirely untested:
* configure.in, build/apr_hints.m4: Match OS/2 by "*-os2*".
* build/config.sub, build/config.guess: Remove customisations for
*-os2.
Revision Changes Path
1.570 +2 -2 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.569
retrieving revision 1.570
diff -b -d -u -r1.569 -r1.570
--- configure.in 5 Feb 2004 11:10:39 -0000 1.569
+++ configure.in 18 Feb 2004 10:39:09 -0000 1.570
@@ -139,7 +139,7 @@
[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 @@
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"'
;;
1.56 +1 -1 apr/build/apr_hints.m4
Index: apr_hints.m4
===================================================================
RCS file: /home/cvs/apr/build/apr_hints.m4,v
retrieving revision 1.55
retrieving revision 1.56
diff -b -d -u -r1.55 -r1.56
--- apr_hints.m4 22 Dec 2003 21:03:55 -0000 1.55
+++ apr_hints.m4 18 Feb 2004 10:39:09 -0000 1.56
@@ -70,7 +70,7 @@
*-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])
1.9 +0 -3 apr/build/config.guess
Index: config.guess
===================================================================
RCS file: /home/cvs/apr/build/config.guess,v
retrieving revision 1.8
retrieving revision 1.9
diff -b -d -u -r1.8 -r1.9
--- config.guess 18 Feb 2004 10:15:58 -0000 1.8
+++ config.guess 18 Feb 2004 10:39:09 -0000 1.9
@@ -304,9 +304,6 @@
*:OS400:*:* | *:OS/400:*:*)
echo as400-ibm-os400
exit 0 ;;
- *:OS/2:*:*)
- echo "i386-pc-os2_emx"
- exit 0;;
#
# end Apache changes
#########################
1.8 +1 -1 apr/build/config.sub
Index: config.sub
===================================================================
RCS file: /home/cvs/apr/build/config.sub,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -d -u -r1.7 -r1.8
--- config.sub 18 Feb 2004 10:15:58 -0000 1.7
+++ config.sub 18 Feb 2004 10:39:09 -0000 1.8
@@ -1095,7 +1095,7 @@
########################
# changes for Apache
#
- -os2_emx | -os400* )
+ -os400* )
;;
#
# end Apache changes
