[glom] libglom: Use only libglom-config.h, not config.h.

[Murray Cumming <murrayc src gnome org>]

commit fa3d79cc04f52478254e3221dfaac98e053eab3b
Author: Murray Cumming <murrayc murrayc com>
Date:   Sat Mar 19 10:02:38 2016 +0100

    libglom: Use only libglom-config.h, not config.h.

 cmake-config.h.in                                |   13 -------------
 glom/libglom/cmake-libglom_config.h.in           |   16 ++++++++++++++++
 glom/libglom/connectionpool_backends/mysql.cc    |    4 ++--
 glom/libglom/connectionpool_backends/postgres.cc |    3 +--
 glom/libglom/document/bakery/document.cc         |    2 +-
 glom/libglom/document/document.cc                |    2 +-
 glom/libglom/libglom_config.h.in                 |   18 ++++++++++++++++++
 glom/libglom/translations_po.cc                  |    2 +-
 8 files changed, 40 insertions(+), 20 deletions(-)
---
diff --git a/cmake-config.h.in b/cmake-config.h.in
index 3ba509f..304b291 100644
--- a/cmake-config.h.in
+++ b/cmake-config.h.in
@@ -2,10 +2,6 @@
    language is requested. */
 #cmakedefine ENABLE_NLS
 
-/* Define to the file extension of executables on the target.
- * Note: We use define instead of cmakedefine, to let this be an empty string. */
-#define EXEEXT "@EXEEXT@"
-
 /* Define to the gettext package name. */
 #cmakedefine GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
 
@@ -30,16 +26,10 @@
 /* Define to the location of the msgfmt gettext utility. */
 #cmakedefine GLOM_MSGFMT
 
-/* Define if libgettextpo provides the new po_xerror_handler struct. */
-#cmakedefine HAVE_GETTEXTPO_XERROR
-
 /* Define to the installation prefix of the iso-codes module. */
 /* TODO: Avoid duplication with libglom-config.h */
 #cmakedefine ISO_CODES_PREFIX "@ISO_CODES_PREFIX@"
 
-/* Define to the location of the MySQL utilities. */
-#cmakedefine MYSQL_UTILS_PATH "@MYSQL_UTILS_PATH@"
-
 /* Define to the full name of this package. */
 #cmakedefine PACKAGE_NAME
 
@@ -55,8 +45,5 @@
 /* Define to the version of this package. */
 #cmakedefine PACKAGE_VERSION "@PACKAGE_VERSION@"
 
-/* Define to the location of the PostgreSQL utilities. */
-#cmakedefine POSTGRES_UTILS_PATH "@POSTGRES_UTILS_PATH@"
-
 #define GLOM_LOCALEDIR "@GLOM_LOCALEDIR@"
 
diff --git a/glom/libglom/cmake-libglom_config.h.in b/glom/libglom/cmake-libglom_config.h.in
index 38766e4..13a3a81 100644
--- a/glom/libglom/cmake-libglom_config.h.in
+++ b/glom/libglom/cmake-libglom_config.h.in
@@ -14,4 +14,20 @@
 /* Define to 1 if you have the `strptime' function. */
 #cmakedefine HAVE_STRPTIME
 
+/* Define to the gettext package name. */
+#cmakedefine GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
+
+/* Define if libgettextpo provides the new po_xerror_handler struct. */
+#cmakedefine HAVE_GETTEXTPO_XERROR
+
+/* Define to the location of the MySQL utilities. */
+#cmakedefine MYSQL_UTILS_PATH "@MYSQL_UTILS_PATH@"
+
+/* Define to the location of the PostgreSQL utilities. */
+#cmakedefine POSTGRES_UTILS_PATH "@POSTGRES_UTILS_PATH@"
+
+/* Define to the file extension of executables on the target.
+ * Note: We use define instead of cmakedefine, to let this be an empty string. */
+#define EXEEXT "@EXEEXT@"
+
 #endif /* GLOM_LIBGLOM_CONFIG_H */
diff --git a/glom/libglom/connectionpool_backends/mysql.cc b/glom/libglom/connectionpool_backends/mysql.cc
index 6164cce..999d1fd 100644
--- a/glom/libglom/connectionpool_backends/mysql.cc
+++ b/glom/libglom/connectionpool_backends/mysql.cc
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301 USA.
  */
 
-#include "config.h" // For MYSQL_UTILS_PATH
+#include <libglom/libglom_config.h> // For MYSQL_UTILS_PATH
 
 #include <libglom/connectionpool_backends/mysql.h>
 #include <libglom/spawn_with_feedback.h>
@@ -511,7 +511,7 @@ std::string MySQL::get_path_to_mysql_executable(const std::string& program, bool
     path = Glib::shell_quote(path);
   return path;
 #else // G_OS_WIN32
-  // MYSQL_UTILS_PATH is defined in config.h, based on the configure.
+  // MYSQL_UTILS_PATH is defined in libglom_config.h, based on the configure.
   try
   {
     auto path = Glib::build_filename(MYSQL_UTILS_PATH, program + EXEEXT);
diff --git a/glom/libglom/connectionpool_backends/postgres.cc 
b/glom/libglom/connectionpool_backends/postgres.cc
index cd31d46..e06ecdf 100644
--- a/glom/libglom/connectionpool_backends/postgres.cc
+++ b/glom/libglom/connectionpool_backends/postgres.cc
@@ -18,8 +18,7 @@
  * Boston, MA 02110-1301 USA.
  */
 
-#include "config.h" // For POSTGRES_UTILS_PATH
-#include <libglom/libglom_config.h>
+#include <libglom/libglom_config.h> // For POSTGRES_UTILS_PATH
 
 #include <libglom/connectionpool_backends/postgres.h>
 #include <libglom/spawn_with_feedback.h>
diff --git a/glom/libglom/document/bakery/document.cc b/glom/libglom/document/bakery/document.cc
index 28e57b3..2eaff3b 100644
--- a/glom/libglom/document/bakery/document.cc
+++ b/glom/libglom/document/bakery/document.cc
@@ -16,7 +16,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "config.h"
+#include <libglom/libglom_config.h>
 #include <libglom/document/bakery/document.h>
 #include <libglom/utils.h>
 #include <giomm/file.h>
diff --git a/glom/libglom/document/document.cc b/glom/libglom/document/document.cc
index ef5cbfb..9779798 100644
--- a/glom/libglom/document/document.cc
+++ b/glom/libglom/document/document.cc
@@ -18,6 +18,7 @@
  * Boston, MA 02110-1301 USA.
  */
 
+#include <libglom/libglom_config.h>
 #include <libglom/document/document.h>
 #include <libglom/xml_utils.h>
 #include <libglom/algorithms_utils.h>
@@ -49,7 +50,6 @@
 #include <archive_entry.h>
 
 #include <glibmm/i18n.h>
-//#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
 #include <iostream>
diff --git a/glom/libglom/libglom_config.h.in b/glom/libglom/libglom_config.h.in
index 8c214ef..9ce8aef 100644
--- a/glom/libglom/libglom_config.h.in
+++ b/glom/libglom/libglom_config.h.in
@@ -14,4 +14,22 @@
 /* Define to 1 if you have the `strptime' function. */
 #undef HAVE_STRPTIME
 
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the gettext package name. */
+#undef GETTEXT_PACKAGE
+
+/* Define if libgettextpo provides the new po_xerror_handler struct. */
+#undef HAVE_GETTEXTPO_XERROR
+
+/* Define to the location of the MySQL utilities. */
+#undef MYSQL_UTILS_PATH
+
+/* Define to the location of the PostgreSQL utilities. */
+#undef POSTGRES_UTILS_PATH
+
+/* Define to the file extension of executables on the target. */
+#undef EXEEXT
+
 #endif /* GLOM_LIBGLOM_CONFIG_H */
diff --git a/glom/libglom/translations_po.cc b/glom/libglom/translations_po.cc
index d494594..c9a106f 100644
--- a/glom/libglom/translations_po.cc
+++ b/glom/libglom/translations_po.cc
@@ -22,7 +22,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 <glibmm/convert.h>
 #include <glibmm/fileutils.h>