* config.h.in: #define USE_TEXT_PROPERTIES by default.

	* config.h.in (HAVE_CONST): New macro.  If it's not #defined, #define
	const to be the empty string.

	* config.h.in: If we're not __STDC__, define volatile to be the
	empty string.

1 files changed, 18 insertions, 1 deletions

diff --git a/src/config.in b/src/config.in
index 574bac6349f..6886fd79ad0 100644
--- a/src/config.in
+++ b/src/config.in
@@ -45,7 +45,7 @@ and this notice must be preserved on all copies.  */
 
 /* Define USE_TEXT_PROPERTIES to support visual and other properties
    on text. */
-/* #define USE_TEXT_PROPERTIES */
+#define USE_TEXT_PROPERTIES
 
 /* Define USER_FULL_NAME to return a string
    that is the user's full name.
@@ -172,6 +172,23 @@ and this notice must be preserved on all copies.  */
 #define SIGTYPE void
 #endif
 
+/* If it doesn't seem that the compiler we're using supports the
+   `const' qualifier, then the `configure' script will remove this
+   line.  Some of the files that Emacs shares with other applications
+   (regex.h, getdate.y, etcetera) assume that const is defined.  The
+   rule seems to be that if a system has a config.h file, that file
+   should take care of #defining const away if necessary.  */
+#define HAVE_CONST
+
+#ifndef HAVE_CONST
+#define const
+#endif
+
+/* Non-ANSI C compilers don't have volatile.  */
+#ifndef __STDC__
+#define volatile
+#endif
+
 #ifndef THIS_IS_YMAKEFILE
 /* Some of the files of Emacs which are intended for use with other
    programs assume that if you have a config.h file, you must declare