next try at fixing 214; dist bugfix from Kayvan

[lyx.git] / acconfig.h

diff --git a/acconfig.h b/acconfig.h
index 9a99119de2d449e5cc7114c3fc331eba65e1d0ef..8d0cbf7b644c1c182076dfb1c1fc7fe1c33f8577 100644 (file)
--- 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,79 +18,34 @@
 
 @TOP@
 
-/* 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 if the bool type is known to your compiler */
-#undef HAVE_bool
-*/
+/* define this to the location of xpm.h to be used with #include,
+  e.g. <xpm.h> */
+#undef XPM_H_LOCATION
 
-/* Define to the name of the distribution.  */
-#undef PACKAGE
+#undef HAVE_LIBSM
 
-/* 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 as 1 if the MKSTEMP function is declared */
+#undef HAVE_DECL_MKSTEMP
 
-/* Define to the version of the distribution.  */
-#undef VERSION
+/* Define if you have the function prototype for snprintf().  */
+#undef HAVE_DECL_SNPRINTF
 
-/* Define this if you want to see the #warning directives put here and
-   there by the developpers to get attention */
-#undef WITH_WARNINGS
+/* Define if you have the function prototype for vsnprintf().  */
+#undef HAVE_DECL_VSNPRINTF
 
-/* 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
@@ -109,6 +65,15 @@ char * strerror(int n);
 #include "broken_headers.h"
 #endif
 
+#ifdef HAVE_MKSTEMP
+#ifndef HAVE_DECL_MKSTEMP
+#if defined (__cplusplus)
+extern "C"
+#endif
+int mkstemp(char*);
+#endif
+#endif
+
 /* C++ always support the keyword `inline' */
 #if defined inline && defined __cplusplus
 /**/#undef inline
@@ -131,15 +96,20 @@ char * strerror(int n);
 #endif
 
 #ifdef __EMX__
-#include "os2_defines.h"
+#include "support/os2_defines.h"
 #endif
 
-#ifdef VMS
-#include "vms_defines.h"
+#if defined(__CYGWIN__) || defined( __CYGWIN32__)
+#include "support/nt_defines.h"
 #endif
 
-#if defined(__CYGWIN__) || defined( __CYGWIN32__)
-#include "nt_defines.h"
+/* 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 */