From 62eda4d0c47775919e2c88b81a1f4b39cf604d94 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Sun, 13 Dec 2009 21:18:16 +0000 Subject: 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. ........ ................ --- configure | 6 ++++-- configure.in | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure b/configure index a07d519..f97d834 100755 --- 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 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 09714d5..67f3be6 100644 --- 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 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; } ] -- cgit v0.12