[asterisk-commits] dbailey: branch 1.6.1 r189642 - in /branches/1.6.1: ./ include/asterisk/ main/

[SVN commits to the Asterisk project]

Author: dbailey
Date: Tue Apr 21 10:20:22 2009
New Revision: 189642

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

................
  r189629 | dbailey | 2009-04-21 09:28:04 -0500 (Tue, 21 Apr 2009) | 10 lines
  
  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:
    branches/1.6.1/   (props changed)
    branches/1.6.1/configure
    branches/1.6.1/configure.ac
    branches/1.6.1/include/asterisk/autoconfig.h.in
    branches/1.6.1/include/asterisk/compat.h
    branches/1.6.1/main/config.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/configure.ac
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/configure.ac?view=diff&rev=189642&r1=189641&r2=189642
==============================================================================
--- branches/1.6.1/configure.ac (original)
+++ branches/1.6.1/configure.ac Tue Apr 21 10:20:22 2009
@@ -582,6 +582,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: branches/1.6.1/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/include/asterisk/autoconfig.h.in?view=diff&rev=189642&r1=189641&r2=189642
==============================================================================
--- branches/1.6.1/include/asterisk/autoconfig.h.in (original)
+++ branches/1.6.1/include/asterisk/autoconfig.h.in Tue Apr 21 10:20:22 2009
@@ -327,6 +327,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: branches/1.6.1/include/asterisk/compat.h
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/include/asterisk/compat.h?view=diff&rev=189642&r1=189641&r2=189642
==============================================================================
--- branches/1.6.1/include/asterisk/compat.h (original)
+++ branches/1.6.1/include/asterisk/compat.h Tue Apr 21 10:20:22 2009
@@ -182,4 +182,15 @@
 typedef unsigned long long uint64_t;
 #endif
 
+/* glob compat stuff */
+#if defined(__Darwin__) || defined(__CYGWIN__)
+#define GLOB_ABORTED GLOB_ABEND
 #endif
+#include <glob.h>
+#if !defined(HAVE_GLOB_NOMAGIC) || !defined(HAVE_GLOB_BRACE)
+#define MY_GLOB_FLAGS   GLOB_NOCHECK
+#else
+#define MY_GLOB_FLAGS   (GLOB_NOMAGIC | GLOB_BRACE)
+#endif
+
+#endif

Modified: branches/1.6.1/main/config.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/main/config.c?view=diff&rev=189642&r1=189641&r2=189642
==============================================================================
--- branches/1.6.1/main/config.c (original)
+++ branches/1.6.1/main/config.c Tue Apr 21 10:20:22 2009
@@ -38,24 +38,6 @@
 #include <math.h>	/* HUGE_VAL */
 
 #define AST_INCLUDE_GLOB 1
-
-#ifdef AST_INCLUDE_GLOB
-/* glob compat stuff - eventually this should go in compat.h or some
- * header in include/asterisk/
- */
-#if defined(__Darwin__) || defined(__CYGWIN__)
-#define GLOB_ABORTED GLOB_ABEND
-#endif
-
-#include <glob.h>
-
-#ifdef SOLARIS
-#define MY_GLOB_FLAGS	GLOB_NOCHECK
-#else
-#define MY_GLOB_FLAGS	(GLOB_NOMAGIC|GLOB_BRACE)
-#endif
-
-#endif
 
 #include "asterisk/config.h"
 #include "asterisk/cli.h"