Revert use of config.h

Revert
7162e8db74
088493d499

And drop AC_CONFIG_HEADERS so that config goes though the command line.
No longer generating config.h, update .gitignore

.gitignore

@@ -19,10 +19,7 @@ Makefile.in
 Makefile
 doc/*.1
 INSTALL
-include/config.h
-include/config.h.in
 include/mdbver.h
-include/stamp-h1
 libmdb.pc
 libmdbsql.pc
 libtool

configure.ac

@@ -8,8 +8,6 @@ AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE([enable])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
-AC_CONFIG_HEADERS(include/config.h)
-
 AC_PROG_CC(gcc)
 dnl Checks for programs.
 AC_PROG_MAKE_SET
@@ -39,6 +37,9 @@ if test "$am_cv_gcc_have_attribute_alias" = "yes"; then
       CFLAGS="$CFLAGS -DHAVE_ATTRIBUTE_ALIAS"
 fi
 
+CFLAGS="$CFLAGS -I$(top_builddir)/include"
+
+
 dnl no optional stuff by default
 OPTDIRS=""
 

include/mdbprivate.h

@@ -24,8 +24,6 @@
  * exported to calling programs.
  */
 
-#include <config.h>
-
 #define _(String) (String)
 #define N_(String) String
 #define textdomain(Domain)

src/extras/Makefile.am

@@ -1,6 +1,6 @@
 bin_PROGRAMS	=	mdb-hexdump
 mdb_hexdump_SOURCES = mdb-dump.c mdbsupport.c
 EXTRA_DIST = mdbsupport.h
-AM_CFLAGS	=	$(GLIB_CFLAGS)
+AM_CFLAGS	=	-I$(top_srcdir)/include $(GLIB_CFLAGS)
 LDADD	=	../libmdb/libmdb.la 
 LIBS	=	$(GLIB_LIBS)

src/extras/mdb-dump.c

@@ -1,6 +1,5 @@
 /* utility program to make a hex dump of a binary file (such as a mdb file) */
 
-#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>

src/extras/mdbsupport.c

@@ -1,6 +1,5 @@
 /* support routines for code generated by the util programs */
 
-#include "config.h"
 #include <stdio.h>
 #include <string.h>
 

src/gmdb2/Makefile.am

@@ -4,7 +4,7 @@ include_HEADERS = gmdb.h
 
 gmdb2_SOURCES = main2.c file.c table.c info.c table_def.c table_data.c table_export.c debug.c sql.c schema.c prefs.c
 LIBS =	-rdynamic $(GNOME_LIBS) @LIBS@ @LEXLIB@
-AM_CFLAGS	=	$(GNOME_CFLAGS) \
+AM_CFLAGS	=	-I$(top_srcdir)/include $(GNOME_CFLAGS) \
         -DDATADIR="\"$(datadir)\""                      \
         -DGMDB_ICONDIR="\"$(datadir)/gmdb/glade/\""        \
         -DGMDB_GLADEDIR="\"$(datadir)/gmdb/glade/\"" 

src/gmdb2/debug.c

@@ -23,7 +23,6 @@
  *   gboolean *dissect: whether dissecting is turned on
  */ 
 
-#include "config.h"
 #include <glade/glade.h>
 #include <gtk/gtkmessagedialog.h>
 #include <libgnome/gnome-i18n.h>

src/gmdb2/file.c

@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include <gtk/gtkiconview.h>
 #include <gtk/gtkliststore.h>
 #include <gtk/gtkmessagedialog.h>

src/gmdb2/info.c

@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "gmdb.h"
 
 extern GtkWidget *app;

src/gmdb2/main2.c

@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include <gnome.h>
 #include <libgnome/gnome-help.h>
 #include <glade/glade.h>

src/gmdb2/prefs.c

@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include <libgnome/gnome-config.h>
 #include <libgnome/gnome-help.h>
 #include "gmdb.h"

src/gmdb2/schema.c

@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include <gtk/gtkmessagedialog.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-help.h>

src/gmdb2/sql.c

@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include <gtk/gtkmessagedialog.h>
 #include <libgnome/gnome-i18n.h>
 #include "gmdb.h"

src/gmdb2/table.c

@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include <gtk/gtkiconview.h>
 #include <glade/glade.h>
 #include "gmdb.h"

src/gmdb2/table_data.c

@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "gmdb.h"
 
 extern GtkWidget *app;

src/gmdb2/table_def.c

@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "gmdb.h"
 
 #define COL_PK 0

src/gmdb2/table_export.c

@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include <gtk/gtk.h>
 #include <gtk/gtkmessagedialog.h>
 #include <libgnome/gnome-i18n.h>

src/libmdb/Makefile.am

@@ -1,5 +1,5 @@
 lib_LTLIBRARIES	=	libmdb.la
 libmdb_la_SOURCES=	catalog.c mem.c file.c table.c data.c dump.c backend.c money.c sargs.c index.c like.c write.c stats.c map.c props.c worktable.c options.c iconv.c
 libmdb_la_LDFLAGS = -version-info 2:1:0 -export-symbols-regex '^(mdb_|_mdb_put_int16$$|_mdb_put_int32$$)'
-AM_CFLAGS	=	$(GLIB_CFLAGS)
+AM_CFLAGS	=	-I$(top_srcdir)/include $(GLIB_CFLAGS)
 LIBS = $(GLIB_LIBS) @LIBS@ @LIBICONV@

src/libmdb/backend.c

@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "config.h"
 #ifdef JAVA
 #include "javadefines.h"
 #define MdbBackendType_STRUCT_ELEMENT(a,b,c,d) new MdbBackendType(a,b,c,d)

src/libmdb/catalog.c

@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "config.h"
 #include "mdbtools.h"
 
 #ifdef DMALLOC

src/libmdb/data.c

@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "config.h"
 #include <time.h>
 #include <math.h>
 #include "mdbtools.h"

src/libmdb/dump.c

@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "config.h"
 #include <ctype.h>
 #include <string.h>
 #include <stdio.h>

src/libmdb/file.c

@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "config.h"
 #include <inttypes.h>
 #include "mdbtools.h"
 

src/libmdb/iconv.c

@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "config.h"
 #include <errno.h>
 #include "mdbtools.h"
 

src/libmdb/index.c

@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "config.h"
 #include "mdbtools.h"
 
 #ifdef DMALLOC

src/libmdb/like.c

@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #include "mdbtools.h"

src/libmdb/map.c

@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "config.h"
 #include "mdbtools.h"
 
 #ifdef DMALLOC

src/libmdb/mem.c

@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "config.h"
 #include "mdbtools.h"
 
 MDB_DEPRECATED(void,

src/libmdb/money.c

@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "config.h"
 #include <stdio.h>
 #include "mdbtools.h"
 

src/libmdb/options.c

@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>

src/libmdb/props.c

@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "config.h"
 #include "mdbtools.h"
 
 static GPtrArray *

src/libmdb/sargs.c

@@ -27,7 +27,6 @@
  * a mdb_test_[type]() function and invoke it from mdb_test_sarg()
  */
 
-#include "config.h"
 #include <time.h>
 #include "mdbtools.h"
 #ifdef DMALLOC

src/libmdb/stats.c

@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "config.h"
 #include "mdbtools.h"
 
 #ifdef DMALLOC

src/libmdb/table.c

@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "config.h"
 #include "mdbtools.h"
 
 #ifdef DMALLOC

src/libmdb/worktable.c

@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "config.h"
 #include "mdbtools.h"
 
 #ifdef DMALLOC

src/libmdb/write.c

@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "config.h"
 #include <time.h>
 #include <math.h>
 #include <inttypes.h>

src/odbc/Makefile.am

@@ -1,6 +1,6 @@
 noinst_PROGRAMS	=	unittest
 lib_LTLIBRARIES	=	libmdbodbc.la
-AM_CFLAGS	=	$(GLIB_CFLAGS) $(ODBC_CFLAGS)
+AM_CFLAGS	=	-I$(top_srcdir)/include $(GLIB_CFLAGS) $(ODBC_CFLAGS)
 libmdbodbc_la_SOURCES	= odbc.c connectparams.c mdbodbc.h connectparams.h
 libmdbodbc_la_LIBADD	= ../libmdb/libmdb.la ../sql/libmdbsql.la
 libmdbodbc_la_LDFLAGS	= -avoid-version -export-symbols-regex '^(SQL|ODBCINST)'

src/odbc/connectparams.c

@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "config.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

src/odbc/odbc.c

@@ -21,7 +21,6 @@
 #define UNICODE
 #endif //ENABLE_ODBC_W
 
-#include "config.h"
 #include <sql.h>
 #include <sqlext.h>
 #include <string.h>

src/odbc/unittest.c

@@ -17,7 +17,6 @@
  */
 
 /* #include <windows.h> */
-#include "config.h"
 #include <stdio.h>
 #include <sql.h>
 #include <sqlext.h>

src/sql/Makefile.am

@@ -2,7 +2,7 @@ lib_LTLIBRARIES	=	libmdbsql.la
 libmdbsql_la_SOURCES=	mdbsql.c parser.y lexer.l 
 libmdbsql_la_LDFLAGS = -version-info 2:0:0 -export-symbols-regex '^mdb_sql_'
 CLEANFILES = parser.c parser.h lexer.c
-AM_CFLAGS	=	$(GLIB_CFLAGS)
+AM_CFLAGS	=	-I$(top_srcdir)/include $(GLIB_CFLAGS)
 LIBS	=	$(GLIB_LIBS)
 libmdbsql_la_LIBADD =	../libmdb/libmdb.la
 YACC = @YACC@ -d

src/sql/mdbsql.c

@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "config.h"
 #include <stdarg.h>
 #include "mdbsql.h"
 

src/util/Makefile.am

@@ -2,7 +2,7 @@ bin_PROGRAMS	=	mdb-export mdb-array mdb-schema mdb-tables mdb-parsecsv mdb-heade
 noinst_PROGRAMS = mdb-import prtable prcat prdata prkkd prdump prole updrow prindex
 LIBS	=	$(GLIB_LIBS) @LIBS@ @LEXLIB@ 
 DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\"
-AM_CFLAGS	=	$(GLIB_CFLAGS)
+AM_CFLAGS	=	-I$(top_srcdir)/include $(GLIB_CFLAGS)
 LDADD	=	../libmdb/libmdb.la 
 if SQL
 mdb_sql_LDADD = ../libmdb/libmdb.la ../sql/libmdbsql.la $(LIBREADLINE)

src/util/mdb-array.c

@@ -19,7 +19,6 @@
 /* this is inherited from mdb-export.c, modified to make arrays similar to
    those generated by parsecsv.c */
 
-#include "config.h"
 #include "mdbtools.h"
 
 #ifdef DMALLOC

src/util/mdb-check.c

@@ -18,7 +18,6 @@
 
 /* this utility dumps the schema for an existing database */
 
-#include "config.h"
 #include "mdbtools.h"
 
 #ifdef DMALLOC

src/util/mdb-export.c

@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "mdbtools.h"
 
 #ifdef DMALLOC

src/util/mdb-header.c

@@ -19,7 +19,6 @@
 /* this utility dumps the C headers for an existing database */
 /* it will create three files - types.h and dump_types.[ch] */
 
-#include "config.h"
 #include <string.h>
 #include "mdbtools.h"
 

src/util/mdb-import.c

@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "mdbtools.h"
 
 #define MAX_ROW_SIZE 4096

src/util/mdb-parsecsv.c

@@ -20,7 +20,6 @@
 /* input FOO.txt, output FOO.c */
 /* generates an array of type FOO */
 
-#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

src/util/mdb-prop.c

@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "mdbtools.h"
 
 void dump_kkd(MdbHandle *mdb, void *kkd, size_t len);

src/util/mdb-schema.c

@@ -17,7 +17,6 @@
  */
 
 /* this utility dumps the schema for an existing database */
-#include "config.h"
 #include <ctype.h>
 #include <getopt.h>
 #include "mdbtools.h"

src/util/mdb-sql.c

@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include <stdio.h>
 
 #ifdef HAVE_LIBREADLINE

src/util/mdb-tables.c

@@ -18,7 +18,6 @@
 
 /* this utility dumps the schema for an existing database */
 
-#include "config.h"
 #include "mdbtools.h"
 
 #ifdef DMALLOC

src/util/mdb-ver.c

@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include <locale.h>
 #include "mdbtools.h"
 #include "mdbver.h"

src/util/prcat.c

@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "mdbtools.h"
 
 int

src/util/prdata.c

@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "mdbtools.h"
 
 int

src/util/prdump.c

@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "mdbtools.h"
 
 int

src/util/prfreemap.c

@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "mdbtools.h"
 
 int

src/util/prindex.c

@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "mdbtools.h"
 
 extern char idx_to_text[];

src/util/prkkd.c

@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "mdbtools.h"
 
 int

src/util/prole.c

@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "mdbtools.h"
 
 void dump_ole(MdbTableDef *table, char *colname, char *sargname);

src/util/prtable.c

@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "mdbtools.h"
 
 int

src/util/sargtest.c

@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "mdbtools.h"
 
 #define TABLE_NAME "Orders"

src/util/updrow.c

@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include "mdbtools.h"
 
 void read_to_row(MdbTableDef *table, char *sargname);