Removed pthread check

Author: jgg
Date: 1999-06-09 23:06:39 GMT
Removed pthread check

diff --git a/configure.in b/configure.in
index 736885c35af18d49fd38f376e289f693fcefc9f8..f8b0990690777ab0739e8bc522c2793134c60904 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -62,11 +62,11 @@ if test "$with_gpm" != "no"; then
 fi
 
 dnl Checks for pthread
 fi
 
 dnl Checks for pthread

-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)
-fi
+dnl AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD) PTHREADLIB="-lpthread"])
+dnl AC_SUBST(PTHREADLIB)
+dnl if test "$PTHREADLIB" != "-lpthread"; then
+dnl  AC_MSG_ERROR(failed: I need posix threads, pthread)
+dnl fi

 
 dnl Converts the ARCH to be the same as dpkg
 AC_MSG_CHECKING(system architecture)
 
 dnl Converts the ARCH to be the same as dpkg
 AC_MSG_CHECKING(system architecture)

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index 68511dd5b202004bf249b658f0ac48a5046d11cf..c702e2dc5af565654117cd8a4fbdeadb4f3696f2 100644 (file)
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: cdrom.cc,v 1.10 1999/06/05 03:54:29 jgg Exp $
+// $Id: cdrom.cc,v 1.11 1999/06/09 23:06:39 jgg Exp $

 /* ######################################################################
 
    CDROM URI method for APT
 /* ######################################################################
 
    CDROM URI method for APT


@@ -132,7 +132,10 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
            break;
         }       
       }
            break;
         }       
       }

-      
+
+      if (Hit == true)
+        break;
+        

       // I suppose this should prompt somehow?
       if (UnmountCdrom(CDROM) == false)
         return _error->Error("Unable to unmount the CD-ROM in %s, it may still be in use.",
       // I suppose this should prompt somehow?
       if (UnmountCdrom(CDROM) == false)
         return _error->Error("Unable to unmount the CD-ROM in %s, it may still be in use.",