Made pthread optional

Author: jgg
Date: 1999-08-05 05:55:45 GMT
Made pthread optional

diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc
index 8ae2686de8da19dfc626269d0204b2323dcbebcb..8db8bcc3c7044bc994d0a3bdf007c8fdad1628ee 100644 (file)
--- a/apt-pkg/contrib/error.cc
+++ b/apt-pkg/contrib/error.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: error.cc,v 1.6 1999/01/18 06:20:07 jgg Exp $
+// $Id: error.cc,v 1.7 1999/08/05 05:55:45 jgg Exp $
 /* ######################################################################
    
    Global Erorr Class - Global error mechanism
@@ -26,6 +26,7 @@
 #include <stdarg.h>
 #include <unistd.h>
 
+#include "config.h"
                                                                        /*}}}*/
 
 // Global Error Object                                                 /*{{{*/
@@ -33,8 +34,9 @@
    is compiled to be thread safe otherwise a non-safe version is used. A
    Per-Thread error object is maintained in much the same manner as libc
    manages errno */
-#if _POSIX_THREADS == 1
+#if _POSIX_THREADS == 1 && defined(HAVE_PTHREAD)
  #include <pthread.h>
+ #error PTHREAD
 
  static pthread_key_t ErrorKey;
  static void ErrorDestroy(void *Obj) {delete (GlobalError *)Obj;};

diff --git a/configure.in b/configure.in
index 92ecf058cae89bab78a35d4b63e070cd5a17ef57..d09e35fb3c6d8bf89cd5bc9057b63c64ae8a61fe 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -62,7 +62,7 @@ if test "$with_gpm" != "no"; then
 fi
 
 dnl Checks for pthread
-AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD) PTHREADLIB="-lpthread"])
+#AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD) PTHREADLIB="-lpthread"])
 AC_SUBST(PTHREADLIB)
 #if test "$PTHREADLIB" != "-lpthread"; then
 #  AC_MSG_ERROR(failed: I need posix threads, pthread)