[asterisk-commits] dbailey: trunk r189629 - in /trunk: ./ include/asterisk/

[SVN commits to the Asterisk project]

Author: dbailey
Date: Tue Apr 21 09:28:04 2009
New Revision: 189629

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=189629
Log:
Merged revisions 189601 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r189601 | dbailey | 2009-04-21 09:00:55 -0500 (Tue, 21 Apr 2009) | 3 lines
  
  Add check in configure script to check for GLOB_NOMAGIC and GLOB_BRACE in glob.h 
  This allows config.c to compile when linked against uclibc that does not support these parameters
........

Modified:
    trunk/   (props changed)
    trunk/configure
    trunk/configure.ac
    trunk/include/asterisk/autoconfig.h.in
    trunk/include/asterisk/compat.h

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/configure.ac
URL: http://svn.digium.com/svn-view/asterisk/trunk/configure.ac?view=diff&rev=189629&r1=189628&r2=189629
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Apr 21 09:28:04 2009
@@ -608,6 +608,10 @@
 	),
 	AC_MSG_RESULT(no)
 )
+
+AST_C_DEFINE_CHECK([GLOB_NOMAGIC], [GLOB_NOMAGIC], [glob.h])
+
+AST_C_DEFINE_CHECK([GLOB_BRACE], [GLOB_BRACE], [glob.h])
 
 AST_C_DEFINE_CHECK([IP_MTU_DISCOVER], [IP_MTU_DISCOVER], [netinet/in.h])
 

Modified: trunk/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/svn-view/asterisk/trunk/include/asterisk/autoconfig.h.in?view=diff&rev=189629&r1=189628&r2=189629
==============================================================================
--- trunk/include/asterisk/autoconfig.h.in (original)
+++ trunk/include/asterisk/autoconfig.h.in Tue Apr 21 09:28:04 2009
@@ -351,6 +351,18 @@
 
 /* Define to 1 if you have the `glob' function. */
 #undef HAVE_GLOB
+
+/* Define if your system has the GLOB_BRACE headers. */
+#undef HAVE_GLOB_BRACE
+
+/* Define GLOB_BRACE headers version */
+#undef HAVE_GLOB_BRACE_VERSION
+
+/* Define if your system has the GLOB_NOMAGIC headers. */
+#undef HAVE_GLOB_NOMAGIC
+
+/* Define GLOB_NOMAGIC headers version */
+#undef HAVE_GLOB_NOMAGIC_VERSION
 
 /* Define if your system has the GMIME libraries. */
 #undef HAVE_GMIME

Modified: trunk/include/asterisk/compat.h
URL: http://svn.digium.com/svn-view/asterisk/trunk/include/asterisk/compat.h?view=diff&rev=189629&r1=189628&r2=189629
==============================================================================
--- trunk/include/asterisk/compat.h (original)
+++ trunk/include/asterisk/compat.h Tue Apr 21 09:28:04 2009
@@ -187,10 +187,10 @@
 #define GLOB_ABORTED GLOB_ABEND
 #endif
 #include <glob.h>
-#ifdef SOLARIS
+#if !defined(HAVE_GLOB_NOMAGIC) || !defined(HAVE_GLOB_BRACE)
 #define MY_GLOB_FLAGS   GLOB_NOCHECK
 #else
-#define MY_GLOB_FLAGS   (GLOB_NOMAGIC|GLOB_BRACE)
+#define MY_GLOB_FLAGS   (GLOB_NOMAGIC | GLOB_BRACE)
 #endif
 
 #endif