Don't configure locale.h, just include it directly.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@2271 57a11ea4-9604-0410-9ed3-97b8803252fd

ChangeLog

@@ -1,5 +1,14 @@
 2000-05-07  Dave Peticolas  <peticola@cs.ucdavis.edu>
 
+	* src/guile/i18n.h.in: always include locale.h
+
+	* src/messages_i18n.h: no longer needs to be configured.
+
+	* configure.in: don't bother checking for locale.h, we have
+	to have it anyway.
+
+	* aclocal.m4: always include locale.h
+
 	* src/gnome/window-register.c (deleteCB): use g_strdup_printf
 	instead of asprintf.
 

aclocal.m4

@@ -321,12 +321,13 @@ AC_DEFUN(AC_CAN_USE_GNU_GETTEXT,
    dnl The reference to <locale.h> in the installed <libintl.h> file
    dnl must be resolved because we cannot expect the users of this
    dnl to define HAVE_LOCALE_H.
-   if test "$ac_cv_header_locale_h" = yes; then
+   dnl if test "$ac_cv_header_locale_h" = yes; then
-     INCLUDE_LOCALE_H="#include <locale.h>"
+   dnl Gnucash requires locale.h, so just hard-code it in -- Dave Peticolas
-   else
+   INCLUDE_LOCALE_H="#include <locale.h>"
-     INCLUDE_LOCALE_H="\
+   dnl else
-/* The system does not provide the header <locale.h>.  Take care yourself.  */"
+   dnl   INCLUDE_LOCALE_H="\
-   fi
+dnl /* The system does not provide the header <locale.h>.  Take care yourself.  */"
+   dnl fi
    AC_SUBST(INCLUDE_LOCALE_H)
 
    dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly

configure.in

@@ -118,7 +118,8 @@ GNC_EXPANDED_LOCALE_DIR=`gnc_recursively_expand_var "${LOCALE_DIR}"`
 AC_SUBST(LOCALE_DIR)
 AC_SUBST(GNC_EXPANDED_LOCALE_DIR)
 
-AC_CHECK_HEADER(locale.h, ac_cv_header_locale_h=yes, ac_cv_header_locale_h=no)
+# We need the variable below defined for the gettext checks to work
+ac_cv_header_locale_h=yes
 AC_CAN_USE_GNU_GETTEXT
 
 
@@ -580,7 +581,6 @@ AC_OUTPUT(Makefile
           Makefile.init
           make-gnucash-patch
           src/Makefile
-          src/messages_i18n.h
           src/engine/Makefile
           src/guile/Makefile
           src/guile/gnucash.h

src/.cvsignore

@@ -6,4 +6,3 @@ obj
 *.patch
 *.log
 *.xac.*.xac
-messages_i18n.h

src/SplitLedger.c

@@ -95,19 +95,21 @@
 
 #define _GNU_SOURCE
 
+#include <config.h>
+
 #include <stdio.h>
 #include <time.h>
 
 #include "top-level.h"
 
 #include "ui-callbacks.h"
-#include "messages.h"
 #include "SplitLedger.h"
 #include "MultiLedger.h"
 #include "FileDialog.h"
 #include "Refresh.h"
 #include "splitreg.h"
 #include "table-allgui.h"
+#include "messages.h"
 #include "util.h"
 
 #define BUFSIZE 1024

src/messages_i18n.h

@@ -29,28 +29,29 @@
 #ifndef __XACC_MESSAGES_I18N_H__
 #define __XACC_MESSAGES_I18N_H__
 
-#if defined(HAVE_GETTEXT)		/* HAVE_GETTEXT */
+#if defined(HAVE_GETTEXT)             /* HAVE_GETTEXT */
 
 #include <libintl.h>
-@INCLUDE_LOCALE_H@
+#include <locale.h>
 
 #undef _
 
 #ifdef DISABLE_GETTEXT_UNDERSCORE
-#define _(String)	(String)
+#define _(String) (String)
-#else		/* ENABLE_GETTEXT_UNDERSCORE */
+#else                                 /* ENABLE_GETTEXT_UNDERSCORE */
-#define _(String)	gettext (String)
+#define _(String) gettext(String)
-#endif		/* End ENABLE_GETTEXT_UNDERSCORE */
+#endif		                      /* End ENABLE_GETTEXT_UNDERSCORE */
 
-#else 					/* Not HAVE_GETTEXT */
+#else                                 /* Not HAVE_GETTEXT */
 
-#define _(String)	(String)
+#define _(String)       (String)
-#define gettext(String)	(String)
+#define gettext(String) (String)
 
-#endif					/* End Not HAVE_GETTEXT */
+#endif                                /* End Not HAVE_GETTEXT */
+
+#undef  N_
+#define N_(String) (String)
 
-#undef N_
-#define N_(String)	(String)
 
 /** MISC INTERNATIONALIZATION PIECES-PARTS: ******************************/
 

src/register/splitreg.c

@@ -30,14 +30,16 @@
  * Copyright (c) 1998, 1999, 2000 Linas Vepstas
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "messages.h"
 #include "recncell.h"
 #include "splitreg.h"
 #include "table-allgui.h"
 #include "textcell.h"
+#include "messages.h"
 #include "util.h"
 
 /* This static indicates the debugging module that this .o belongs to.  */

src/register/table-gnome.h

@@ -30,6 +30,8 @@
 #ifndef __XACC_TABLE_GNOME_H__
 #define __XACC_TABLE_GNOME_H__
 
+#include "config.h"
+
 #include <gnome.h>
 
 #include "gnc-common.h"