gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r736 - Extractor


From: grothoff
Subject: [GNUnet-SVN] r736 - Extractor
Date: Thu, 5 May 2005 04:50:54 -0700 (PDT)

Author: grothoff
Date: 2005-05-05 04:50:49 -0700 (Thu, 05 May 2005)
New Revision: 736

Modified:
   Extractor/configure.ac
   Extractor/mkinstalldirs
Log:
fixed

Modified: Extractor/configure.ac
===================================================================
--- Extractor/configure.ac      2005-05-03 17:46:41 UTC (rev 735)
+++ Extractor/configure.ac      2005-05-05 11:50:49 UTC (rev 736)
@@ -102,7 +102,7 @@
 XTRA_CPPLIBS=$LIBS $XTRA_CPPLIBS
 
 AC_CHECK_HEADERS(langinfo.h)
-
+AC_CHECK_LIB(dl, dlopen)
 LIBS=$LIBSOLD
 # FIXME: allow --with-oggvorbis=PFX
 

Modified: Extractor/mkinstalldirs
===================================================================
--- Extractor/mkinstalldirs     2005-05-03 17:46:41 UTC (rev 735)
+++ Extractor/mkinstalldirs     2005-05-05 11:50:49 UTC (rev 736)
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
 
-scriptversion=2003-11-08.23
+scriptversion=2004-02-15.20
 
 # Original author: Noah Friedman <address@hidden>
 # Created: 1993-05-16
@@ -66,9 +66,15 @@
   0) exit 0 ;;
 esac
 
+# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
+# mkdir -p a/c at the same time, both will detect that a is missing,
+# one will create a, then the other will try to create a and die with
+# a "File exists" error.  This is a problem when calling mkinstalldirs
+# from a parallel make.  We use --version in the probe to restrict
+# ourselves to GNU mkdir, which is thread-safe.
 case $dirmode in
   '')
-    if mkdir -p -- . 2>/dev/null; then
+    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
       echo "mkdir -p -- $*"
       exec mkdir -p -- "$@"
     else
@@ -77,16 +83,17 @@
       # directories to create, and then abort because `.' already
       # exists.
       test -d ./-p && rmdir ./-p
-      test -d ./-- && rmdir ./--
+      test -d ./--version && rmdir ./--version
     fi
     ;;
   *)
-    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
+       test ! -d ./--version; then
       echo "mkdir -m $dirmode -p -- $*"
       exec mkdir -m "$dirmode" -p -- "$@"
     else
       # Clean up after NextStep and OpenStep mkdir.
-      for d in ./-m ./-p ./-- "./$dirmode";
+      for d in ./-m ./-p ./--version "./$dirmode";
       do
         test -d $d && rmdir $d
       done





reply via email to

[Prev in Thread] Current Thread [Next in Thread]