Merge 52b2c64d11bb8aebabdd5812e4958d8f9845eed3 on remote branch

Change-Id: Iaabd3a8b4d3eadf188f36885d93c62f074b96860
diff --git a/src/config.h b/src/config.h
index b50a74c..83815a6 100644
--- a/src/config.h
+++ b/src/config.h
@@ -54,13 +54,13 @@
 /* #undef EBCDIC_NL25 */
 
 /* Define this if your compiler supports __attribute__((uninitialized)) */
-/* #undef HAVE_ATTRIBUTE_UNINITIALIZED */
+#define HAVE_ATTRIBUTE_UNINITIALIZED 1
 
 /* Define to 1 if you have the `bcopy' function. */
 #define HAVE_BCOPY 1
 
 /* Define to 1 if you have the <bzlib.h> header file. */
-#define HAVE_BZLIB_H 1
+/* #undef HAVE_BZLIB_H */
 
 /* Define to 1 if you have the <dirent.h> header file. */
 #define HAVE_DIRENT_H 1
@@ -111,7 +111,7 @@
 #define HAVE_REALPATH 1
 
 /* Define to 1 if you have the `secure_getenv' function. */
-#define HAVE_SECURE_GETENV 1
+/* #undef HAVE_SECURE_GETENV */
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1