From 8ca7440026f2859e892ecefb1402cdf9f50df5ae Mon Sep 17 00:00:00 2001
From: matthieu <matthieu@openbsd.org>
Date: Sat, 31 Oct 2009 21:47:52 +0000
Subject: [PATCH] regen

---
 app/xfs/Makefile.in | 3 +--
 app/xfs/aclocal.m4  | 4 +++-
 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.