I lie. This patch didn't change a thing.
The latest HP/UX security patches cause detection of dlopen(), while
older builds only have shl support. This causes nightmares for bin
builds on HPUX11.
It seems we should check shl prior to dlopen(), since shl would be the
defacto standard on HPUX or platforms that implement it, no?
Attached is the patch for consideration... I'll apply on Monday if noone
yells loudly.
Bill
At 01:31 PM 10/7/2002, William A. Rowe, Jr. wrote:
>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
>> 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
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.484
diff -u -r1.484 configure.in
--- configure.in 3 Oct 2002 15:31:49 -0000 1.484
+++ configure.in 10 Oct 2002 23:09:42 -0000
@@ -1267,6 +1267,10 @@
[
AC_CHECK_FUNCS(NSLinkModule, [ tempdso="dyld" ], [ tempdso="no" ])
if test "$tempdso" = "no"; then
+ AC_CHECK_LIB(dld, shl_load, [ tempdso="shl" APR_ADDTO(LIBS,-ldld) ],
+ tempdso="no")
+ fi
+ if test "$tempdso" = "no"; then
AC_CHECK_FUNCS(dlopen, [ tempdso="dlfcn" ], [ tempdso="no" ])
fi
if test "$tempdso" = "no"; then
@@ -1275,10 +1279,6 @@
fi
if test "$tempdso" = "no"; then
AC_CHECK_LIB(root, load_image, tempdso="yes", tempdso="no")
- fi
- if test "$tempdso" = "no"; then
- AC_CHECK_LIB(dld, shl_load, [ tempdso="shl" APR_ADDTO(LIBS,-ldld) ],
- tempdso="no")
fi
if test "$tempdso" = "no"; then
case $host in
