glom r1955 - in trunk: . glom glom/libglom glom/libglom/connectionpool_backends glom/libglom/data_structure glom/libglom/document glom/mode_data glom/mode_design/print_layouts glom/mode_find glom/translation glom/utility_widgets glom/utility_widgets/adddel glom/utility_widgets/calendar glom/utility_widgets/canvas glom/utility_widgets/db_adddel

From: murrayc svn gnome org
To: svn-commits-list gnome org
Subject: glom r1955 - in trunk: . glom glom/libglom glom/libglom/connectionpool_backends glom/libglom/data_structure glom/libglom/document glom/mode_data glom/mode_design/print_layouts glom/mode_find glom/translation glom/utility_widgets glom/utility_widgets/adddel glom/utility_widgets/calendar glom/utility_widgets/canvas glom/utility_widgets/db_adddel
Date: Wed, 4 Mar 2009 18:26:47 +0000 (UTC)
Author: murrayc
Date: Wed Mar  4 18:26:47 2009
New Revision: 1955
URL: http://svn.gnome.org/viewvc/glom?rev=1955&view=rev

Log:
2009-03-04  Murray Cumming  <murrayc murrayc com>

* configure.in: Generate libglom/libglom_config.h instead of config.h, 
so we can install it and use it in our public headers.
* glom/libglom/Makefile.am: Install libglom_config.h.
* glom/libglom/glom-1.0.pc.in: Correct the shared library name.
* *.[h|cc]: Include libglom/libglom_config.h instead of config.h.


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/glom/application.cc
   trunk/glom/application.h
   trunk/glom/base_db.cc
   trunk/glom/base_db.h
   trunk/glom/dialog_existing_or_new.cc
   trunk/glom/dialog_import_csv.cc
   trunk/glom/dialog_import_csv_progress.cc
   trunk/glom/frame_glom.cc
   trunk/glom/frame_glom.h
   trunk/glom/libglom/Makefile.am
   trunk/glom/libglom/appstate.cc
   trunk/glom/libglom/connectionpool.cc
   trunk/glom/libglom/connectionpool.h
   trunk/glom/libglom/connectionpool_backends/backend.h
   trunk/glom/libglom/connectionpool_backends/postgres.cc
   trunk/glom/libglom/connectionpool_backends/postgres.h
   trunk/glom/libglom/connectionpool_backends/postgres_central.cc
   trunk/glom/libglom/connectionpool_backends/postgres_central.h
   trunk/glom/libglom/connectionpool_backends/postgres_self.h
   trunk/glom/libglom/connectionpool_backends/sqlite.cc
   trunk/glom/libglom/connectionpool_backends/sqlite.h
   trunk/glom/libglom/data_structure/glomconversions.cc
   trunk/glom/libglom/data_structure/iso_codes.cc
   trunk/glom/libglom/document/document_glom.cc
   trunk/glom/libglom/document/document_glom.h
   trunk/glom/libglom/glom-1.0.pc.in
   trunk/glom/libglom/utils.cc
   trunk/glom/main.cc
   trunk/glom/mode_data/box_data.cc
   trunk/glom/mode_data/box_data.h
   trunk/glom/mode_data/box_data_calendar_related.h
   trunk/glom/mode_data/box_data_details.h
   trunk/glom/mode_data/box_data_list.h
   trunk/glom/mode_data/box_data_list_related.h
   trunk/glom/mode_data/box_data_manyrecords.h
   trunk/glom/mode_data/box_data_portal.h
   trunk/glom/mode_data/flowtablewithfields.h
   trunk/glom/mode_design/print_layouts/print_layout_toolbar.cc
   trunk/glom/mode_find/box_data_details_find.cc
   trunk/glom/translation/window_translations.cc
   trunk/glom/utility_widgets/adddel/adddel.cc
   trunk/glom/utility_widgets/calendar/Makefile.am
   trunk/glom/utility_widgets/calendar/glomgtkcalendar.c
   trunk/glom/utility_widgets/canvas/canvas_editable.h
   trunk/glom/utility_widgets/checkglom.h
   trunk/glom/utility_widgets/comboentryglom.h
   trunk/glom/utility_widgets/comboglom.h
   trunk/glom/utility_widgets/datawidget.h
   trunk/glom/utility_widgets/db_adddel/db_adddel.h
   trunk/glom/utility_widgets/dialog_choose_id.cc
   trunk/glom/utility_widgets/entryglom.h
   trunk/glom/utility_widgets/filechooserdialog_saveextras.h
   trunk/glom/utility_widgets/layouttoolbar.cc
   trunk/glom/utility_widgets/layoutwidgetbase.h
   trunk/glom/utility_widgets/textviewglom.h
   trunk/glom/xsl_utils.cc

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Mar  4 18:26:47 2009
@@ -2,7 +2,7 @@
 AC_INIT
 AC_CONFIG_SRCDIR([glom/main.cc])
 
-AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([glom/libglom/libglom_config.h])
 
 # Package name and version number:
 AM_INIT_AUTOMAKE(glom, 1.9.3)

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

Modified: trunk/glom/application.h
==============================================================================
--- trunk/glom/application.h	(original)
+++ trunk/glom/application.h	Wed Mar  4 18:26:47 2009
@@ -24,7 +24,7 @@
 #include "bakery/bakery.h"
 #include "frame_glom.h"
 
-#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
 
 
 //Avoid including the header here:

Modified: trunk/glom/base_db.cc
==============================================================================
--- trunk/glom/base_db.cc	(original)
+++ trunk/glom/base_db.cc	Wed Mar  4 18:26:47 2009
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
 
 #include "base_db.h"
 #include "application.h" //App_Glom.

Modified: trunk/glom/base_db.h
==============================================================================
--- trunk/glom/base_db.h	(original)
+++ trunk/glom/base_db.h	Wed Mar  4 18:26:47 2009
@@ -21,7 +21,7 @@
 #ifndef BASE_DB_H
 #define BASE_DB_H
 
-#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
 
 #include <gtkmm.h>
 

Modified: trunk/glom/dialog_existing_or_new.cc
==============================================================================
--- trunk/glom/dialog_existing_or_new.cc	(original)
+++ trunk/glom/dialog_existing_or_new.cc	Wed Mar  4 18:26:47 2009
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#include <libglom/libglom_config.h>
 #include "dialog_existing_or_new.h"
 
 #include <libxml++/parsers/saxparser.h>

Modified: trunk/glom/dialog_import_csv.cc
==============================================================================
--- trunk/glom/dialog_import_csv.cc	(original)
+++ trunk/glom/dialog_import_csv.cc	Wed Mar  4 18:26:47 2009
@@ -19,7 +19,7 @@
  */
 
 #include "dialog_import_csv.h"
-#include "config.h"
+#include <libglom/libglom_config.h>
 
 #include <libglom/data_structure/glomconversions.h>
 

Modified: trunk/glom/dialog_import_csv_progress.cc
==============================================================================
--- trunk/glom/dialog_import_csv_progress.cc	(original)
+++ trunk/glom/dialog_import_csv_progress.cc	Wed Mar  4 18:26:47 2009
@@ -19,7 +19,7 @@
  */
 
 #include "dialog_import_csv_progress.h"
-#include "config.h"
+#include <libglom/libglom_config.h>
 
 #include <libglom/data_structure/glomconversions.h>
 #include <glibmm/i18n.h>

Modified: trunk/glom/frame_glom.cc
==============================================================================
--- trunk/glom/frame_glom.cc	(original)
+++ trunk/glom/frame_glom.cc	Wed Mar  4 18:26:47 2009
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h" // For GLOM_ENABLE_SQLITE, GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_SQLITE, GLOM_ENABLE_CLIENT_ONLY
 
 #include "frame_glom.h"
 #include "application.h"

Modified: trunk/glom/frame_glom.h
==============================================================================
--- trunk/glom/frame_glom.h	(original)
+++ trunk/glom/frame_glom.h	Wed Mar  4 18:26:47 2009
@@ -21,7 +21,7 @@
 #ifndef FRAME_GLOM_H
 #define FRAME_GLOM_H
 
-#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
 
 #include <gtkmm/frame.h>
 #include "bakery/View/View_Composite.h"

Modified: trunk/glom/libglom/Makefile.am
==============================================================================
--- trunk/glom/libglom/Makefile.am	(original)
+++ trunk/glom/libglom/Makefile.am	Wed Mar  4 18:26:47 2009
@@ -19,7 +19,7 @@
            -DGLOM_EXAMPLES_DIR=\""$(glom_examples_dir)"\" \
            -DGLOM_ICON_DIR=\""$(glom_icon_dir)"\"
 
-h_sources = appstate.h \
+h_sources = libglom_config.h appstate.h \
                      calcinprogress.h \
                      connectionpool.h \
                      dialog_progress_creating.h \

Modified: trunk/glom/libglom/appstate.cc
==============================================================================
--- trunk/glom/libglom/appstate.cc	(original)
+++ trunk/glom/libglom/appstate.cc	Wed Mar  4 18:26:47 2009
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h" // GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // GLOM_ENABLE_CLIENT_ONLY
 #include "appstate.h"
 
 

Modified: trunk/glom/libglom/connectionpool.cc
==============================================================================
--- trunk/glom/libglom/connectionpool.cc	(original)
+++ trunk/glom/libglom/connectionpool.cc	Wed Mar  4 18:26:47 2009
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h" // For GLOM_ENABLE_MAEMO
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_MAEMO
  
 #include <libglom/connectionpool.h>
 #include <libglom/document/document_glom.h>

Modified: trunk/glom/libglom/connectionpool.h
==============================================================================
--- trunk/glom/libglom/connectionpool.h	(original)
+++ trunk/glom/libglom/connectionpool.h	Wed Mar  4 18:26:47 2009
@@ -21,7 +21,7 @@
 #ifndef GLOM_CONNECTIONPOOL_H
 #define GLOM_CONNECTIONPOOL_H
 
-#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
 
 #include <libgdamm.h>
 #include <libglom/sharedptr.h>

Modified: trunk/glom/libglom/connectionpool_backends/backend.h
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/backend.h	(original)
+++ trunk/glom/libglom/connectionpool_backends/backend.h	Wed Mar  4 18:26:47 2009
@@ -21,7 +21,7 @@
 #ifndef GLOM_BACKEND_BACKEND_H
 #define GLOM_BACKEND_BACKEND_H
 
-#include <config.h> // For GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
 
 #include <libglom/sharedptr.h>
 #include <libglom/data_structure/field.h>

Modified: trunk/glom/libglom/connectionpool_backends/postgres.cc
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/postgres.cc	(original)
+++ trunk/glom/libglom/connectionpool_backends/postgres.cc	Wed Mar  4 18:26:47 2009
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#include <libglom/libglom_config.h>
 
 #include <libglom/connectionpool_backends/postgres.h>
 #include <glibmm/i18n.h>

Modified: trunk/glom/libglom/connectionpool_backends/postgres.h
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/postgres.h	(original)
+++ trunk/glom/libglom/connectionpool_backends/postgres.h	Wed Mar  4 18:26:47 2009
@@ -24,7 +24,7 @@
 #include <libgdamm.h>
 #include <libglom/connectionpool_backends/backend.h>
 
-#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
 
 #ifndef GLOM_ENABLE_POSTGRESQL
 # error The Glom <postgres.h> backend has been included even though PostgreSQL support is disabled

Modified: trunk/glom/libglom/connectionpool_backends/postgres_central.cc
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/postgres_central.cc	(original)
+++ trunk/glom/libglom/connectionpool_backends/postgres_central.cc	Wed Mar  4 18:26:47 2009
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#include <libglom/libglom_config.h>
 
 #include <libglom/connectionpool_backends/postgres_central.h>
 #include <glibmm/i18n.h>

Modified: trunk/glom/libglom/connectionpool_backends/postgres_central.h
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/postgres_central.h	(original)
+++ trunk/glom/libglom/connectionpool_backends/postgres_central.h	Wed Mar  4 18:26:47 2009
@@ -23,7 +23,7 @@
 
 #include <libglom/connectionpool_backends/postgres.h>
 
-#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
 
 #ifndef GLOM_ENABLE_POSTGRESQL
 # error The Glom <postgres_central.h> backend has been included even though PostgreSQL support is disabled

Modified: trunk/glom/libglom/connectionpool_backends/postgres_self.h
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/postgres_self.h	(original)
+++ trunk/glom/libglom/connectionpool_backends/postgres_self.h	Wed Mar  4 18:26:47 2009
@@ -21,7 +21,7 @@
 #ifndef GLOM_BACKEND_POSTGRES_SELF_H
 #define GLOM_BACKEND_POSTGRES_SELF_H
 
-#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
 
 #include <libglom/connectionpool_backends/postgres.h>
 

Modified: trunk/glom/libglom/connectionpool_backends/sqlite.cc
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/sqlite.cc	(original)
+++ trunk/glom/libglom/connectionpool_backends/sqlite.cc	Wed Mar  4 18:26:47 2009
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
+#include <libglom/libglom_config.h>
 
 #include <libglom/connectionpool_backends/sqlite.h>
 

Modified: trunk/glom/libglom/connectionpool_backends/sqlite.h
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/sqlite.h	(original)
+++ trunk/glom/libglom/connectionpool_backends/sqlite.h	Wed Mar  4 18:26:47 2009
@@ -24,7 +24,7 @@
 #include <libgdamm.h>
 #include <libglom/connectionpool_backends/backend.h>
 
-#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY, GLOM_ENABLE_SQLITE
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY, GLOM_ENABLE_SQLITE
 
 #ifndef GLOM_ENABLE_SQLITE
 # error The Glom <sqlite.h> backend has been included even though sqlite support is disabled

Modified: trunk/glom/libglom/data_structure/glomconversions.cc
==============================================================================
--- trunk/glom/libglom/data_structure/glomconversions.cc	(original)
+++ trunk/glom/libglom/data_structure/glomconversions.cc	Wed Mar  4 18:26:47 2009
@@ -19,7 +19,7 @@
  */
 
 
-#include "config.h" // For HAVE_STRPTIME
+#include <libglom/libglom_config.h> // For HAVE_STRPTIME
 
 #include <libgda/gda-blob-op.h> // For gda_blob_op_read_all()
 

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	Wed Mar  4 18:26:47 2009
@@ -23,7 +23,7 @@
 #include <libglom/document/document_glom.h>
 #include <libglom/utils.h>
 #include <glibmm/i18n.h>
-#include "config.h" //For ISO_CODES_PREFIX.
+#include <libglom/libglom_config.h> //For ISO_CODES_PREFIX.
 
 namespace Glom
 {

Modified: trunk/glom/libglom/document/document_glom.cc
==============================================================================
--- trunk/glom/libglom/document/document_glom.cc	(original)
+++ trunk/glom/libglom/document/document_glom.cc	Wed Mar  4 18:26:47 2009
@@ -40,7 +40,7 @@
 #include <gtk/gtkpagesetup.h> //TODO: Remove this when we can use the C++ constructor.
 
 #include <glibmm/i18n.h>
-//#include "config.h" //To get GLOM_DTD_INSTALL_DIR - dependent on configure prefix.
+//#include <libglom/libglom_config.h> //To get GLOM_DTD_INSTALL_DIR - dependent on configure prefix.
 #include <algorithm> //For std::find_if().
 #include <sstream> //For stringstream
 

Modified: trunk/glom/libglom/document/document_glom.h
==============================================================================
--- trunk/glom/libglom/document/document_glom.h	(original)
+++ trunk/glom/libglom/document/document_glom.h	Wed Mar  4 18:26:47 2009
@@ -21,7 +21,7 @@
 #ifndef DOCUMENT_GLOM_H
 #define DOCUMENT_GLOM_H
 
-#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY, GLOM_ENABLE_SQLITE
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY, GLOM_ENABLE_SQLITE
 
 #include <bakery/Document/Document_XML.h>
 #include <bakery/View/View_Composite.h>

Modified: trunk/glom/libglom/glom-1.0.pc.in
==============================================================================
--- trunk/glom/libglom/glom-1.0.pc.in	(original)
+++ trunk/glom/libglom/glom-1.0.pc.in	Wed Mar  4 18:26:47 2009
@@ -7,5 +7,5 @@
 Description: Library for accessing Glom documents and data structures.
 Requires: glibmm-2.4 giomm-2.4 bakery-2.6 libgdamm-4.0
 Version: @VERSION@
-Libs: -L${libdir} -lglom
+Libs: -L${libdir} -lglom-1.0
 Cflags: -I${includedir}/glom-1.0

Modified: trunk/glom/libglom/utils.cc
==============================================================================
--- trunk/glom/libglom/utils.cc	(original)
+++ trunk/glom/libglom/utils.cc	Wed Mar  4 18:26:47 2009
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h" // For GLOM_ENABLE_MAEMO
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_MAEMO
 
 #include <libglom/utils.h>
 #include <libglom/connectionpool.h>

Modified: trunk/glom/main.cc
==============================================================================
--- trunk/glom/main.cc	(original)
+++ trunk/glom/main.cc	Wed Mar  4 18:26:47 2009
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h" //For VERSION.
+#include <libglom/libglom_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/mode_data/box_data.cc
==============================================================================
--- trunk/glom/mode_data/box_data.cc	(original)
+++ trunk/glom/mode_data/box_data.cc	Wed Mar  4 18:26:47 2009
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h" // For GLOM_ENABLE_MAEMO
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_MAEMO
 
 #include "box_data.h"
 #include <libglom/data_structure/glomconversions.h>
@@ -28,7 +28,7 @@
 #include "../python_embed/glom_python.h"
 #include <bakery/App/App_Gtk.h> //For util_bold_message().
 #include <algorithm> //For std::find()
-#include "config.h"
+#include <libglom/libglom_config.h>
 #include <glibmm/i18n.h>
 
 #ifdef GLOM_ENABLE_MAEMO

Modified: trunk/glom/mode_data/box_data.h
==============================================================================
--- trunk/glom/mode_data/box_data.h	(original)
+++ trunk/glom/mode_data/box_data.h	Wed Mar  4 18:26:47 2009
@@ -21,7 +21,7 @@
 #ifndef BOX_DATA_H
 #define BOX_DATA_H
 
-#include "config.h" // GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // GLOM_ENABLE_CLIENT_ONLY
 
 #include <glom/box_withbuttons.h>
 #include <glom/base_db_table_data.h>

Modified: trunk/glom/mode_data/box_data_calendar_related.h
==============================================================================
--- trunk/glom/mode_data/box_data_calendar_related.h	(original)
+++ trunk/glom/mode_data/box_data_calendar_related.h	Wed Mar  4 18:26:47 2009
@@ -21,7 +21,7 @@
 #ifndef BOX_DATA_CALENDAR_RELATED_H
 #define BOX_DATA_CALENDAR_RELATED_H
 
-#include "config.h" // GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // GLOM_ENABLE_CLIENT_ONLY
 
 #include "box_data_portal.h"
 #include <libglom/data_structure/layout/layoutitem_calendarportal.h>

Modified: trunk/glom/mode_data/box_data_details.h
==============================================================================
--- trunk/glom/mode_data/box_data_details.h	(original)
+++ trunk/glom/mode_data/box_data_details.h	Wed Mar  4 18:26:47 2009
@@ -21,7 +21,7 @@
 #ifndef BOX_DATA_DETAILS_H
 #define BOX_DATA_DETAILS_H
 
-#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
 
 #include "box_data.h"
 //#include "box_data_list_related.h"

Modified: trunk/glom/mode_data/box_data_list.h
==============================================================================
--- trunk/glom/mode_data/box_data_list.h	(original)
+++ trunk/glom/mode_data/box_data_list.h	Wed Mar  4 18:26:47 2009
@@ -21,7 +21,7 @@
 #ifndef BOX_DATA_LIST_H
 #define BOX_DATA_LIST_H
 
-#include "config.h" // GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // GLOM_ENABLE_CLIENT_ONLY
 
 #include "box_data_manyrecords.h"
 #include "../utility_widgets/db_adddel/db_adddel_withbuttons.h"

Modified: trunk/glom/mode_data/box_data_list_related.h
==============================================================================
--- trunk/glom/mode_data/box_data_list_related.h	(original)
+++ trunk/glom/mode_data/box_data_list_related.h	Wed Mar  4 18:26:47 2009
@@ -21,7 +21,7 @@
 #ifndef BOX_DATA_LIST_RELATED_H
 #define BOX_DATA_LIST_RELATED_H
 
-#include "config.h" // GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // GLOM_ENABLE_CLIENT_ONLY
 
 #include "box_data_portal.h"
 

Modified: trunk/glom/mode_data/box_data_manyrecords.h
==============================================================================
--- trunk/glom/mode_data/box_data_manyrecords.h	(original)
+++ trunk/glom/mode_data/box_data_manyrecords.h	Wed Mar  4 18:26:47 2009
@@ -21,7 +21,7 @@
 #ifndef BOX_DATA_MANY_RECORDS_H
 #define BOX_DATA_MANY_RECORDS_H
 
-#include "config.h" // GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // GLOM_ENABLE_CLIENT_ONLY
 
 #include "box_data.h"
 #include "../utility_widgets/db_adddel/db_adddel_withbuttons.h"

Modified: trunk/glom/mode_data/box_data_portal.h
==============================================================================
--- trunk/glom/mode_data/box_data_portal.h	(original)
+++ trunk/glom/mode_data/box_data_portal.h	Wed Mar  4 18:26:47 2009
@@ -21,7 +21,7 @@
 #ifndef BOX_DATA_PORTAL_H
 #define BOX_DATA_PORTAL_H
 
-#include "config.h" // GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // GLOM_ENABLE_CLIENT_ONLY
 
 #include "box_data_manyrecords.h"
 #include "../utility_widgets/layoutwidgetbase.h"

Modified: trunk/glom/mode_data/flowtablewithfields.h
==============================================================================
--- trunk/glom/mode_data/flowtablewithfields.h	(original)
+++ trunk/glom/mode_data/flowtablewithfields.h	Wed Mar  4 18:26:47 2009
@@ -21,7 +21,7 @@
 #ifndef GLOM_UTILITYWIDGETS_FLOWTABLEWITHFIELDS_H
 #define GLOM_UTILITYWIDGETS_FLOWTABLEWITHFIELDS_H
 
-#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
 
 #ifdef GLOM_ENABLE_CLIENT_ONLY
 #include <glom/utility_widgets/flowtable.h>

Modified: trunk/glom/mode_design/print_layouts/print_layout_toolbar.cc
==============================================================================
--- trunk/glom/mode_design/print_layouts/print_layout_toolbar.cc	(original)
+++ trunk/glom/mode_design/print_layouts/print_layout_toolbar.cc	Wed Mar  4 18:26:47 2009
@@ -22,7 +22,7 @@
 #include "print_layout_toolbar_button.h"
 #include <gtkmm/stock.h>
 #include <glibmm/i18n.h>
-#include "config.h"
+#include <libglom/libglom_config.h>
 
 //#include "layoutwidgetbase.h"
 #include <glom/utility_widgets/egg/toolpalette/eggtoolitemgroup.h>

Modified: trunk/glom/mode_find/box_data_details_find.cc
==============================================================================
--- trunk/glom/mode_find/box_data_details_find.cc	(original)
+++ trunk/glom/mode_find/box_data_details_find.cc	Wed Mar  4 18:26:47 2009
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
 
 #include "box_data_details_find.h"
 #include <glibmm/i18n.h>

Modified: trunk/glom/translation/window_translations.cc
==============================================================================
--- trunk/glom/translation/window_translations.cc	(original)
+++ trunk/glom/translation/window_translations.cc	Wed Mar  4 18:26:47 2009
@@ -31,7 +31,7 @@
 
 // To read the .po files
 #include <gettext-po.h>
-#include "config.h" //For HAVE_GETTEXTPO_XERROR
+#include <libglom/libglom_config.h> //For HAVE_GETTEXTPO_XERROR
 
 #include <sstream>
 

Modified: trunk/glom/utility_widgets/adddel/adddel.cc
==============================================================================
--- trunk/glom/utility_widgets/adddel/adddel.cc	(original)
+++ trunk/glom/utility_widgets/adddel/adddel.cc	Wed Mar  4 18:26:47 2009
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h" // For GLOM_ENABLE_MAEMO
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_MAEMO
 
 #include "adddel.h"
 #include <algorithm> //For std::find.

Modified: trunk/glom/utility_widgets/calendar/Makefile.am
==============================================================================
--- trunk/glom/utility_widgets/calendar/Makefile.am	(original)
+++ trunk/glom/utility_widgets/calendar/Makefile.am	Wed Mar  4 18:26:47 2009
@@ -1,6 +1,6 @@
 SUBDIRS = 
 
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS)
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS)
 
 noinst_LIBRARIES = libutility_widgets_calendar.a
 libutility_widgets_calendar_a_SOURCES = glomgtkcalendar.c glomgtkcalendar.h \

Modified: trunk/glom/utility_widgets/calendar/glomgtkcalendar.c
==============================================================================
--- trunk/glom/utility_widgets/calendar/glomgtkcalendar.c	(original)
+++ trunk/glom/utility_widgets/calendar/glomgtkcalendar.c	Wed Mar  4 18:26:47 2009
@@ -5,7 +5,7 @@
 #include <gtk/gtk.h>
 #if !GTK_CHECK_VERSION(2,16,0)
 
-#include <config.h>
+#include <libglom/libglom_config.h>
 
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
@@ -86,7 +86,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#include <config.h>
+#include <libglom/libglom_config.h>
 
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>

Modified: trunk/glom/utility_widgets/canvas/canvas_editable.h
==============================================================================
--- trunk/glom/utility_widgets/canvas/canvas_editable.h	(original)
+++ trunk/glom/utility_widgets/canvas/canvas_editable.h	Wed Mar  4 18:26:47 2009
@@ -24,7 +24,7 @@
 #include <goocanvasmm.h>
 #include "canvas_group_grid.h"
 #include <map>
-#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
 
 namespace Glom
 {

Modified: trunk/glom/utility_widgets/checkglom.h
==============================================================================
--- trunk/glom/utility_widgets/checkglom.h	(original)
+++ trunk/glom/utility_widgets/checkglom.h	Wed Mar  4 18:26:47 2009
@@ -21,7 +21,7 @@
 #ifndef GLOM_UTILITY_WIDGETS_CHECK_GLOM_H
 #define GLOM_UTILITY_WIDGETS_CHECK_GLOM_H
 
-#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
 
 #include <gtkmm.h>
 #include <libglom/data_structure/field.h>

Modified: trunk/glom/utility_widgets/comboentryglom.h
==============================================================================
--- trunk/glom/utility_widgets/comboentryglom.h	(original)
+++ trunk/glom/utility_widgets/comboentryglom.h	Wed Mar  4 18:26:47 2009
@@ -21,7 +21,7 @@
 #ifndef GLOM_UTILITY_WIDGETS_COMBOENTRY_GLOM_H
 #define GLOM_UTILITY_WIDGETS_COMBOENTRY_GLOM_H
 
-#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
 
 #include <gtkmm.h>
 #include <libglom/data_structure/field.h>

Modified: trunk/glom/utility_widgets/comboglom.h
==============================================================================
--- trunk/glom/utility_widgets/comboglom.h	(original)
+++ trunk/glom/utility_widgets/comboglom.h	Wed Mar  4 18:26:47 2009
@@ -21,7 +21,7 @@
 #ifndef GLOM_UTILITY_WIDGETS_COMBO_GLOM_H
 #define GLOM_UTILITY_WIDGETS_COMBO_GLOM_H
 
-#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
 
 #include <gtkmm.h>
 #include <libglom/data_structure/field.h>

Modified: trunk/glom/utility_widgets/datawidget.h
==============================================================================
--- trunk/glom/utility_widgets/datawidget.h	(original)
+++ trunk/glom/utility_widgets/datawidget.h	Wed Mar  4 18:26:47 2009
@@ -21,7 +21,7 @@
 #ifndef GLOM_UTILITY_WIDGETS_DATAWIDGET_H
 #define GLOM_UTILITY_WIDGETS_DATAWIDGET_H
 
-#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
 
 #include "placeholder.h"
 #include "layoutwidgetmenu.h"

Modified: trunk/glom/utility_widgets/db_adddel/db_adddel.h
==============================================================================
--- trunk/glom/utility_widgets/db_adddel/db_adddel.h	(original)
+++ trunk/glom/utility_widgets/db_adddel/db_adddel.h	Wed Mar  4 18:26:47 2009
@@ -31,7 +31,7 @@
 #include <vector>
 #include <map>
 
-#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
 
 namespace Glom
 {

Modified: trunk/glom/utility_widgets/dialog_choose_id.cc
==============================================================================
--- trunk/glom/utility_widgets/dialog_choose_id.cc	(original)
+++ trunk/glom/utility_widgets/dialog_choose_id.cc	Wed Mar  4 18:26:47 2009
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h" // For GLOM_ENABLE_MAEMO
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_MAEMO
 
 #include "dialog_choose_id.h"
 #include <bakery/App/App_Gtk.h> //For util_bold_message().

Modified: trunk/glom/utility_widgets/entryglom.h
==============================================================================
--- trunk/glom/utility_widgets/entryglom.h	(original)
+++ trunk/glom/utility_widgets/entryglom.h	Wed Mar  4 18:26:47 2009
@@ -21,7 +21,7 @@
 #ifndef GLOM_UTILITY_WIDGETS_ENTRY_GLOM_H
 #define GLOM_UTILITY_WIDGETS_ENTRY_GLOM_H
 
-#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
 
 #include <gtkmm.h>
 #include <libglom/data_structure/field.h>

Modified: trunk/glom/utility_widgets/filechooserdialog_saveextras.h
==============================================================================
--- trunk/glom/utility_widgets/filechooserdialog_saveextras.h	(original)
+++ trunk/glom/utility_widgets/filechooserdialog_saveextras.h	Wed Mar  4 18:26:47 2009
@@ -21,7 +21,7 @@
 #ifndef GLOM_UTILITY_WIDGETS_FILECHOOSERDIALOG_SAVEEXTRAS_H
 #define GLOM_UTILITY_WIDGETS_FILECHOOSERDIALOG_SAVEEXTRAS_H
 
-#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY, GLOM_ENABLE_SQLITE
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY, GLOM_ENABLE_SQLITE
 
 #include <libglom/document/document_glom.h>
 

Modified: trunk/glom/utility_widgets/layouttoolbar.cc
==============================================================================
--- trunk/glom/utility_widgets/layouttoolbar.cc	(original)
+++ trunk/glom/utility_widgets/layouttoolbar.cc	Wed Mar  4 18:26:47 2009
@@ -22,7 +22,7 @@
 #include "layouttoolbarbutton.h"
 #include <gtkmm/stock.h>
 #include <glibmm/i18n.h>
-#include "config.h"
+#include <libglom/libglom_config.h>
 
 #include "layoutwidgetbase.h"
 #include "egg/toolpalette/eggtoolitemgroup.h"

Modified: trunk/glom/utility_widgets/layoutwidgetbase.h
==============================================================================
--- trunk/glom/utility_widgets/layoutwidgetbase.h	(original)
+++ trunk/glom/utility_widgets/layoutwidgetbase.h	Wed Mar  4 18:26:47 2009
@@ -25,7 +25,7 @@
 #include <gtkmm.h>
 #include "../mode_data/treestore_layout.h" //Forthe enum.
 
-#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
 
 namespace Glom
 {

Modified: trunk/glom/utility_widgets/textviewglom.h
==============================================================================
--- trunk/glom/utility_widgets/textviewglom.h	(original)
+++ trunk/glom/utility_widgets/textviewglom.h	Wed Mar  4 18:26:47 2009
@@ -21,7 +21,7 @@
 #ifndef GLOM_UTILITY_WIDGETS_TEXTVIEW_GLOM_H
 #define GLOM_UTILITY_WIDGETS_TEXTVIEW_GLOM_H
 
-#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
 
 #include <gtkmm.h>
 #include <libglom/data_structure/field.h>

Modified: trunk/glom/xsl_utils.cc
==============================================================================
--- trunk/glom/xsl_utils.cc	(original)
+++ trunk/glom/xsl_utils.cc	Wed Mar  4 18:26:47 2009
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h" // For GLOM_ENABLE_MAEMO
+#include <libglom/libglom_config.h> // For GLOM_ENABLE_MAEMO
 
 #include "xsl_utils.h"
 #include <libglom/connectionpool.h>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]