X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=acconfig.h;h=ab7c54953bcfeff03ac5a9472facb763eefe606f;hb=59b4737cfd19cd32afceb581f4e370c59650fcae;hp=a897db211fafe30bf2166f390badf5a162ba61f6;hpb=35584afc1162dec2cf9fff79305e95cb3b75aefb;p=lyx.git

diff --git a/acconfig.h b/acconfig.h
index a897db211f..ab7c54953b 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -8,7 +8,8 @@
    *
    *           LyX, the High Level Word Processor
    *
-   *           Copyright (C) 1995 Matthias Ettrich
+   *           Copyright 1995 Matthias Ettrich
+   *           Copyright 1995-2001 The LyX Team.
    *
    *======================================================*/
 
@@ -17,82 +18,34 @@
 
 @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
 
-/* Define if your locale.h file contains LC_MESSAGES.  */
-#undef HAVE_LC_MESSAGES
-
-/* Define as 1 if you have catgets and don't want to use GNU gettext.  */
-#undef HAVE_CATGETS
-
-/* Define as 1 if you have gettext and don't want to use GNU gettext.  */
-#undef HAVE_GETTEXT
-
-/* Define as 1 if you have the stpcopy function */
-#undef HAVE_STPCPY
+/* define this to the location of xpm.h to be used with #include,
+  e.g. <xpm.h> */
+#undef XPM_H_LOCATION
 
-/*
-/* Define if the bool type is known to your compiler */
-#undef HAVE_bool
-*/
+#undef HAVE_LIBSM
 
-/* Define to the name of the distribution.  */
-#undef PACKAGE
+/* Define as 1 if the MKSTEMP function is declared */
+#undef HAVE_DECL_MKSTEMP
 
-/* 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 if you have the function prototype for snprintf().  */
+#undef HAVE_DECL_SNPRINTF
 
-/* Define to the version of the distribution.  */
-#undef VERSION
+/* Define if you have the function prototype for vsnprintf().  */
+#undef HAVE_DECL_VSNPRINTF
 
-/* 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
+/* Define if you have the function prototype istreambuf_iterator in
+   <iterator> */
+#undef HAVE_DECL_ISTREAMBUF_ITERATOR
 
 @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
@@ -108,30 +61,17 @@ extern "C"
 char * strerror(int n);
 #endif
 
-/*
-#ifndef HAVE_bool
-#define bool int
-#define true 1
-#define false 0
+#ifdef BROKEN_HEADERS
+#include "broken_headers.h"
 #endif
-*/
 
-/*
-#if SIZEOF_VOID_P == SIZEOF_INT
-# define PTR_AS_INT(p) int(p)
-#else
-# define PTR_AS_INT(p) long(p)
+#ifdef HAVE_MKSTEMP
+#ifndef HAVE_DECL_MKSTEMP
+#if defined (__cplusplus)
+extern "C"
+#endif
+int mkstemp(char*);
 #endif
-*/
-
-/* do we need this anymore?*/
-#ifdef BROKEN_CONST
-#include <string.h>
-#include "broken_const.h"
-#endif  
-
-#ifdef BROKEN_HEADERS
-#include "broken_headers.h"
 #endif
 
 /* C++ always support the keyword `inline' */
@@ -144,6 +84,16 @@ char * strerror(int n);
 /**/#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"
@@ -157,5 +107,14 @@ char * strerror(int n);
 #include "nt_defines.h"
 #endif
 
+/* Some support for the boost library. */
+#ifndef HAVE_LIMITS
+#define BOOST_NO_LIMITS
+#endif
+
+#ifndef HAVE_SSTREAM
+#define BOOST_NO_STRINGSTREAM
+#endif
+
 #endif /* _CONFIG_H */