From 5f35450e82320f9699ec05237166a2664b9f7e12 Mon Sep 17 00:00:00 2001
From: Derek Atkins <derek@ihtfp.com>
Date: Fri, 9 May 2003 02:48:54 +0000
Subject: [PATCH] 	* acconfig.h: remove duplicate entries (for use with
 more recent autoheader) 	* configure.in: supply AC_PROG_CXX to fix the
 automake-1.7 problem

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@8283 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 ChangeLog    |  5 ++++-
 acconfig.h   | 49 -------------------------------------------------
 configure.in |  1 +
 3 files changed, 5 insertions(+), 50 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eba8dac576..69b21284f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,10 @@
 
 	* configure.in: fix some AC_DEFINE macros
 	* macros/autogen.sh: a bit more work on the version searches.
-	
+
+	* acconfig.h: remove duplicate entries (for use with more recent autoheader)
+	* configure.in: supply AC_PROG_CXX to fix the automake-1.7 problem
+
 2003-05-07  Derek Atkins  <derek@ihtfp.com>
 
 	* macros/autogen.sh: require autoconf >= 2.53 and automake >= 1.5
diff --git a/acconfig.h b/acconfig.h
index ba158ed126..9685fccb68 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -25,32 +25,9 @@
 #ifndef GNC_CONFIG_H
 #define GNC_CONFIG_H
 
-/* Package name and version number */
-#undef PACKAGE
-#undef VERSION
-
-#undef GNUCASH_MAJOR_VERSION
-#undef GNUCASH_MINOR_VERSION
-#undef GNUCASH_MICRO_VERSION
-
-/* Are we compiling for GNOME?  The answer right now is always yes... */
-#undef GNOME
-
-/* Do some memory debugging stuff */
-#define DEBUG_MEMORY        
-
-/* limits.h header present */
-#undef HAVE_LIMITS_H
-
 /* ieeefp.h header present */
 #undef HAVE_IEEEFP_H
 
-/* memcpy present */
-#undef HAVE_MEMCPY
-
-/* check for stpcpy for Solaris */
-#undef HAVE_STPCPY
-
 /* If configure found libXpm, then use it */
 #undef HAVE_XPM            
 
@@ -65,23 +42,6 @@
 /* New or old Guile Smob for G-wrap */
 #undef GWRAP_OLD_GUILE_SMOB
 
-/* The db1 database library */
-#undef PREFER_DB1
-
-/* Should we add guppi support? */
-#undef USE_GUPPI
-
-/* Should we have efence linked in */
-#undef USE_EFENCE
-
-/* Use the new gtkhtml widget instead of the old xmhtml widget */
-#undef HAVE_LIBGTKHTML
-
-/* SSL support for ghttp is still not in the main tree, so test for it
- * separately */
-#undef HAVE_LIBGHTTP
-#undef HAVE_OPENSSL
-
 /* misc image and compression libs needed by html widget */
 #undef HAVE_ZLIB               
 #undef HAVE_PNG             
@@ -93,21 +53,12 @@
 
 /*** Begin i18n ***/
 
-/* internationalization with gettext */ 
-#undef HAVE_GETTEXT
-
 /* internationalization with catgets */ 
 #undef HAVE_CATGETS
 
-/* locale.h contains LC_MESSAGES */ 
-#undef HAVE_LC_MESSAGES
-
 /* specific locale directory */ 
 #undef HAVE_LOCALE_DIR
 
-/* defined if NLS is available */
-#undef ENABLE_NLS
-
 /*** End i18n ***/
 
 #undef HAVE_XML_VERSION_HEADER
diff --git a/configure.in b/configure.in
index 42ca4d464a..bdcc99025c 100644
--- a/configure.in
+++ b/configure.in
@@ -532,6 +532,7 @@ AC_ARG_ENABLE( hbci,
   if test "x$enableval" != "xno" ; then
     HBCI_DIR=hbci
   fi)
+AC_PROG_CXX
 if test x${HBCI_DIR} = xhbci ;
 then
     AM_PATH_OPENHBCI(0.9.6)