Merged revisions 241938 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r241938 | seanbright | 2010-01-21 10:27:42 -0500 (Thu, 21 Jan 2010) | 12 lines

  Merged revisions 241932 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r241932 | seanbright | 2010-01-21 10:25:46 -0500 (Thu, 21 Jan 2010) | 5 lines

    Fix configure check for PTHREAD_ONCE_INIT when manually adding -Wall to CFLAGS.

    (closes issue #16666)
    Reported by: romain_proformatique
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@241939 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configure b/configure
index f0e78a241984bc241126cd71a8a47ed820a3d2b3..fd8b87bf78d85f20f42fd50797a912578298d713 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 235657 .
+# From configure.ac Revision: 236633 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.64 for asterisk 1.6.
 #
@@ -12596,10 +12596,11 @@ CFLAGS="${CFLAGS} -Werror -Wmissing-braces"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
+     void empty(){}
 int
 main ()
 {
-pthread_once_t once = PTHREAD_ONCE_INIT;
+pthread_once_t once = PTHREAD_ONCE_INIT; pthread_once(&once, empty);
   ;
   return 0;
 }

diff --git a/configure.ac b/configure.ac
index ea5c768d63f4102332e0ca134c114270e529c701..e9c39f54152bb3ac991297531206dc9db96b590e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -481,8 +481,9 @@ saved_CFLAGS="${CFLAGS}"
 CFLAGS="${CFLAGS} -Werror -Wmissing-braces"
 AC_COMPILE_IFELSE(
   [AC_LANG_PROGRAM(
-    [#include <pthread.h>],
-       [pthread_once_t once = PTHREAD_ONCE_INIT;])
+    [#include <pthread.h>
+     void empty(){}],
+       [pthread_once_t once = PTHREAD_ONCE_INIT; pthread_once(&once, empty);])
   ],[
     AC_MSG_RESULT(no)
     ac_cv_pthread_once_needsbraces="no"