diff options
| -rw-r--r-- | configure.in | 10 | ||||
| -rw-r--r-- | methods/cdrom.cc | 7 |
2 files changed, 10 insertions, 7 deletions
diff --git a/configure.in b/configure.in index 736885c35..f8b099069 100644 --- a/configure.in +++ b/configure.in @@ -62,11 +62,11 @@ if test "$with_gpm" != "no"; then 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) diff --git a/methods/cdrom.cc b/methods/cdrom.cc index 68511dd5b..c702e2dc5 100644 --- a/methods/cdrom.cc +++ b/methods/cdrom.cc @@ -1,6 +1,6 @@ // -*- 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 @@ -132,7 +132,10 @@ bool CDROMMethod::Fetch(FetchItem *Itm) 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.", |