and reset again...

[lyx.git] / acconfig.h

diff --git a/acconfig.h b/acconfig.h
index 0dce1c82e404080dbd118277f238ea998da5a641..c4f91734cfe9cb6576815dfe84e62f137bded1c5 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -17,25 +17,9 @@
 
 @TOP@
 
-/* Define to work around a bug with const handling in gcc 2.7.[012] */
-#undef BROKEN_CONST
-
-/* Define on SunOS 4 and SCO, were some functions are missing from the headers */
-#undef BROKEN_HEADERS
-
-/* Define if you want debugging turned on as default. */
-#undef DEBUG_AS_DEFAULT
-
-/* Define if you are building a development version of LyX */
-#undef DEVEL_VERSION
-
 /* Define to 1 if NLS is requested.  */
 #undef ENABLE_NLS
 
-/* Define to nothing if your compiler does not understand the
-   `explicit' directive */
-#undef explicit
-
 /* define this to the location of forms.h to be used with #include,
   e.g. <forms.h> */
 #undef FORMS_H_LOCATION
@@ -52,48 +36,19 @@
 /* Define as 1 if you have the stpcopy function */
 #undef HAVE_STPCPY
 
-/*
-/* Define if the bool type is known to your compiler */
-#undef HAVE_bool
-*/
-
-/* Define to the name of the distribution.  */
-#undef PACKAGE
-
-/* You might want to define TWO_COLOR_ICONS if you want to spare
- your colormap.  This will use monochrome icons instead of colored
- ones. */
-#undef TWO_COLOR_ICONS
-
-/* Define to the version of the distribution.  */
-#undef VERSION
-
-/* Define this if you want to see the #warning directives put here and
-   there by the developpers to get attention */
-#undef WITH_WARNINGS
-
 /* define this to the location of xpm.h to be used with #include,
   e.g. <xpm.h> */
 #undef XPM_H_LOCATION
 
+#undef HAVE_LIBSM
+
+#undef USE_PSPELL
 
 @BOTTOM@ 
 
 /************************************************************ 
  ** You should not need to change anything beyond this point */
 
-/* even though -ansi might have been specified for gcc, we want all
-  usual prototypes.  */
-#ifdef __STRICT_ANSI__
-/**/#undef __STRICT_ANSI__
-#endif
-
-#ifdef HAVE_MEMSET
-#define BZERO(a,b)      memset(a,0,b)
-#else
-#define BZERO(a,b)      bzero(a,b)
-#endif
-
 #ifndef HAVE_STRCHR
 #define strchr(a,b)     index(a,b)
 #endif
@@ -109,25 +64,6 @@ extern "C"
 char * strerror(int n);
 #endif
 
-/*
-#ifndef HAVE_bool
-#define bool int
-#define true 1
-#define false 0
-#endif
-*/
-
-#if SIZEOF_VOID_P == SIZEOF_INT
-# define PTR_AS_INT(p) int(p)
-#else
-# define PTR_AS_INT(p) long(p)
-#endif
-
-#ifdef BROKEN_CONST
-#include <string.h>
-#include "broken_const.h"
-#endif  
-
 #ifdef BROKEN_HEADERS
 #include "broken_headers.h"
 #endif
@@ -137,6 +73,22 @@ char * strerror(int n);
 /**/#undef inline
 #endif
 
+/* C++ always has a good enough `const' */
+#if defined const && defined __cplusplus
+/**/#undef const
+#endif
+
+/* Check on the run if we are using exceptions during this compilation.*/
+#if defined(__sgi) || defined(__GNUC__)
+#  ifdef __EXCEPTIONS
+#    define USING_EXCEPTIONS
+#  endif
+#endif
+
+#if defined(__USLC__) || defined(__SUNPRO_CC) || defined(__COMO__) || defined(__ICL)
+#  define USING_EXCEPTIONS
+#endif
+
 #ifdef __EMX__
 #include "os2_defines.h"
 #endif