From: Fabian Keil <fk@fabiankeil.de>
Date: Fri, 5 Oct 2012 12:14:33 +0000 (+0000)
Subject: Additional Haiku-specific improvements
X-Git-Tag: v_3_0_20~266
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=57572d756236b46786d4bb1af11bba40aa5d573a

Additional Haiku-specific improvements

- Disable checks intended for multi-user systems
  (as Haiku is presently single-user).
- Group Haiku-specific settings in their own section,
  following the pattern for Solaris, OS/2 and AmigaOS
- Add additional library-related settings to remove
  the need for providing configure with custom LDFLAGS.

Submitted by Simon South in #3574538.
---

diff --git a/configure.in b/configure.in
index bc8a3e35..3f65fdd5 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl $Id: configure.in,v 1.167 2011/12/31 14:43:40 fabiankeil Exp $
+dnl $Id: configure.in,v 1.168 2012/09/05 08:40:59 fabiankeil Exp $
 dnl
 dnl Written by and Copyright (C) 2001-2010 the
 dnl Privoxy team. http://www.privoxy.org/
@@ -32,7 +32,7 @@ dnl =================================================================
 dnl AutoConf Initialization
 dnl =================================================================
 
-AC_REVISION($Revision: 1.167 $)
+AC_REVISION($Revision: 1.168 $)
 AC_INIT(jcc.c)
 
 if test ! -f config.h.in; then
@@ -160,7 +160,7 @@ dnl Check for user and group validity
 dnl =================================================================
 
 
-if test "$EMXOS2" = yes; then
+if test "$EMXOS2" = yes || test "$host_os" = haiku; then
   echo "Skipping user and group validity stuff.";
 
 else
@@ -311,14 +311,7 @@ else
     echo "Using Cygnus (Win32 command line)"
   else
     SPECIAL_CFLAGS=
-    if test $host_os = haiku; then
-      dnl Haiku's pthreads implementation is contained in its system
-      dnl library, libroot, so no additional library needs to be
-      dnl searched
-      PTHREAD_LIB=
-    else
-      PTHREAD_LIB=-lpthread
-    fi
+    PTHREAD_LIB=-lpthread
   fi
 fi
 AC_SUBST(WIN_ONLY)
@@ -683,6 +676,26 @@ esac
 
 AC_SUBST(AMIGAOS_ONLY)
 
+dnl =================================================================
+dnl Haiku specific
+dnl =================================================================
+
+if test "$host_os" = haiku; then
+  # Omit the "-pthread" flag to gcc, even when building with gcc 2.95
+  SPECIAL_CFLAGS=
+
+  # Haiku's pthreads implementation exists in its system library,
+  # libroot, not in a separate pthreads library
+  PTHREAD_LIB=
+
+  # Networking code exists in libnetwork
+  SOCKET_LIB=-lnetwork
+
+  # Search Haiku's common-library folder to find its pcre and
+  # pcreposix libraries
+  LIBS="-L/boot/common/lib $LIBS"
+fi
+
 dnl =================================================================
 dnl Check for standard compiler stuff
 dnl =================================================================