From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Fri, 10 Aug 2007 09:04:41 +0000 (+0000)
Subject: Remove cruft from config.h
X-Git-Tag: 1.6.10~8990
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=691a1be4313b433c61d0542548821eaf40eb0fd4;p=features.git

Remove cruft from config.h

	* src/support/tempname.cpp: move code about HAVE_MKSTEMP here (only user)

	* src/pch.h:
	* src/Buffer.cpp:
	* configure.ac: remove all traces of utime.h and HAVE_UTIME

	* config/lyxinclude.m4: remove WITH_WARNING define (which be rendered useless in
	a future commit from christian)

	* development/scons/SConstruct: try to update.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19395 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index bb1bca12ff..4b41bce023 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -167,9 +167,6 @@ AC_ARG_ENABLE(warnings,
     fi;])
 if test x$enable_warnings = xyes ; then
   lyx_flags="warnings $lyx_flags"
-  AC_DEFINE(WITH_WARNINGS, 1,
-  [Define this if you want to see the warning directives put here and
-   there by the developpers to get attention])
 fi
 
 ### We might want to disable debug
diff --git a/configure.ac b/configure.ac
index c4006e971a..1bdc9d2db7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -234,7 +234,7 @@ AC_LANG_POP(C)
 # some standard header files
 AC_HEADER_DIRENT
 AC_HEADER_MAJOR
-AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h utime.h sys/utime.h io.h process.h NewAPIs.h)
+AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h io.h process.h NewAPIs.h)
 
 # some standard structures
 AC_HEADER_STAT
@@ -347,15 +347,6 @@ extern "C"
 char * strerror(int n);
 #endif
 
-#ifdef HAVE_MKSTEMP
-#ifndef HAVE_DECL_MKSTEMP
-#if defined(__cplusplus)
-extern "C"
-#endif
-int mkstemp(char*);
-#endif
-#endif
-
 #if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
 #  define USE_BOOST_FORMAT 1
 #else
diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index 9509980b6f..a6b1aaf92a 100644
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -158,9 +158,6 @@ opts.AddOptions(
     # BoolOption('pch', 'Whether or not use pch', False),
     # enable assertion, (config.h has ENABLE_ASSERTIOS
     BoolOption('assertions', 'Use assertions', True),
-    # enable warning, (config.h has WITH_WARNINGS)
-    # default to False since MSVC does not have #warning
-    BoolOption('warnings', 'Use warnings', False),
     # config.h define _GLIBCXX_CONCEPT_CHECKS
     # Note: for earlier version of gcc (3.3) define _GLIBCPP_CONCEPT_CHECKS
     BoolOption('concept_checks', 'Enable concept checks', True),
@@ -1009,10 +1006,6 @@ return std::count(a, a+5, 'l');
             'HAVE_GETTEXT',
             'Define to 1 if using system gettext library'
         ),
-        (env.has_key('warnings') and env['warnings'],
-            'WITH_WARNINGS',
-            'Define this if you want to see the warning directives put here and there by the developpers to get attention'
-        ),
         (env.has_key('concept_checks') and env['concept_checks'],
             '_GLIBCXX_CONCEPT_CHECKS',
             'libstdc++ concept checking'
@@ -1080,15 +1073,6 @@ extern "C"
 char * strerror(int n);
 #endif
 
-#ifdef HAVE_MKSTEMP
-#ifndef HAVE_DECL_MKSTEMP
-#if defined(__cplusplus)
-extern "C"
-#endif
-int mkstemp(char*);
-#endif
-#endif
-
 #include <../boost/config.h>
 
 #endif
diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index e5de38c482..8a52b65bc7 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -79,12 +79,6 @@
 #include <boost/filesystem/exception.hpp>
 #include <boost/filesystem/operations.hpp>
 
-#if defined (HAVE_UTIME_H)
-#include <utime.h>
-#elif defined (HAVE_SYS_UTIME_H)
-#include <sys/utime.h>
-#endif
-
 #include <iomanip>
 #include <stack>
 #include <sstream>
diff --git a/src/pch.h b/src/pch.h
index 05a5d0419f..37fc540d8c 100644
--- a/src/pch.h
+++ b/src/pch.h
@@ -64,6 +64,4 @@
 #include <stack>
 #include <string>
 #include <utility>
-
-#include <utime.h>
 #include <vector>
diff --git a/src/support/tempname.cpp b/src/support/tempname.cpp
index dcb6c9dae0..049b863d7e 100644
--- a/src/support/tempname.cpp
+++ b/src/support/tempname.cpp
@@ -26,6 +26,10 @@
 # include <unistd.h>
 #endif
 
+#if defined(HAVE_MKSTEMP) && ! defined(HAVE_DECL_MKSTEMP)
+extern "C" int mkstemp(char *);
+#endif
+
 #if !defined(HAVE_MKSTEMP) && defined(HAVE_MKTEMP)
 # include <fcntl.h>
 # ifdef HAVE_SYS_STAT_H