Force en_US locale for certain tests. --- a/libs/maildrop/Makefile.am +++ b/libs/maildrop/Makefile.am @@ -81,32 +81,40 @@ $(MAKE) run-testsuite3 run-testsuite: testsuite +if HAS_EN_US VALGRIND="`which valgrind 2>/dev/null`"; export VALGRIND; \ @SHELL@ ./testsuite >testsuite.diff || exit 1; \ sed '/^Message envelope sender/d' testsuite.diff diff -U 3 $(srcdir)/testsuite.mailbot.txt testsuite.diff rm -f mailbot.tst testsuite.diff +endif run-testsuite3: ./testsuite3 +if HAS_EN_US VALGRIND="`which valgrind 2>/dev/null`"; \ test -n "$$VALGRIND" || exit 0;\ $$VALGRIND --tool=memcheck --error-exitcode=1 \ --leak-check=yes \ --child-silent-after-fork=yes \ ./testsuite3 +endif noinst_DATA=maildrop.html maildrop.1 maildropfilter.html maildropfilter.7 \ maildropgdbm.html maildropgdbm.7 --- maildrop-3.0.0/libs/maildrop/configure.ac +++ maildrop-3.0.0/libs/maildrop/configure.ac @@ -161,6 +161,15 @@ AC_DEFINE_UNQUOTED(MAXLONGSIZE, $MAXLONGSIZE, [ Maximum character size of a long ]) +dnl check for en_US locale +check_en_US() { + locale -a | grep en_US.utf8 > /dev/null + return $? +} +AC_MSG_CHECKING([for en_US.utf8]) +AM_CONDITIONAL([HAS_EN_US], [check_en_US]) +AM_COND_IF([HAS_EN_US],[AC_MSG_RESULT([yes])],[AC_MSG_RESULT([not found])]) + dnl Checks for library functions. AC_FUNC_CLOSEDIR_VOID --- a/libs/rfc2045/Makefile.am +++ b/libs/rfc2045/Makefile.am @@ -83,6 +83,7 @@ endif check-am: +if HAS_EN_US @SHELL@ $(srcdir)/testsuite | diff -U 3 $(srcdir)/testsuite.txt.idn - @SHELL@ $(srcdir)/testsuitemm | diff -U 3 $(srcdir)/testsuitemm.txt - @SHELL@ $(srcdir)/testrfc3676parsersuite | diff -U 3 $(srcdir)/testrfc3676parsersuite.txt - @@ -93,3 +94,4 @@ valgrind --tool=memcheck --leak-check=yes --error-exitcode=1 ./testrfc6533parser ; \ valgrind --tool=memcheck --leak-check=yes --error-exitcode=1 ./testsuitecpp ; \ valgrind --tool=memcheck --leak-check=yes --error-exitcode=1 ./testsuitecpp2 +endif --- maildrop-3.0.0/libs/rfc2045/configure.ac +++ maildrop-3.0.0/libs/rfc2045/configure.ac @@ -59,6 +59,15 @@ dnl Checks for library functions. AC_CHECK_FUNCS(setlocale) +dnl check for en_US locale +check_en_US() { + locale -a | grep en_US.utf8 > /dev/null + return $? +} +AC_MSG_CHECKING([for en_US.utf8]) +AM_CONDITIONAL([HAS_EN_US], [check_en_US]) +AM_COND_IF([HAS_EN_US],[AC_MSG_RESULT([yes])],[AC_MSG_RESULT([not found])]) + AC_ARG_WITH(package, [], package="$withval", [ package="$PACKAGE"