From 9e0d66610c7e8190de212e82a54102e932bdd376 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sun, 22 Feb 2009 16:21:22 -0400
Subject: Renamed acconf.h to config.h, for included gettext

---
 .gitignore    | 1 +
 Makefile.am   | 4 ++--
 configure.ac  | 2 +-
 src/system.hh | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index f7719753..ac91b4cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -95,3 +95,4 @@
 /version.m4
 /src/system.hh.gch
 /ABOUT-NLS
+/config.h.in
diff --git a/Makefile.am b/Makefile.am
index 4e3fc1e1..565b1bfb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -78,7 +78,7 @@ libledger_report_la_CPPFLAGS = $(lib_cppflags)
 libledger_report_la_LDFLAGS  = -release $(VERSION).0
 
 pkginclude_HEADERS =			   \
-	$(top_builddir)/acconf.h	   \
+	$(top_builddir)/config.h	   \
 	src/system.hh			   \
 	src/utils.h			   \
 	src/flags.h			   \
@@ -148,7 +148,7 @@ nodist_libledger_util_la_SOURCES = src/system.hh.gch
 BUILT_SOURCES = src/system.hh.gch
 CLEANFILES   += $(srcdir)/src/system.hh.gch
 
-$(srcdir)/src/system.hh.gch: $(srcdir)/src/system.hh $(top_builddir)/acconf.h
+$(srcdir)/src/system.hh.gch: $(srcdir)/src/system.hh $(top_builddir)/config.h
 	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	    $(lib_cppflags) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \
 	    -g -o $@ $(srcdir)/src/system.hh
diff --git a/configure.ac b/configure.ac
index 96efe933..5292c11d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ AC_CONFIG_AUX_DIR([.])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 
 AC_CONFIG_SRCDIR([src/main.cc])
-AC_CONFIG_HEADER([acconf.h])
+AC_CONFIG_HEADER([config.h])
 
 # Checks for programs.
 AC_USE_SYSTEM_EXTENSIONS
diff --git a/src/system.hh b/src/system.hh
index a6aef3a2..899c2f2a 100644
--- a/src/system.hh
+++ b/src/system.hh
@@ -58,7 +58,7 @@
  * configure is re-run) are expected to change.
  */
 
-#include "acconf.h"
+#include "config.h"
 
 #if defined(__GNUG__) && __GNUG__ < 3
 #define _XOPEN_SOURCE
-- 
cgit v1.2.3