diff options
| author | Doug Bailey <dbailey@digium.com> | 2009-04-21 14:28:04 +0000 |
|---|---|---|
| committer | Doug Bailey <dbailey@digium.com> | 2009-04-21 14:28:04 +0000 |
| commit | f431c867dd9b817501b8c475412eee310286b2e0 (patch) | |
| tree | 9769d3d121d4fa2d64c6408c531cd3e24ff7c5ba /include | |
| parent | 8e39288f6156af2bfc1f601c0680eb7cc4190d34 (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/autoconfig.h.in | 12 | ||||
| -rw-r--r-- | include/asterisk/compat.h | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index dba007d47..50ef2fa50 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -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 diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h index 519c71e68..5be445e26 100644 --- a/include/asterisk/compat.h +++ b/include/asterisk/compat.h @@ -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 |