From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 16:55:32 +0000 (+0000)
Subject: OpenBSD fixes
X-Git-Tag: 0.7.24ubuntu1~1179
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/b819effdc984e492bbce459faa7432931ccfeb58?ds=sidebyside

OpenBSD fixes
Author: jgg
Date: 1999-12-11 02:11:10 GMT
OpenBSD fixes
---

diff --git a/buildlib/config.h.in b/buildlib/config.h.in
index f882ca25d..689549e65 100644
--- a/buildlib/config.h.in
+++ b/buildlib/config.h.in
@@ -23,6 +23,12 @@
 /* Define if we have the X11 windowing system. */
 #undef HAVE_X11
 
+/* Define if we have sys/vfs.h */
+#undef HAVE_VFS_H
+
+/* Define if we have sys/mount.h */
+#undef HAVE_MOUNT_H
+
 /* Define if we have enabled pthread support */
 #undef HAVE_PTHREAD
 
diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index e7545bac8..12aaa7cba 100644
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -14,6 +14,8 @@ LFLAGS+= @LDFLAGS@
 LEFLAGS+= 
 XLIBS:= @X_LIBS@ @X_PRE_LIBS@ @X11LIB@ @X_EXTRA_LIBS@
 SOCKETLIBS:= @SOCKETLIBS@
+AR:=@AR@
+RANLIB:=@RANLIB@
 
 # Dep generation - this only works for gnu stuff
 INLINEDEPFLAG = -MD
diff --git a/buildlib/staticlibrary.mak b/buildlib/staticlibrary.mak
index 998ca5bf2..0835fe8a0 100644
--- a/buildlib/staticlibrary.mak
+++ b/buildlib/staticlibrary.mak
@@ -39,6 +39,9 @@ $($(LOCAL)-LIB): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS)
 	echo Building library $@
 	-rm $@ > /dev/null 2>&1
 	$(AR) cq $@ $(filter %.o,$^)
+ifneq ($(words $(RANLIB)),0)
+	$(RANLIB) $@
+endif
 
 # Compilation rules
 vpath %.cc $(SUBDIRS)
diff --git a/buildlib/statvfs.h.in b/buildlib/statvfs.h.in
index 86b8c52cd..d0ec238ad 100644
--- a/buildlib/statvfs.h.in
+++ b/buildlib/statvfs.h.in
@@ -1,4 +1,13 @@
 /* Compatibility for systems with out Single Unix Spec statvfs */
+#include <config.h>
+
+#ifdef HAVE_VFS_H
 #include <sys/vfs.h>
+#endif
+
+#ifdef HAVE_MOUNT_H
+#include <sys/param.h>
+#include <sys/mount.h>
+#endif
 
 #define statvfs statfs
diff --git a/configure.in b/configure.in
index c0ecdaa05..366d70375 100644
--- a/configure.in
+++ b/configure.in
@@ -31,7 +31,9 @@ AC_CHECK_TOOL_PREFIX	dnl recheck, in case the initial guess was wrong
 
 dnl Check for other programs
 AC_PROG_CXX
-#AC_LANG_CPLUSPLUS
+AC_PROG_CPP
+AC_PROG_RANLIB
+AC_CHECK_TOOL(AR,ar,"ar")
 
 dnl Checks for sockets
 SAVE_LIBS="$LIBS"
@@ -98,6 +100,13 @@ dnl Single Unix Spec statvfs
 AC_CHECK_FUNC(statvfs,[HAVE_STATVFS=yes])
 AC_SUBST(HAVE_STATVFS)
 
+dnl Arg, linux and bsd put their statfs function in different places
+if test x"$HAVE_STATVFS" != x"yes"; then
+   AC_EGREP_HEADER(statfs,sys/vfs.h,[AC_DEFINE(HAVE_VFS_H)],[
+   AC_EGREP_HEADER(statfs,sys/mount.h,[AC_DEFINE(HAVE_MOUNT_H)],[AC_MSG_ERROR(failed: Need statvfs)])
+   ])
+fi
+
 dnl Check the sizes etc. of the architecture
 changequote(,)
 if archline="`grep \"^$archset\" $srcdir/buildlib/sizetable | cut -f 2- -d ' '`";then
diff --git a/methods/rfc2553emu.cc b/methods/rfc2553emu.cc
index 90443f835..05d9f0c32 100644
--- a/methods/rfc2553emu.cc
+++ b/methods/rfc2553emu.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: rfc2553emu.cc,v 1.5 1999/12/10 08:53:43 jgg Exp $
+// $Id: rfc2553emu.cc,v 1.6 1999/12/11 02:11:10 jgg Exp $
 /* ######################################################################
 
    RFC 2553 Emulation - Provides emulation for RFC 2553 getaddrinfo,
@@ -17,6 +17,7 @@
 #include "rfc2553emu.h"
 #include <stdlib.h>
 #include <arpa/inet.h>
+#include <netinet/in.h>
 #include <string.h>
 #include <stdio.h>