This commit is contained in:
matthieu 2009-12-18 22:50:53 +00:00
parent e5c0b4face
commit b4fa99e3fd
3 changed files with 16 additions and 3 deletions

4
xserver/aclocal.m4 vendored
View File

@ -8254,7 +8254,9 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[
# SVR4 hides these in libraries other than libc
AC_SEARCH_LIBS(socket, [socket])
AC_SEARCH_LIBS(gethostbyname, [nsl])
AC_HAVE_LIBRARY([ws2_32])
if test "$ac_cv_search_socket$ac_cv_search_gethostbyname" = "nono"; then
AC_HAVE_LIBRARY([ws2_32])
fi
# Needs to come after above checks for libsocket & libnsl for SVR4 systems
AC_ARG_ENABLE(ipv6,

8
xserver/configure vendored
View File

@ -27891,6 +27891,12 @@ _ACEOF
s390*)
GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
;;
hppa*)
case $host_os in
*openbsd*) HPPA_VIDEO=yes
;;
esac
;;
esac
@ -28909,6 +28915,7 @@ if test "$ac_res" != no; then
fi
if test "$ac_cv_search_socket$ac_cv_search_gethostbyname" = "nono"; then
{ $as_echo "$as_me:$LINENO: checking for main in -lws2_32" >&5
$as_echo_n "checking for main in -lws2_32... " >&6; }
@ -28979,6 +28986,7 @@ _ACEOF
fi
ac_cv_lib_ws2_32=ac_cv_lib_ws2_32_main
fi
# Needs to come after above checks for libsocket & libnsl for SVR4 systems
# Check whether --enable-ipv6 was given.

View File

@ -72,7 +72,8 @@ am__libbsd_la_SOURCES_DIST = $(srcdir)/../shared/posix_tty.c \
@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_TRUE@am__objects_1 = ppc_video.lo \
@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_TRUE@ ioperm_noop.lo
@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_TRUE@am__objects_1 = i386_video.lo
@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_TRUE@am__objects_1 = hppa_video.lo
@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_TRUE@am__objects_1 = hppa_video.lo \
@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_TRUE@ ioperm_noop.lo
@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_TRUE@am__objects_1 = hp300_video.lo \
@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_TRUE@ ioperm_noop.lo
@ALPHA_VIDEO_FALSE@@ARM_VIDEO_TRUE@am__objects_1 = arm_video.lo \
@ -602,7 +603,9 @@ RES_SOURCES = $(srcdir)/../shared/stdResource.c
@HP300_VIDEO_TRUE@ARCH_SOURCES = hp300_video.c \
@HP300_VIDEO_TRUE@ $(srcdir)/../shared/ioperm_noop.c
@HPPA_VIDEO_TRUE@ARCH_SOURCES = hppa_video.c
@HPPA_VIDEO_TRUE@ARCH_SOURCES = hppa_video.c \
@HPPA_VIDEO_TRUE@ $(srcdir)/../shared/ioperm_noop.c
@I386_VIDEO_TRUE@ARCH_SOURCES = i386_video.c
@PPC_VIDEO_TRUE@ARCH_SOURCES = ppc_video.c \
@PPC_VIDEO_TRUE@ $(srcdir)/../shared/ioperm_noop.c