diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-10-31 21:47:54 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-10-31 21:47:54 +0000 |
| commit | 6d19939d1db81859e3654daea5acc0d20bc85254 (patch) | |
| tree | f979b5fa8dfaddfd0b2c03dbb229963583492e19 /app/xfs | |
| parent | deb6f2f94c5f60c96cbb0535574fc8029ab1026e (diff) | |
regen
Diffstat (limited to 'app/xfs')
| -rw-r--r-- | app/xfs/Makefile.in | 3 | ||||
| -rw-r--r-- | app/xfs/aclocal.m4 | 4 | ||||
| -rw-r--r-- | app/xfs/configure | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/app/xfs/Makefile.in b/app/xfs/Makefile.in index b8971a3d1..45a0eba89 100644 --- a/app/xfs/Makefile.in +++ b/app/xfs/Makefile.in @@ -244,9 +244,8 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -ACLOCAL_AMFLAGS = -I m4 configdir = $(sysconfdir)/X11/fs -FONT_FLAGS = -DFONT_PCF -DFONT_FS -DFONT_SPEEDO -DFONTCACHE +FONT_FLAGS = -DFONT_PCF -DFONT_FS -DFONT_SPEEDO AM_CPPFLAGS = $(XFS_CFLAGS) -I$(top_srcdir)/include -DXFSPIDDIR=\"/var/run\" \ $(FONT_FLAGS) -D_BSD_SOURCE -DFONT_t -DTRANS_SERVER -DTRANS_REOPEN diff --git a/app/xfs/aclocal.m4 b/app/xfs/aclocal.m4 index 9e036f3c0..132fa4215 100644 --- a/app/xfs/aclocal.m4 +++ b/app/xfs/aclocal.m4 @@ -1609,7 +1609,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, diff --git a/app/xfs/configure b/app/xfs/configure index fa2512749..d8b7e28f4 100644 --- a/app/xfs/configure +++ b/app/xfs/configure @@ -6455,6 +6455,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; } @@ -6525,6 +6526,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. |