From 3983f30bd2f671d4f7c5bbe39a1d6a7b191f2af5 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Mon, 17 May 1999 20:03:24 +0000
Subject: See ChangeLog: Mon May 17 21:54:43 CEST 1999  Werner Koch

---
 configure.in | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'configure.in')

diff --git a/configure.in b/configure.in
index 2f2c49347..21d5f8cfd 100644
--- a/configure.in
+++ b/configure.in
@@ -7,6 +7,7 @@ AC_REVISION($Revision$)dnl
 dnl Must reset CDPATH so that bash's cd does not print to stdout
 CDPATH=
 
+AC_PREREQ(2.13)
 AC_INIT(g10/g10.c)
 AC_CONFIG_AUX_DIR(scripts)
 AM_CONFIG_HEADER(config.h)
@@ -221,9 +222,20 @@ if test "$try_gdbm" = yes; then
 AC_CHECK_LIB(gdbm,gdbm_firstkey)
 fi
 
-dnl Solaris needs -lsocket and -lnsl
-AC_CHECK_LIB(socket, socket)
+dnl Solaris needs -lsocket and -lnsl. Unisys system includes
+dnl gethostbyname in libsocket but needs libnsl for socket.
 AC_CHECK_LIB(nsl, gethostbyname)
+AC_CHECK_LIB(socket, socket, ac_need_libsocket=1, ac_try_nsl=1)
+if test x$ac_need_libsocket = x1; then
+    LIBS="$LIBS -lsocket"
+fi
+if test x$ac_try_nsl = x1; then
+    AC_CHECK_LIB(nsl, gethostbyname, ac_need_libnsl=1)
+    if test x$ac_need_libnsl = x1
+    then
+        LIBS="$LIBS -lnsl"
+    fi
+fi
 
 
 if test "$try_dynload" = yes ; then
-- 
cgit v1.2.3