get rid of Paragraph::clear

[lyx.git] / acconfig.h

diff --git a/acconfig.h b/acconfig.h
index dd219f8bee733fde6b80ab5e92809f14d0f5ef61..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,33 +18,16 @@
 
 @TOP@
 
-/* Define to 1 if NLS is requested.  */
-#undef ENABLE_NLS
-
 /* 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
 
 #undef HAVE_LIBSM
 
-#undef USE_PSPELL
-
 /* Define as 1 if the MKSTEMP function is declared */
 #undef HAVE_DECL_MKSTEMP
 
@@ -53,6 +37,10 @@
 /* Define if you have the function prototype for vsnprintf().  */
 #undef HAVE_DECL_VSNPRINTF
 
+/* Define if you have the function prototype istreambuf_iterator in
+   <iterator> */
+#undef HAVE_DECL_ISTREAMBUF_ITERATOR
+
 @BOTTOM@ 
 
 /************************************************************ 
@@ -108,15 +96,20 @@ int mkstemp(char*);
 #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 */