about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Src/system.h4
-rw-r--r--configure.ac11
3 files changed, 21 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1bd8f3045..125e9c987 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-14  Peter Stephenson  <pws@csr.com>
+
+	* 28997: configure.ac, Src/system.h: make --enable-libc-musl
+	explicit.
+
 2011-04-13  Peter Stephenson  <pws@csr.com>
 
 	* gi1242+zsh: 28991: Completion/Unix/Command/_subversion: fix
@@ -14446,5 +14451,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5246 $
+* $Revision: 1.5247 $
 *****************************************************
diff --git a/Src/system.h b/Src/system.h
index 86f035f17..33b0af2f3 100644
--- a/Src/system.h
+++ b/Src/system.h
@@ -37,12 +37,16 @@
 #endif
 #endif
 
+#if defined(__linux) || defined(__GNU__) || defined(__GLIBC__) || defined(LIBC_MUSL)
 /*
  * Turn on numerous extensions.
  * This is in order to get the functions for manipulating /dev/ptmx.
  */
 #define _GNU_SOURCE 1
+#endif
+#ifdef LIBC_MUSL
 #define _POSIX_C_SOURCE 200809L
+#endif
 
 /* NeXT has half-implemented POSIX support *
  * which currently fools configure         */
diff --git a/configure.ac b/configure.ac
index 27a17e276..fca1dd6a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2466,6 +2466,17 @@ if test x$zsh_cv_c_unicode_support = xyes; then
 fi
 
 dnl
+dnl musl support
+dnl
+AH_TEMPLATE([LIBC_MUSL],
+[Define to 1 if musl is being used as the C library])
+AC_ARG_ENABLE(libc-musl,
+AC_HELP_STRING([--enable-libc-musl], [compile with musl as the C library]),
+[if test x$enableval = xyes; then
+  AC_DEFINE(LIBC_MUSL)
+fi])
+
+dnl
 dnl static user lookup
 dnl
 AC_ARG_ENABLE(dynamic-nss,