[50736] trunk/base

[toby at macports.org]

Revision: 50736
          http://trac.macports.org/changeset/50736
Author:   toby at macports.org
Date:     2009-05-08 02:31:48 -0700 (Fri, 08 May 2009)
Log Message:
-----------
eliminate the last autoconf warning

Modified Paths:
--------------
    trunk/base/configure
    trunk/base/m4/pthread.m4

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2009-05-08 09:20:28 UTC (rev 50735)
+++ trunk/base/configure	2009-05-08 09:31:48 UTC (rev 50736)
@@ -4605,7 +4605,6 @@
 # Foundation checks
 
 
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

Modified: trunk/base/m4/pthread.m4
===================================================================
--- trunk/base/m4/pthread.m4	2009-05-08 09:20:28 UTC (rev 50735)
+++ trunk/base/m4/pthread.m4	2009-05-08 09:31:48 UTC (rev 50736)
@@ -49,8 +49,7 @@
 
 AC_DEFUN([ACX_PTHREAD], [
 AC_REQUIRE([AC_CANONICAL_HOST])
-AC_LANG_SAVE
-AC_LANG_C
+AC_LANG_PUSH([C])
 acx_pthread_ok=no
 
 # We used to check for pthread.h first, but this fails if pthread.h
@@ -167,11 +166,9 @@
         # pthread_cleanup_push because it is one of the few pthread
         # functions on Solaris that doesn't have a non-functional libc stub.
         # We try pthread_create on general principles.
-        AC_TRY_LINK([#include <pthread.h>],
-                    [pthread_t th; pthread_join(th, 0);
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], [[pthread_t th; pthread_join(th, 0);
                      pthread_attr_init(0); pthread_cleanup_push(0, 0);
-                     pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
-                    [acx_pthread_ok=yes])
+                     pthread_create(0,0,0,0); pthread_cleanup_pop(0); ]])],[acx_pthread_ok=yes],[])
 
         LIBS="$save_LIBS"
         CFLAGS="$save_CFLAGS"
@@ -197,8 +194,7 @@
 	AC_MSG_CHECKING([for joinable pthread attribute])
 	attr_name=unknown
 	for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-	    AC_TRY_LINK([#include <pthread.h>], [int attr=$attr;],
-                        [attr_name=$attr; break])
+	    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], [[int attr=$attr;]])],[attr_name=$attr; break],[])
 	done
         AC_MSG_RESULT($attr_name)
         if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
@@ -234,5 +230,5 @@
         acx_pthread_ok=no
         $2
 fi
-AC_LANG_RESTORE
+AC_LANG_POP([C])
 ])dnl ACX_PTHREAD
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090508/a4c6c59c/attachment.html>