This patch borked DSO_USE_SHL detection for HP/UX. Ideas?
Bill At 02:26 PM 9/22/2002, [EMAIL PROTECTED] wrote: >brianp 2002/09/22 12:26:42 > > Modified: . CHANGES configure.in > build apr_hints.m4 > file_io/unix filestat.c > Log: > Added support for SCO OpenServer 5 > Submitted by: Kean Johnston <[EMAIL PROTECTED]> > Reviewed by: Brian Pane > > Revision Changes Path > 1.338 +2 -0 apr/CHANGES > > Index: CHANGES > =================================================================== > RCS file: /home/cvs/apr/CHANGES,v > retrieving revision 1.337 > retrieving revision 1.338 > diff -u -r1.337 -r1.338 > --- CHANGES 22 Sep 2002 04:17:02 -0000 1.337 > +++ CHANGES 22 Sep 2002 19:26:41 -0000 1.338 > @@ -1,5 +1,7 @@ > Changes with APR 0.9.2 > > + *) Support for SCO OpenServer Release 5 [Kean Johnston <[EMAIL > PROTECTED]>] > + > *) Faster (inline and mutex-free) implementations of all apr_atomic > operations for Linux/x86 (requires a 486 or later; to enable, > configure APR with --enable-nonportable-atomics=yes ) [Brian Pane] > > > > 1.483 +6 -4 apr/configure.in > > Index: configure.in > =================================================================== > RCS file: /home/cvs/apr/configure.in,v > retrieving revision 1.482 > retrieving revision 1.483 > diff -u -r1.482 -r1.483 > --- configure.in 20 Sep 2002 10:42:37 -0000 1.482 > +++ configure.in 22 Sep 2002 19:26:41 -0000 1.483 > @@ -1173,7 +1173,9 @@ > > APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], pid_t, 8) > > -if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_int"; then > +if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then > + pid_t_fmt='#define APR_PID_T_FMT "hd"' > +elif test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_int"; then > pid_t_fmt='#define APR_PID_T_FMT "d"' > elif test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_long"; then > pid_t_fmt='#define APR_PID_T_FMT "ld"' > @@ -1265,11 +1267,11 @@ > [ > AC_CHECK_FUNCS(NSLinkModule, [ tempdso="dyld" ], [ tempdso="no" ]) > if test "$tempdso" = "no"; then > - AC_CHECK_LIB(dl, dlopen, [ tempdso="dlfcn" APR_ADDTO(LIBS,-ldl) ], > - tempdso="no") > + AC_CHECK_FUNCS(dlopen, [ tempdso="dlfcn" ], [ tempdso="no" ]) > fi > if test "$tempdso" = "no"; then > - AC_CHECK_FUNCS(dlopen, [ tempdso="dlfcn" ], [ tempdso="no" ]) > + AC_CHECK_LIB(dl, dlopen, [ tempdso="dlfcn" APR_ADDTO(LIBS,-ldl) ], > + tempdso="no") > fi > if test "$tempdso" = "no"; then > AC_CHECK_LIB(root, load_image, tempdso="yes", tempdso="no") > > > > 1.44 +3 -3 apr/build/apr_hints.m4 > > Index: apr_hints.m4 > =================================================================== > RCS file: /home/cvs/apr/build/apr_hints.m4,v > retrieving revision 1.43 > retrieving revision 1.44 > diff -u -r1.43 -r1.44 > --- apr_hints.m4 9 May 2002 23:27:20 -0000 1.43 > +++ apr_hints.m4 22 Sep 2002 19:26:41 -0000 1.44 > @@ -173,14 +173,14 @@ > APR_ADDTO(LDFLAGS, [-posix]) > APR_ADDTO(LIBS, [-linet]) > ;; > - *-sco3*) > + *-sco3.2v[234]*) > APR_ADDTO(CPPFLAGS, [-DSCO -D_REENTRANT]) > APR_ADDTO(CFLAGS, [-Oacgiltz]) > APR_ADDTO(LIBS, [-lPW -lmalloc _i]) > ;; > - *-sco5*) > + *-sco3.2v5*) > APR_ADDTO(CPPFLAGS, [-DSCO5 -D_REENTRANT]) > - APR_ADDTO(LIBS, [-lmalloc -lprot -ltinfo -lx]) > + APR_ADDTO(LIBS, [-lprot]) > ;; > *-sco_sv*|*-SCO_SV*) > APR_ADDTO(CPPFLAGS, [-DSCO -D_REENTRANT]) > > > > 1.57 +1 -1 apr/file_io/unix/filestat.c > > Index: filestat.c > =================================================================== > RCS file: /home/cvs/apr/file_io/unix/filestat.c,v > retrieving revision 1.56 > retrieving revision 1.57 > diff -u -r1.56 -r1.57 > --- filestat.c 1 Jul 2002 14:04:58 -0000 1.56 > +++ filestat.c 22 Sep 2002 19:26:41 -0000 1.57 > @@ -74,7 +74,7 @@ > type = APR_PIPE; > if (S_ISLNK(mode)) > type = APR_LNK; > -#ifndef BEOS > +#if !defined(BEOS) && defined(S_ISSOCK) > if (S_ISSOCK(mode)) > type = APR_SOCK; > #endif > > >
