Portability: Check for struct tm.tm_gmtoff by AC_CHECK_MEMBERS

Signed-off-by: Marcela Mašláňová <mmaslano@redhat.com>

diff --git a/configure.ac b/configure.ac
index efb83e3a8569a34339099aed5c2df82d019803e6..5db7d352046359eaaf728c43d1b232698a0f2791 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -49,7 +49,7 @@ AC_TYPE_OFF_T
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_STRUCT_TM
-
+AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[#include <time.h>])
 
 dnl Checking for programs
 
@@ -204,8 +204,6 @@ AC_DEFINE(SYSLOG,1,[Using syslog for log messages.])
 
 AC_DEFINE(CAPITALIZE_FOR_PS, 1, [if you have a tm_gmtoff member in struct tm])
 
-AC_DEFINE(HAVE_TM_GMTOFF, 1, [if your OS supports a BSD-style login.conf fil])
-
 ##AC_DEFINE(LOGIN_CAP, 1, [if your OS supports BSD authentication])
 
 ##AC_DEFINE(CRON_GROUP,"crontab",[crontab])

diff --git a/src/funcs.h b/src/funcs.h
index 8ed2ba49d39dfef52b521d2a4e3ca2e1315c2b25..85a6dc0f3f7158a8415880f0b5a7e649266adcc3 100644 (file)
--- a/src/funcs.h
+++ b/src/funcs.h
@@ -80,7 +80,7 @@ FILE          *cron_popen(char *, const char *, struct passwd *);
 
 struct passwd  *pw_dup(const struct passwd *);
 
-#ifndef HAVE_TM_GMTOFF
+#ifndef HAVE_STRUCT_TM_TM_GMTOFF
 long           get_gmtoff(time_t *, struct tm *);
 #endif
 

diff --git a/src/macros.h b/src/macros.h
index 0c5eb7f220e1f06aa88c7a0969926f6f8b4fda99..fd4d9fa0de0557b5262640243068d3b1d3f6fd34 100644 (file)
--- a/src/macros.h
+++ b/src/macros.h
@@ -91,7 +91,7 @@
                         LineNumber = ln; \
                        }
 
-#ifdef HAVE_TM_GMTOFF
+#ifdef HAVE_STRUCT_TM_TM_GMTOFF
 #define        get_gmtoff(c, t)        ((t)->tm_gmtoff)
 #endif
 

diff --git a/src/misc.c b/src/misc.c
index 0706cb2826a7bf60bcd0b47788c9799f054c906c..2099c58deced51e85cc489d0bf8f1c2feec4ed7d 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -757,7 +757,7 @@ strlens(const char *last, ...) {
  *     clobbers the static storage space used by localtime() and gmtime().
  *     If the local pointer is non-NULL it *must* point to a local copy.
  */
-#ifndef HAVE_TM_GMTOFF
+#ifndef HAVE_STRUCT_TM_TM_GMTOFF
 long get_gmtoff(time_t *clock, struct tm *local)
 {
        struct tm gmt;
@@ -783,4 +783,4 @@ long get_gmtoff(time_t *clock, struct tm *local)
 
        return (offset);
 }
-#endif /* HAVE_TM_GMTOFF */
+#endif /* HAVE_STRUCT_TM_TM_GMTOFF */