glom r1978 - in trunk: . glom glom/libglom glom/libglom/connectionpool_backends glom/libglom/data_structure glom/translation glom/utility_widgets/calendar

[arminb svn gnome org]

Author: arminb
Date: Thu Mar 12 13:38:04 2009
New Revision: 1978
URL: http://svn.gnome.org/viewvc/glom?rev=1978&view=rev

Log:
2009-03-12  Armin Burgmeier  <armin openismus com>

	* configure.in: Added config.h to AC_CONFIG_FILES, so that we create
	two config files: config.h with all definitions, and libglom_config.h
	which contains only definitions prefixed with GLOM_ to be installed.
	This means header files cannot use non-prefixed definitions.

	* glom/libglom/libglom_config.h.in: New file containing the
	definitions to be installed.

	* glom/libglom/connectionpool_backends/postgres_self.cc:
	* glom/libglom/data_structure/iso_codes.cc:
	* glom/translation/window_translations.cc:
	* glom/utility_widgets/calendar/glomgtkcalendar.h:
	* glom/utility_widgets/calendar/glomgtkcalendar.c:
	* glom/application.cc:
	* glom/main.cc: Adapt the code by including config.h instead of
	libglom_config.h.


Added:
   trunk/glom/libglom/libglom_config.h.in
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/glom/application.cc
   trunk/glom/libglom/connectionpool_backends/postgres_self.cc
   trunk/glom/libglom/data_structure/iso_codes.cc
   trunk/glom/main.cc
   trunk/glom/translation/window_translations.cc
   trunk/glom/utility_widgets/calendar/glomgtkcalendar.c
   trunk/glom/utility_widgets/calendar/glomgtkcalendar.h

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Mar 12 13:38:04 2009
@@ -2,7 +2,7 @@
 AC_INIT
 AC_CONFIG_SRCDIR([glom/main.cc])
 
-AC_CONFIG_HEADERS([glom/libglom/libglom_config.h])
+AC_CONFIG_HEADERS([config.h glom/libglom/libglom_config.h])
 
 # Package name and version number:
 AM_INIT_AUTOMAKE(glom, 1.9.4)

Modified: trunk/glom/application.cc
==============================================================================
--- trunk/glom/application.cc	(original)
+++ trunk/glom/application.cc	Thu Mar 12 13:38:04 2009
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <libglom/libglom_config.h> //For VERSION, GLOM_ENABLE_CLIENT_ONLY, GLOM_ENABLE_SQLITE
+#include "config.h" //For VERSION, GLOM_ENABLE_CLIENT_ONLY, GLOM_ENABLE_SQLITE
 
 #include "application.h"
 #include "dialog_existing_or_new.h"

Modified: trunk/glom/libglom/connectionpool_backends/postgres_self.cc
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/postgres_self.cc	(original)
+++ trunk/glom/libglom/connectionpool_backends/postgres_self.cc	Thu Mar 12 13:38:04 2009
@@ -18,6 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h" // For POSTGRES_UTILS_PATH
+
 #include <libglom/connectionpool_backends/postgres_self.h>
 #include <libglom/utils.h>
 #include <libglom/spawn_with_feedback.h>

Modified: trunk/glom/libglom/data_structure/iso_codes.cc
==============================================================================
--- trunk/glom/libglom/data_structure/iso_codes.cc	(original)
+++ trunk/glom/libglom/data_structure/iso_codes.cc	Thu Mar 12 13:38:04 2009
@@ -18,12 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h" //For ISO_CODES_PREFIX.
+
 #include "iso_codes.h"
 #include <libxml++/libxml++.h>
 #include <libglom/document/document_glom.h>
 #include <libglom/utils.h>
 #include <glibmm/i18n.h>
-#include <libglom/libglom_config.h> //For ISO_CODES_PREFIX.
 
 namespace Glom
 {

Added: trunk/glom/libglom/libglom_config.h.in
==============================================================================
--- (empty file)
+++ trunk/glom/libglom/libglom_config.h.in	Thu Mar 12 13:38:04 2009
@@ -0,0 +1,14 @@
+/* "definition of GLOM_DTD_INSTALL_DIR" */
+#undef GLOM_DTD_INSTALL_DIR
+
+/* Whether to disable support for self-hosting and developer mode */
+#undef GLOM_ENABLE_CLIENT_ONLY
+
+/* Whether to enable support for the maemo platform */
+#undef GLOM_ENABLE_MAEMO
+
+/* Whether to enable support for PostgreSQL databases. */
+#undef GLOM_ENABLE_POSTGRESQL
+
+/* Whether to enable support for SQLite databases. */
+#undef GLOM_ENABLE_SQLITE

Modified: trunk/glom/main.cc
==============================================================================
--- trunk/glom/main.cc	(original)
+++ trunk/glom/main.cc	Thu Mar 12 13:38:04 2009
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <libglom/libglom_config.h> //For VERSION.
+#include "config.h" //For VERSION.
 
 //We use Python for calculated fields.
 #include <Python.h> //Include it before anything else to avoid "_POSIX_C_SOURCE redefined".

Modified: trunk/glom/translation/window_translations.cc
==============================================================================
--- trunk/glom/translation/window_translations.cc	(original)
+++ trunk/glom/translation/window_translations.cc	Thu Mar 12 13:38:04 2009
@@ -31,7 +31,7 @@
 
 // To read the .po files
 #include <gettext-po.h>
-#include <libglom/libglom_config.h> //For HAVE_GETTEXTPO_XERROR
+#include "config.h" //For HAVE_GETTEXTPO_XERROR
 
 #include <sstream>
 

Modified: trunk/glom/utility_widgets/calendar/glomgtkcalendar.c
==============================================================================
--- trunk/glom/utility_widgets/calendar/glomgtkcalendar.c	(original)
+++ trunk/glom/utility_widgets/calendar/glomgtkcalendar.c	Thu Mar 12 13:38:04 2009
@@ -5,7 +5,7 @@
 #include <gtk/gtk.h>
 #if !GTK_CHECK_VERSION(2,16,0)
 
-#include <libglom/libglom_config.h>
+#include "config.h"
 
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>

Modified: trunk/glom/utility_widgets/calendar/glomgtkcalendar.h
==============================================================================
--- trunk/glom/utility_widgets/calendar/glomgtkcalendar.h	(original)
+++ trunk/glom/utility_widgets/calendar/glomgtkcalendar.h	Thu Mar 12 13:38:04 2009
@@ -212,4 +212,4 @@
 
 #endif /* __GLOM_GTK_CALENDAR_H__ */
 
-#endif //!GTK_CHECK_VERSION(2.16.0)
+#endif /* !GTK_CHECK_VERSION(2.16.0) */