Patch #836434: Use dlopen/dlsym on AIX if available. Also disable
_XOPEN_SOURCE on AIX 4.
This commit is contained in:
parent
e3be860619
commit
c19c5a62ae
|
@ -1,5 +1,5 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# From configure.in Revision: 1.439 .
|
# From configure.in Revision: 1.440 .
|
||||||
# Guess values for system-dependent variables and create Makefiles.
|
# Guess values for system-dependent variables and create Makefiles.
|
||||||
# Generated by GNU Autoconf 2.57 for python 2.4.
|
# Generated by GNU Autoconf 2.57 for python 2.4.
|
||||||
#
|
#
|
||||||
|
@ -1458,6 +1458,11 @@ case $ac_sys_system/$ac_sys_release in
|
||||||
# This should hopefully be fixed in FreeBSD 4.9
|
# This should hopefully be fixed in FreeBSD 4.9
|
||||||
FreeBSD/4.8* | Darwin/6* )
|
FreeBSD/4.8* | Darwin/6* )
|
||||||
define_xopen_source=no;;
|
define_xopen_source=no;;
|
||||||
|
# On AIX 4, mbstate_t is defined only when _XOPEN_SOURCE == 500 but used in
|
||||||
|
# wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined or
|
||||||
|
# has another value. By not (re)defining it, the defaults come in place.
|
||||||
|
AIX/4)
|
||||||
|
define_xopen_source=no;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if test $define_xopen_source = yes
|
if test $define_xopen_source = yes
|
||||||
|
@ -12984,7 +12989,12 @@ echo $ECHO_N "checking DYNLOADFILE... $ECHO_C" >&6
|
||||||
if test -z "$DYNLOADFILE"
|
if test -z "$DYNLOADFILE"
|
||||||
then
|
then
|
||||||
case $ac_sys_system/$ac_sys_release in
|
case $ac_sys_system/$ac_sys_release in
|
||||||
AIX*) DYNLOADFILE="dynload_aix.o";;
|
AIX*) # Use dynload_shlib.c and dlopen() if we have it; otherwise dynload_aix.c
|
||||||
|
if test "$ac_cv_func_dlopen" = yes
|
||||||
|
then DYNLOADFILE="dynload_shlib.o"
|
||||||
|
else DYNLOADFILE="dynload_aix.o"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
BeOS*) DYNLOADFILE="dynload_beos.o";;
|
BeOS*) DYNLOADFILE="dynload_beos.o";;
|
||||||
hp*|HP*) DYNLOADFILE="dynload_hpux.o";;
|
hp*|HP*) DYNLOADFILE="dynload_hpux.o";;
|
||||||
Darwin/*) DYNLOADFILE="dynload_next.o";;
|
Darwin/*) DYNLOADFILE="dynload_next.o";;
|
||||||
|
|
12
configure.in
12
configure.in
|
@ -156,6 +156,11 @@ case $ac_sys_system/$ac_sys_release in
|
||||||
# This should hopefully be fixed in FreeBSD 4.9
|
# This should hopefully be fixed in FreeBSD 4.9
|
||||||
FreeBSD/4.8* | Darwin/6* )
|
FreeBSD/4.8* | Darwin/6* )
|
||||||
define_xopen_source=no;;
|
define_xopen_source=no;;
|
||||||
|
# On AIX 4, mbstate_t is defined only when _XOPEN_SOURCE == 500 but used in
|
||||||
|
# wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined or
|
||||||
|
# has another value. By not (re)defining it, the defaults come in place.
|
||||||
|
AIX/4)
|
||||||
|
define_xopen_source=no;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if test $define_xopen_source = yes
|
if test $define_xopen_source = yes
|
||||||
|
@ -2036,7 +2041,12 @@ AC_MSG_CHECKING(DYNLOADFILE)
|
||||||
if test -z "$DYNLOADFILE"
|
if test -z "$DYNLOADFILE"
|
||||||
then
|
then
|
||||||
case $ac_sys_system/$ac_sys_release in
|
case $ac_sys_system/$ac_sys_release in
|
||||||
AIX*) DYNLOADFILE="dynload_aix.o";;
|
AIX*) # Use dynload_shlib.c and dlopen() if we have it; otherwise dynload_aix.c
|
||||||
|
if test "$ac_cv_func_dlopen" = yes
|
||||||
|
then DYNLOADFILE="dynload_shlib.o"
|
||||||
|
else DYNLOADFILE="dynload_aix.o"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
BeOS*) DYNLOADFILE="dynload_beos.o";;
|
BeOS*) DYNLOADFILE="dynload_beos.o";;
|
||||||
hp*|HP*) DYNLOADFILE="dynload_hpux.o";;
|
hp*|HP*) DYNLOADFILE="dynload_hpux.o";;
|
||||||
Darwin/*) DYNLOADFILE="dynload_next.o";;
|
Darwin/*) DYNLOADFILE="dynload_next.o";;
|
||||||
|
|
Loading…
Reference in New Issue