Index: configure.in
===================================================================
RCS file: /cvs/gnome/gtk+/configure.in,v
retrieving revision 1.422
diff -u -p -r1.422 configure.in
--- configure.in	13 Jan 2005 19:37:54 -0000	1.422
+++ configure.in	13 Jan 2005 21:36:50 -0000
@@ -396,7 +396,19 @@ if test "x$enable_rebuilds" = "xyes" && 
 fi
 AC_SUBST(REBUILD)
 
-AC_CHECK_FUNCS(lstat mkstemp flockfile nl_langinfo)
+AC_CHECK_FUNCS(lstat mkstemp flockfile)
+
+# _NL_TIME_FIRST_WEEKDAY is an enum and not a define
+AC_MSG_CHECKING([for _NL_TIME_FIRST_WEEKDAY])
+AC_TRY_LINK([#include <langinfo.h>], [
+char c;
+c = *((unsigned char *)  nl_langinfo(_NL_TIME_FIRST_WEEKDAY));
+], gtk_ok=yes, gtk_ok=no)
+AC_MSG_RESULT($gtk_ok)
+if test "$gtk_ok" = "yes"; then
+  AC_DEFINE([HAVE__NL_TIME_FIRST_WEEKDAY], [1],
+	    [Define if _NL_TIME_FIRST_WEEKDAY is available])
+fi
 
 # sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable
 AC_MSG_CHECKING(for sigsetjmp)
Index: gtk/gtkcalendar.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkcalendar.c,v
retrieving revision 1.74
diff -u -p -r1.74 gtkcalendar.c
--- gtk/gtkcalendar.c	13 Jan 2005 19:37:54 -0000	1.74
+++ gtk/gtkcalendar.c	13 Jan 2005 21:36:51 -0000
@@ -34,7 +34,7 @@
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
-#ifdef HAVE_NL_LANGINFO
+#ifdef HAVE__NL_TIME_FIRST_WEEKDAY
 #include <langinfo.h>
 #endif
 #include <string.h>
@@ -706,7 +706,7 @@ gtk_calendar_init (GtkCalendar *calendar
   else if (strcmp (year_before, "calendar:MY") != 0)
     g_warning ("Whoever translated calendar:MY did so wrongly.\n");
 
-#if defined (HAVE_NL_LANGINFO) && defined (_NL_TIME_FIRST_WEEKDAY)
+#ifdef HAVE__NL_TIME_FIRST_WEEKDAY
   week_start = nl_langinfo (_NL_TIME_FIRST_WEEKDAY);
   private_data->week_start = *((unsigned char *) week_start) % 7;
 #else
