diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/Makefile.am | 2 | ||||
| -rw-r--r-- | common/sysutils.c | 2 | ||||
| -rw-r--r-- | common/t-timestuff.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index 87d68208e..6b410624a 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -191,7 +191,7 @@ endif t_common_cflags = $(KSBA_CFLAGS) $(LIBGCRYPT_CFLAGS) \ $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) -t_common_ldadd = libcommon.a ../gl/libgnu.a \ +t_common_ldadd = libcommon.a \ $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \ $(LIBINTL) $(LIBICONV) diff --git a/common/sysutils.c b/common/sysutils.c index afb12edfd..858cb6500 100644 --- a/common/sysutils.c +++ b/common/sysutils.c @@ -69,8 +69,6 @@ #include <assuan.h> -#include "setenv.h" /* Gnulib replacement. */ - #include "util.h" #include "i18n.h" diff --git a/common/t-timestuff.c b/common/t-timestuff.c index f39e3089d..8059a875a 100644 --- a/common/t-timestuff.c +++ b/common/t-timestuff.c @@ -158,7 +158,11 @@ main (int argc, char **argv) UTC in this case so that the 20380118T235959 test does not fail for other timezones. */ #ifndef HAVE_TIMEGM +# ifdef HAVE_SETENV setenv ("TZ", "UTC", 1); +#else + putenv (xstrdup ("TZ=UTC")); +#endif tzset (); #endif |