Ticket #548: db-4.8.30.patch

dist/Makefile.in

@@ -11 +11 @@
 bindir= @bindir@
 includedir=@includedir@
 libdir= @libdir@
-docdir= $(prefix)/docs
+docdir= @docdir@
 
 dmode=  755
 emode=  555

dist/configure

@@ -4533 +4533 @@
         CPPFLAGS="$CPPFLAGS -D_SGI_MP_SOURCE";;
 mpeix*) CPPFLAGS="$CPPFLAGS -D_POSIX_SOURCE -D_SOCKET_SOURCE"
         LIBSO_LIBS="$LIBSO_LIBS -lsocket -lsvipc";;
+haiku*)
+        LIBSO_LIBS="$LIBSO_LIBS -lnetwork";;
 osf*)   CPPFLAGS="$CPPFLAGS -pthread";;
 *qnx*)  qnx_build="yes"
         $as_echo "#define HAVE_QNX 1" >>confdefs.h

dist/configure.ac

@@ -190 +190 @@
         AH_TEMPLATE(HAVE_QNX, [Define to 1 if building on QNX.]);;
 solaris*)
         CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS ";;
+haiku*)
+        LIBSO_LIBS="$LIBSO_LIBS -lnetwork";;
 esac
 
 # If the user wants a debugging environment, change any compiler optimization
@@ -519 +521 @@
 # The Berkeley DB library calls fdatasync, only available in -lrt on Solaris.
 AC_SEARCH_LIBS(fdatasync, rt)
 
+# socket only available in -lnetwork on Haiku
+AC_SEARCH_LIBS(socket, network)
+
 AC_SEARCH_LIBS(getaddrinfo, nsl socket)
 AC_SEARCH_LIBS(hstrerror, resolv)
 

repmgr/repmgr_posix.c

@@ -488 +488 @@
  * PUBLIC: int __repmgr_writev __P((socket_t, db_iovec_t *, int, size_t *));
  */
 int
-__repmgr_writev(fd, iovec, buf_count, byte_count_p)
-        socket_t fd;
-        db_iovec_t *iovec;
-        int buf_count;
-        size_t *byte_count_p;
+__repmgr_writev(socket_t fd, db_iovec_t *iovec, int buf_count, size_t *byte_count_p)
 {
         int nw;
 
@@ -506 +502 @@
  * PUBLIC: int __repmgr_readv __P((socket_t, db_iovec_t *, int, size_t *));
  */
 int
-__repmgr_readv(fd, iovec, buf_count, byte_count_p)
-        socket_t fd;
-        db_iovec_t *iovec;
-        int buf_count;
-        size_t *byte_count_p;
+__repmgr_readv(socket_t fd, db_iovec_t *iovec, int buf_count, size_t *byte_count_p)
 {
         ssize_t nw;