[Python-checkins] r76821 - in python/branches/release31-maint: configure configure.in

[mark.dickinson]

Author: mark.dickinson
Date: Sun Dec 13 22:18:16 2009
New Revision: 76821

Log:
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.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/configure
   python/branches/release31-maint/configure.in

Modified: python/branches/release31-maint/configure
==============================================================================
--- python/branches/release31-maint/configure	(original)
+++ python/branches/release31-maint/configure	Sun Dec 13 22:18:16 2009
@@ -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 @@
     return 1;
   }
   sem_close(a);
+  sem_unlink("/autoconf");
   return 0;
 }
 
@@ -22639,7 +22640,7 @@
 #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 @@
   }
   res = sem_getvalue(a, &count);
   sem_close(a);
+  sem_unlink("/autocftw");
   return res==-1 ? 1 : 0;
 }
 

Modified: python/branches/release31-maint/configure.in
==============================================================================
--- python/branches/release31-maint/configure.in	(original)
+++ python/branches/release31-maint/configure.in	Sun Dec 13 22:18:16 2009
@@ -3359,6 +3359,7 @@
     return 1;
   }
   sem_close(a);
+  sem_unlink("/autoconf");
   return 0;
 }
 ], ac_cv_posix_semaphores_enabled=yes,
@@ -3382,7 +3383,7 @@
 #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 @@
   }
   res = sem_getvalue(a, &count);
   sem_close(a);
+  sem_unlink("/autocftw");
   return res==-1 ? 1 : 0;
 }
 ]