Include <config.h>.

7 files changed, 22 insertions, 8 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 19487ffc786..f665b2579bb 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-29  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+
+        * cvtmail.c, emacsclient.c, emacsserver.c, pop.c, sorted-doc.c,
+        * yow.c: Include <config.h>.
+
 2001-12-21  Francesco Potorti`  <pot@gnu.org>
 
         * etags.c (Perl_functions): Tag packages and use them in sub tags.
diff --git a/lib-src/cvtmail.c b/lib-src/cvtmail.c
index b967f81d428..453267f4aad 100644
--- a/lib-src/cvtmail.c
+++ b/lib-src/cvtmail.c
@@ -29,11 +29,14 @@ Boston, MA 02111-1307, USA.  */
  *
  * In order to get rmail to read the messages, the resulting file must
  * be mv'ed to ~/mbox, and then have rmail invoked on them.
- * 
+ *
  * Author: Larry Kolodney, 1985
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 
 #ifndef HAVE_STDLIB_H
@@ -119,7 +122,7 @@ main (argc, argv)
         }
     }
   fclose (mddf);
-  fclose (mfilef);    
+  fclose (mfilef);
   return 0;
 }
 
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 13d3e1fe7c9..27bce2d0b1d 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -23,7 +23,7 @@ Boston, MA 02111-1307, USA.  */
 #define NO_SHORTNAMES
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #undef signal
diff --git a/lib-src/emacsserver.c b/lib-src/emacsserver.c
index 431c5b3e4e2..3d099098436 100644
--- a/lib-src/emacsserver.c
+++ b/lib-src/emacsserver.c
@@ -28,7 +28,7 @@ Boston, MA 02111-1307, USA.  */
 #define NO_SHORTNAMES
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <signal.h>
diff --git a/lib-src/pop.c b/lib-src/pop.c
index 1c2cc95ac68..2cf8f9243f4 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -21,7 +21,7 @@ Boston, MA 02111-1307, USA.  */
 
 #ifdef HAVE_CONFIG_H
 #define NO_SHORTNAMES   /* Tell config not to load remap.h */
-#include <../src/config.h>
+#include <config.h>
 #else
 #define MAIL_USE_POP
 #endif
diff --git a/lib-src/sorted-doc.c b/lib-src/sorted-doc.c
index d0c160b8ad8..d474924cf18 100644
--- a/lib-src/sorted-doc.c
+++ b/lib-src/sorted-doc.c
@@ -23,7 +23,10 @@
 
    This version sorts the output by function name.  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <ctype.h>
 #ifndef HAVE_STDLIB_H           /* config.h includes stdlib.  */
diff --git a/lib-src/yow.c b/lib-src/yow.c
index a45623eeb41..c658b15e41f 100644
--- a/lib-src/yow.c
+++ b/lib-src/yow.c
@@ -10,7 +10,10 @@
  * With dynamic memory allocation.
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <ctype.h>
 #ifdef HAVE_STRING_H