Don't link with libw if libc already contains w* routines.

Link every library with libnsl if required.
Include ieeefp.h where necessary.
This commit is contained in:
Ulrich Weigand 2000-12-27 18:49:08 +00:00 committed by Alexandre Julliard
parent d34bc744f8
commit 2e8e2334c6
4 changed files with 381 additions and 350 deletions

713
configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -98,9 +98,9 @@ AC_CHECK_LIB(i386,i386_set_ldt)
dnl Check for -lossaudio for NetBSD
AC_CHECK_LIB(ossaudio,_oss_ioctl)
dnl Check for -lw for Solaris
AC_CHECK_LIB(w,iswalnum)
AC_CHECK_FUNCS(iswalnum,,AC_CHECK_LIB(w,iswalnum))
dnl Check for -lnsl for Solaris
AC_CHECK_FUNCS(gethostbyname,, AC_CHECK_LIB(nsl, gethostbyname, X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl", AC_CHECK_LIB(socket, gethostbyname, X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl", , -lnsl), -lsocket))
AC_CHECK_FUNCS(gethostbyname,,AC_CHECK_LIB(nsl,gethostbyname))
dnl Check for -lsocket for Solaris
AC_CHECK_FUNCS(connect,,AC_CHECK_LIB(socket,connect))
dnl Check for -lxpg4 for FreeBSD
@ -843,6 +843,7 @@ AC_CHECK_HEADERS(\
arpa/nameser.h \
elf.h \
float.h \
ieeefp.h \
libio.h \
libutil.h \
link.h \

View File

@ -26,6 +26,10 @@ UB 000416:
#include "crtdll.h"
#ifdef HAVE_IEEEFP_H
#include <ieeefp.h>
#endif
#include <ctype.h>
#define __USE_ISOC9X 1
#define __USE_ISOC99 1

View File

@ -218,6 +218,9 @@
/* Define if you have the inet_network function. */
#undef HAVE_INET_NETWORK
/* Define if you have the iswalnum function. */
#undef HAVE_ISWALNUM
/* Define if you have the lstat function. */
#undef HAVE_LSTAT
@ -323,6 +326,9 @@
/* Define if you have the <float.h> header file. */
#undef HAVE_FLOAT_H
/* Define if you have the <ieeefp.h> header file. */
#undef HAVE_IEEEFP_H
/* Define if you have the <libio.h> header file. */
#undef HAVE_LIBIO_H
@ -491,8 +497,5 @@
/* Define if you have the ossaudio library (-lossaudio). */
#undef HAVE_LIBOSSAUDIO
/* Define if you have the w library (-lw). */
#undef HAVE_LIBW
/* Define if you have the xpg4 library (-lxpg4). */
#undef HAVE_LIBXPG4