From 9bd31998dca452615148d9e618118aee2a0d2dff Mon Sep 17 00:00:00 2001 From: oetiker Date: Sat, 13 Feb 2010 11:30:17 +0000 Subject: [PATCH] make sure we only use _NL_TIME_WEEK_1STDAY if we actually have it ... thanks kevin for the report git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@2020 a5681a0c-68f1-0310-ab6d-d61299d08faa --- configure.ac | 6 ++++++ src/rrd_graph.c | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 07231b7..d18fe9e 100644 --- a/configure.ac +++ b/configure.ac @@ -345,6 +345,12 @@ CONFIGURE_PART(Resolve Portability Issues) CHECK_FOR_WORKING_MS_ASYNC +dnl do we have nl_langinfo(_NL_TIME_WEEK_1STDAY) +AC_CHECK_FUNCS(_NL_TIME_WEEK_1STDAY, , + [AC_MSG_CHECKING([for nl_langinfo(_NL_TIME_WEEK_1STDAY) with langinfo.h]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[nl_langinfo(_NL_TIME_WEEK_1STDAY)]])],[AC_MSG_RESULT(yes) + AC_DEFINE(HAVE__NL_TIME_WEEK_1STDAY)],[AC_MSG_RESULT(no)])]) + dnl Do we need getopt_long dnl even when including our own getopt implementation diff --git a/src/rrd_graph.c b/src/rrd_graph.c index 390a66e..9e23a4a 100644 --- a/src/rrd_graph.c +++ b/src/rrd_graph.c @@ -1359,11 +1359,10 @@ int data_proc( return 0; } - static int find_first_weekday(void){ static int first_weekday = -1; if (first_weekday == -1){ -#if defined(HAVE_NL_LANGINFO) +#ifdef HAVE__NL_TIME_WEEK_1STDAY /* according to http://sourceware.org/ml/libc-locales/2009-q1/msg00011.html */ long week_1stday_l = (long) nl_langinfo (_NL_TIME_WEEK_1STDAY); if (week_1stday_l == 19971130) first_weekday = 0; /* Sun */ -- 2.11.0