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
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@189629 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Doug Bailey
2009-04-21 14:28:04 +00:00
parent 8e39288f61
commit f431c867dd
4 changed files with 184 additions and 14 deletions

View File

@@ -352,6 +352,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

View File

@@ -187,10 +187,10 @@ typedef unsigned long long uint64_t;
#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