[balsa/gtk3] _NL_MEASUREMENT_MEASUREMENT is an enum

[Peter Bloomfield <PeterB src gnome org>]

commit 7af0592f38da8afe11099382045786031a8b1167
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Sat Sep 8 17:48:12 2012 -0400

    _NL_MEASUREMENT_MEASUREMENT is an enum
    
    	* configure.in:  _NL_MEASUREMENT_MEASUREMENT is an enum and not
    	a define.
    	* src/print-gtk.c (get_default_user_units): use
    	HAVE__NL_MEASUREMENT_MEASUREMENT.

 ChangeLog       |    7 +++++++
 configure.in    |   18 +++++++++++++++---
 src/print-gtk.c |    8 ++++----
 3 files changed, 26 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 65fafe2..62733a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-09-08  Peter Bloomfield
+
+	* configure.in:  _NL_MEASUREMENT_MEASUREMENT is an enum and not
+	a define.
+	* src/print-gtk.c (get_default_user_units): use
+	HAVE__NL_MEASUREMENT_MEASUREMENT.
+
 2012-08-10  Peter Bloomfield
 
 	* libbalsa/body.c (libbalsa_message_body_get_part_stream):
diff --git a/configure.in b/configure.in
index 1ca6f15..ef0747c 100644
--- a/configure.in
+++ b/configure.in
@@ -247,9 +247,21 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
 
 AC_PROG_INTLTOOL
 AM_GLIB_GNU_GETTEXT
-AC_CHECK_HEADER([langinfo.h],
-                [AC_DEFINE([HAVE_LANGINFO],1,[Defined for langinfo.])],
-                [])
+
+# _NL_MEASUREMENT_MEASUREMENT is an enum and not a define
+AC_MSG_CHECKING([for _NL_MEASUREMENT_MEASUREMENT])
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]],
+                                [[char c;
+                                  c = *((unsigned char *)
+                                  nl_langinfo
+                                  (_NL_MEASUREMENT_MEASUREMENT));]])],
+               [have__nl_measurement_measurement=yes],
+               [have__nl_measurement_measurement=no])
+AC_MSG_RESULT($have__nl_measurement_measurement)
+if test "$have__nl_measurement_measurement" = "yes"; then
+  AC_DEFINE([HAVE__NL_MEASUREMENT_MEASUREMENT], [1],
+	    [Define if _NL_MEASUREMENT_MEASUREMENT is available])
+fi
 
 # sendmail
 #
diff --git a/src/print-gtk.c b/src/print-gtk.c
index 8d5d064..e0554ba 100644
--- a/src/print-gtk.c
+++ b/src/print-gtk.c
@@ -35,9 +35,9 @@
 #include "balsa-print-object-decor.h"
 #include "balsa-print-object-header.h"
 
-#ifdef HAVE_LANGINFO
+#if HAVE__NL_MEASUREMENT_MEASUREMENT
 #include <langinfo.h>
-#endif
+#endif                          /* HAVE__NL_MEASUREMENT_MEASUREMENT */
 
 typedef struct {
     GtkWidget *header_font;
@@ -391,7 +391,7 @@ get_default_user_units(void)
      */
     gchar *e = _("default:mm");
   
-#if (HAVE_LANGINFO && defined(_NL_MEASUREMENT_MEASUREMENT))
+#if HAVE__NL_MEASUREMENT_MEASUREMENT
     gchar *imperial = NULL;
   
     imperial = nl_langinfo(_NL_MEASUREMENT_MEASUREMENT);
@@ -399,7 +399,7 @@ get_default_user_units(void)
 	return GTK_UNIT_INCH;  /* imperial */
     if (imperial && imperial[0] == 1 )
 	return GTK_UNIT_MM;  /* metric */
-#endif
+#endif                          /* HAVE__NL_MEASUREMENT_MEASUREMENT */
   
     if (strcmp(e, "default:inch")==0)
 	return GTK_UNIT_INCH;