[Aptitude-svn-commit] r4409 - in branches/aptitude-0.3/aptitude: . src src/vscreen

[Daniel Burrows]

Author: dburrows
Date: Sat Oct  1 03:03:44 2005
New Revision: 4409

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/aptitude.h
   branches/aptitude-0.3/aptitude/src/main.cc
   branches/aptitude-0.3/aptitude/src/pkg_ver_item.h
   branches/aptitude-0.3/aptitude/src/ui.cc
   branches/aptitude-0.3/aptitude/src/vscreen/curses++.h
   branches/aptitude-0.3/aptitude/src/vscreen/vscreen_widget.cc
Log:
Fix some includes of config.h

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Oct  1 03:03:44 2005
@@ -1,5 +1,10 @@
 2005-09-30  Daniel Burrows  <dburrows at debian.org>
 
+	* src/aptitude.h, src/main.cc, src/pkg_ver_item.h, src/ui.cc, src/vscreen/curses++.h, src/vscreen/vscreen_widget.cc:
+
+	  Change a bunch of includes of config.h to use <>, and protect
+	  the ones that weren't with #ifdef HAVE_CONFIG_H.
+
 	* src/generic/util/Makefile.am:
 
 	  Add bool_accumulate.h to the list of generic sources.

Modified: branches/aptitude-0.3/aptitude/src/aptitude.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/aptitude.h	(original)
+++ branches/aptitude-0.3/aptitude/src/aptitude.h	Sat Oct  1 03:03:44 2005
@@ -8,7 +8,9 @@
 #ifndef APTITUDE_H
 #define APTITUDE_H
 
-#include "../config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 /* Take care of NLS matters.  */
 

Modified: branches/aptitude-0.3/aptitude/src/main.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/main.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/main.cc	Sat Oct  1 03:03:44 2005
@@ -28,7 +28,9 @@
 
 #include "aptitude.h"
 
-#include "../config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <generic/apt/apt.h>
 #include <generic/apt/config_signal.h>

Modified: branches/aptitude-0.3/aptitude/src/pkg_ver_item.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_ver_item.h	(original)
+++ branches/aptitude-0.3/aptitude/src/pkg_ver_item.h	Sat Oct  1 03:03:44 2005
@@ -22,7 +22,9 @@
 #ifndef PKG_VER_ITEM_H
 #define PKG_VER_ITEM_H
 
-#include "../config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "apt_info_tree.h"
 

Modified: branches/aptitude-0.3/aptitude/src/ui.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/ui.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/ui.cc	Sat Oct  1 03:03:44 2005
@@ -42,7 +42,10 @@
 #include <fstream>
 #include <utility>
 
-#include "../config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "aptitude.h"
 
 #include "apt_config_widgets.h"

Modified: branches/aptitude-0.3/aptitude/src/vscreen/curses++.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/curses++.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/curses++.h	Sat Oct  1 03:03:44 2005
@@ -30,7 +30,9 @@
 // For isspace
 #include <ctype.h>
 
-#include "../../config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 /** A structure that amalgamates a wchar_t together with attributes.
  *  This is similar to cchar_t, but has the advantage of having

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vscreen_widget.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vscreen_widget.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vscreen_widget.cc	Sat Oct  1 03:03:44 2005
@@ -17,7 +17,7 @@
 #include <assert.h>
 
 #ifdef HAVE_CONFIG_H
-#include "../../config.h"
+#include <config.h>
 #endif
 
 using namespace std;