glom r2013 - in trunk: . glom/libglom

[arminb svn gnome org]

Author: arminb
Date: Sat Mar 21 13:07:45 2009
New Revision: 2013
URL: http://svn.gnome.org/viewvc/glom?rev=2013&view=rev

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

	* autogen.sh: Don't run autoheader.

	* configure.ac: Prevent execution of autoheader with
	--enable-maintainer-mode. Copied from glibmm.

	* glom/libglom/libglom_config.h.in: Added include guards.

	* config.h.in: Added this file which was previously generated by
	autoheader. Removed the prefixed definitions from it but include
	glom/libglom/libglom_config.h instead. This prevents warnings about
	redefinitions when both config.h and libglom_config.h are included in
	a translation unit.


Added:
   trunk/config.h.in
Modified:
   trunk/ChangeLog
   trunk/autogen.sh
   trunk/configure.ac
   trunk/glom/libglom/libglom_config.h.in

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Sat Mar 21 13:07:45 2009
@@ -62,8 +62,6 @@
   gnome-doc-prepare --force --copy	&& \
 echo "- aclocal-1.9"		&& \
   aclocal-1.9 -I "$srcdir/macros" $ACLOCAL_FLAGS && \
-echo "- autoheader"		&& \
-  autoheader			&& \
 echo "- autoconf"		&& \
   autoconf			&& \
 echo "- automake-1.9."		&& \

Added: trunk/config.h.in
==============================================================================
--- (empty file)
+++ trunk/config.h.in	Sat Mar 21 13:07:45 2009
@@ -0,0 +1,203 @@
+
+/* Include libglom_config.h so we also get the prefixed definitions */
+#include "glom/libglom/libglom_config.h"
+
+/* always defined to indicate that i18n is enabled */
+#undef ENABLE_NLS
+
+/* The domain name to use with gettext. */
+#undef GETTEXT_PACKAGE
+
+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
+#undef HAVE_BIND_TEXTDOMAIN_CODESET
+
+/* Define to 1 if you have the `dcgettext' function. */
+#undef HAVE_DCGETTEXT
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#undef HAVE_GETTEXT
+
+/* Defined when libgettextpo has the new po_xerror_handler error handling
+   struct. */
+#undef HAVE_GETTEXTPO_XERROR
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define if your <locale.h> file defines LC_MESSAGES. */
+#undef HAVE_LC_MESSAGES
+
+/* Define to 1 if you have the <locale.h> header file. */
+#undef HAVE_LOCALE_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strptime' function. */
+#undef HAVE_STRPTIME
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* ISO codes prefix */
+#undef ISO_CODES_PREFIX
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Path to the postgres utilities, such as postgres, pg_ctl, etc. */
+#undef POSTGRES_UTILS_PATH
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* always defined to indicate that i18n is enabled */
+#undef ENABLE_NLS
+
+/* The domain name to use with gettext. */
+#undef GETTEXT_PACKAGE
+
+/* "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
+
+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
+#undef HAVE_BIND_TEXTDOMAIN_CODESET
+
+/* Define to 1 if you have the `dcgettext' function. */
+#undef HAVE_DCGETTEXT
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#undef HAVE_GETTEXT
+
+/* Defined when libgettextpo has the new po_xerror_handler error handling
+   struct. */
+#undef HAVE_GETTEXTPO_XERROR
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define if your <locale.h> file defines LC_MESSAGES. */
+#undef HAVE_LC_MESSAGES
+
+/* Define to 1 if you have the <locale.h> header file. */
+#undef HAVE_LOCALE_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strptime' function. */
+#undef HAVE_STRPTIME
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* ISO codes prefix */
+#undef ISO_CODES_PREFIX
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Path to the postgres utilities, such as postgres, pg_ctl, etc. */
+#undef POSTGRES_UTILS_PATH
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Mar 21 13:07:45 2009
@@ -216,6 +216,10 @@
 	AC_SUBST(MAEMO_LAUNCHER_LIBS)
 fi
 
+# HACK:  Assign a dummy in order to prevent execution of autoheader by the
+# maintainer-mode rules.  That would fail since we aren't using autoheader.
+AUTOHEADER=':'
+
 # Generate Makefiles, configuration files and scripts:
 AC_CONFIG_FILES([Makefile \
   glom/Makefile \

Modified: trunk/glom/libglom/libglom_config.h.in
==============================================================================
--- trunk/glom/libglom/libglom_config.h.in	(original)
+++ trunk/glom/libglom/libglom_config.h.in	Sat Mar 21 13:07:45 2009
@@ -1,3 +1,7 @@
+
+#ifndef GLOM_LIBGLOM_CONFIG_H
+#define GLOM_LIBGLOM_CONFIG_H
+
 /* "definition of GLOM_DTD_INSTALL_DIR" */
 #undef GLOM_DTD_INSTALL_DIR
 
@@ -12,3 +16,5 @@
 
 /* Whether to enable support for SQLite databases. */
 #undef GLOM_ENABLE_SQLITE
+
+#endif /* GLOM_LIBGLOM_CONFIG_H */