Merged revisions 76815 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76815 | mark.dickinson | 2009-12-13 21:10:57 +0000 (Sun, 13 Dec 2009) | 10 lines

  Merged revisions 76813 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r76813 | mark.dickinson | 2009-12-13 21:06:06 +0000 (Sun, 13 Dec 2009) | 3 lines

    Issue #7492: Autoconf tests were leaving semaphore files behind.  Add
    sem_unlink calls to delete those semaphore files.
  ........
................

diff --git a/configure b/configure
index a07d5192cf88b7de3e68eed39bf128b855725f76..f97d834d4bd3093edf5bde658b90dd5c075c3bed 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 76406 .
+# From configure.in Revision: 76567 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 3.1.
 #
@@ -22564,6 +22564,7 @@ int main(void) {
     return 1;
   }
   sem_close(a);
+  sem_unlink("/autoconf");
   return 0;
 }
 
@@ -22639,7 +22640,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <sys/stat.h>
 
 int main(void){
-  sem_t *a = sem_open("/autoconf", O_CREAT, S_IRUSR|S_IWUSR, 0);
+  sem_t *a = sem_open("/autocftw", O_CREAT, S_IRUSR|S_IWUSR, 0);
   int count;
   int res;
   if(a==SEM_FAILED){
@@ -22649,6 +22650,7 @@ int main(void){
   }
   res = sem_getvalue(a, &count);
   sem_close(a);
+  sem_unlink("/autocftw");
   return res==-1 ? 1 : 0;
 }
 

diff --git a/configure.in b/configure.in
index 09714d52394e9d995c970f35223c2b1ed942abf8..67f3be6da7de4467da15f730c62311cf24a11a04 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3359,6 +3359,7 @@ int main(void) {
     return 1;
   }
   sem_close(a);
+  sem_unlink("/autoconf");
   return 0;
 }
 ], ac_cv_posix_semaphores_enabled=yes,
@@ -3382,7 +3383,7 @@ AC_TRY_RUN([
 #include <sys/stat.h>
 
 int main(void){
-  sem_t *a = sem_open("/autoconf", O_CREAT, S_IRUSR|S_IWUSR, 0);
+  sem_t *a = sem_open("/autocftw", O_CREAT, S_IRUSR|S_IWUSR, 0);
   int count;
   int res;
   if(a==SEM_FAILED){
@@ -3392,6 +3393,7 @@ int main(void){
   }
   res = sem_getvalue(a, &count);
   sem_close(a);
+  sem_unlink("/autocftw");
   return res==-1 ? 1 : 0;
 }
 ]