--- a/src/emacs.c	Mon Aug 13 10:22:10 2007 +0200
+++ b/src/emacs.c	Mon Aug 13 10:23:02 2007 +0200
@@ -941,7 +941,11 @@
       syms_of_mule ();
       syms_of_mule_ccl ();
       syms_of_mule_charset ();
+#endif
+#ifdef FILE_CODING
       syms_of_mule_coding ();
+#endif
+#ifdef MULE
 #ifdef HAVE_WNN
       syms_of_mule_wnn ();
 #endif
@@ -976,6 +980,10 @@
       syms_of_sunpro ();
 #endif
 
+#ifdef HAVE_LDAP
+      syms_of_eldap ();
+#endif
+
       /* Now create the subtypes for the types that have them.
 	 We do this before the vars_*() because more symbols
 	 may get initialized here. */
@@ -1093,7 +1101,7 @@
 	 */
 
       lstream_type_create ();
-#ifdef MULE
+#ifdef FILE_CODING
       lstream_type_create_mule_coding ();
 #endif
       lstream_type_create_print ();
@@ -1279,7 +1287,11 @@
 #ifdef MULE
       vars_of_mule ();
       vars_of_mule_charset ();
+#endif
+#ifdef FILE_CODING
       vars_of_mule_coding ();
+#endif
+#ifdef MULE
 #ifdef HAVE_WNN
       vars_of_mule_wnn ();
 #endif
@@ -1296,6 +1308,10 @@
       vars_of_sunpro ();
 #endif
 
+#ifdef HAVE_LDAP
+      vars_of_eldap ();
+#endif
+
       /* Now initialize any specifier variables.  We do this later
 	 because it has some dependence on the vars initialized
 	 above.
@@ -1343,6 +1359,8 @@
       /* These two depend on hashtables and various variables declared
 	 earlier.  The second may also depend on the first. */
       complex_vars_of_mule_charset ();
+#endif
+#if defined(FILE_CODING)
       complex_vars_of_mule_coding ();
 #endif
 
@@ -1786,11 +1804,11 @@
      (int nargs, Lisp_Object *args))
 {
   int ac;
-  Extbyte *wampum;
+  CONST Extbyte *wampum;
   int namesize;
   int total_len;
   Lisp_Object orig_invoc_name = Fcar (Vcommand_line_args);
-  Extbyte **wampum_all = alloca_array (Extbyte *, nargs);
+  CONST Extbyte **wampum_all = alloca_array (CONST Extbyte *, nargs);
   int *wampum_all_len  = alloca_array (int, nargs);
 
   assert (!gc_in_progress);
@@ -1936,7 +1954,11 @@
 #if 0
       free (malloc_state_ptr);
 #endif
-#if !defined(MULE) && !defined(DEBUG_DOUG_LEA_MALLOC)
+      /* mmap works in glibc-2.1, glibc-2.0 (Non-Mule only) and Linux libc5 */
+#if (defined(__GLIBC__) && __GLIBC_MINOR__ >= 1) || \
+    defined(_NO_MALLOC_WARNING_) || \
+    (defined(__GLIBC__) && __GLIBC_MINOR__ < 1 && !defined(MULE)) || \
+    defined(DEBUG_DOUG_LEA_MALLOC)
       mallopt (M_MMAP_MAX, 64);
 #endif
 #ifdef REL_ALLOC