From 6face34a456517470d0d06ec1870dfd66b7342d2 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 15 Jul 2017 13:50:02 +0200
Subject: apply 1.5.2 patch.


diff --git a/config.layout b/config.layout
index 0f42e84..2e29914 100644
--- a/config.layout
+++ b/config.layout
@@ -60,6 +60,23 @@
     runtimedir:    ${localstatedir}/run
 </Layout>
 
+#	Haiku Layout making use of finddir
+<Layout haiku>
+    prefix:        /boot/system
+    exec_prefix:   /boot/system
+    bindir:        /boot/system/bin
+    sbindir:       /boot/system/servers
+    libdir:        /boot/system/lib
+    libexecdir:    /boot/system/servers
+    mandir:        /boot/system/documentation/man
+    sysconfdir:    /boot/system/settings
+    datadir:       /boot/system/data
+    installbuilddir: /boot/develop/build
+    includedir:    /boot/system/include
+    localstatedir: /boot/system/var
+    runtimedir:    ${localstatedir}/log
+</Layout>
+
 #   Mac OS X Server (Rhapsody)
 <Layout Mac OS X Server>
     prefix:        /Local/Library/WebServer
diff --git a/configure.in b/configure.in
index 927e1e6..606ed16 100644
--- a/configure.in
+++ b/configure.in
@@ -203,7 +203,7 @@ AC_PROG_MAKE_SET
 AC_PROG_CPP
 AC_PROG_AWK
 AC_PROG_LN_S
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 AC_CHECK_PROG(RM, rm, rm)
 AC_CHECK_PROG(AS, as, as)
@@ -718,9 +718,9 @@ case $host in
       ac_cv_func_CreateFileMapping=yes
       ;;
    *)
+      AC_SEARCH_LIBS(socket, socket network)
       AC_SEARCH_LIBS(gethostbyname, nsl)
       AC_SEARCH_LIBS(gethostname, nsl)
-      AC_SEARCH_LIBS(socket, socket)
       AC_SEARCH_LIBS(crypt, crypt ufc)
       AC_CHECK_LIB(truerand, main)
       AC_SEARCH_LIBS(modf, m)
-- 
2.12.2