diff -up gnome-applets-2.20.0/libgweather/gweather-prefs.c.nl_langinfo gnome-applets-2.20.0/libgweather/gweather-prefs.c --- gnome-applets-2.20.0/libgweather/gweather-prefs.c.nl_langinfo 2007-10-29 12:06:59.000000000 -0400 +++ gnome-applets-2.20.0/libgweather/gweather-prefs.c 2007-10-29 12:07:42.000000000 -0400 @@ -12,6 +12,8 @@ # include #endif +#include + #include #include #include @@ -57,7 +59,7 @@ static GConfEnumStringPair distance_unit static void parse_temp_string (const gchar *gconf_str, GWeatherPrefs *prefs) { gint value = 0; -#ifdef _NL_MEASUREMENT_MEASUREMENT +#ifdef HAVE__NL_MEASUREMENT_MEASUREMENT char *imperial = NULL; #endif @@ -81,7 +83,7 @@ static void parse_temp_string (const gch } } if (!prefs->temperature_unit || prefs->temperature_unit == TEMP_UNIT_DEFAULT ) { -#ifdef _NL_MEASUREMENT_MEASUREMENT +#ifdef HAVE__NL_MEASUREMENT_MEASUREMENT imperial = nl_langinfo(_NL_MEASUREMENT_MEASUREMENT); if ( imperial && imperial[0] == 2 ) { /* imperial */ @@ -95,7 +97,7 @@ static void parse_temp_string (const gch static void parse_speed_string (const gchar *gconf_str, GWeatherPrefs *prefs) { gint value = 0; -#ifdef _NL_MEASUREMENT_MEASUREMENT +#ifdef HAVE__NL_MEASUREMENT_MEASUREMENT char *imperial = NULL; #endif @@ -119,7 +121,7 @@ static void parse_speed_string (const gc } } if ( (!prefs->speed_unit) || prefs->speed_unit == SPEED_UNIT_DEFAULT ) { -#ifdef _NL_MEASUREMENT_MEASUREMENT +#ifdef HAVE__NL_MEASUREMENT_MEASUREMENT imperial = nl_langinfo(_NL_MEASUREMENT_MEASUREMENT); if ( imperial && imperial[0] == 2 ) { /* imperial */ diff -up gnome-applets-2.20.0/configure.in.nl_langinfo gnome-applets-2.20.0/configure.in --- gnome-applets-2.20.0/configure.in.nl_langinfo 2007-10-29 12:08:28.000000000 -0400 +++ gnome-applets-2.20.0/configure.in 2007-10-29 12:09:28.000000000 -0400 @@ -647,6 +647,20 @@ case $struct_tm_tm_gmtoff in esac dnl *************************************************************************** +dnl *** _NL_MEASUREMENT_MEASUREMENT is an enum and not a define *** +dnl *************************************************************************** +AC_MSG_CHECKING([for _NL_MEASUREMENT_MEASUREMENT]) +AC_TRY_LINK([#include ], [ +char c; +c = *((unsigned char *) nl_langinfo(_NL_MEASUREMENT_MEASUREMENT)); +], gtk_ok=yes, gtk_ok=no) +AC_MSG_RESULT($gtk_ok) +if test "$gtk_ok" = "yes"; then + AC_DEFINE([HAVE__NL_MEASUREMENT_MEASUREMENT], [1], + [Define if _NL_MEASUREMENT_MEASUREMENT is available]) +fi + +dnl *************************************************************************** dnl *** Honour aclocal flags *** dnl *************************************************************************** ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"