diff options
Diffstat (limited to 'misc/anymeal/configure-ac.patch')
| -rw-r--r-- | misc/anymeal/configure-ac.patch | 57 |
1 files changed, 38 insertions, 19 deletions
diff --git a/misc/anymeal/configure-ac.patch b/misc/anymeal/configure-ac.patch index 772caae79a..72c02594b6 100644 --- a/misc/anymeal/configure-ac.patch +++ b/misc/anymeal/configure-ac.patch @@ -1,6 +1,6 @@ ---- anymeal-1.17/configure.ac.orig 2022-11-01 20:41:56.815000000 -0000 -+++ anymeal-1.17/configure.ac 2022-11-01 20:41:52.771000000 -0000 -@@ -15,17 +15,24 @@ +--- anymeal-1.32/configure.ac.orig 2024-08-08 16:41:07.000000000 -0000 ++++ anymeal-1.32/configure.ac 2025-04-29 18:53:44.926000000 -0000 +@@ -15,34 +15,17 @@ AC_MSG_ERROR([Could not find flex]) fi @@ -10,25 +10,44 @@ + [WINDRES=$with_windres], [WINDRES=auto]) + dnl Check for windres. --AC_CHECK_PROG(WINDRES,windres,windres,no) +-AC_CHECK_PROG([WINDRES],windres,windres,no) +if test "x$WINDRES" = "xauto"; then + AC_CHECK_PROG(WINDRES,windres,windres,no) +fi AM_CONDITIONAL([HAVE_WINDRES], [test "x$WINDRES" = "xwindres"]) - dnl Check for Googletest framework. --if test "x$GTEST" = "x"; then -- GTEST="/usr/src/googletest/googletest" +-dnl Check for Googletest source file. +-AC_ARG_WITH([gtest], +- [AC_HELP_STRING([--with-gtest=<dir>],[directory of Google Test framework])], +- [GTESTSRC="$withval"], +- [GTESTSRC="/usr/src/googletest/googletest"]) +-AC_MSG_CHECKING([Google Test source code]) +-if test -e "$GTESTSRC/src/gtest-all.cc"; then +- AC_MSG_RESULT([found]) +-else +- AC_MSG_RESULT([not found]) -fi --AS_IF([test -e "$GTEST/src/gtest-all.cc"], -- AC_SUBST(GTEST), -- AC_MSG_ERROR([Could not find $GTEST/src/gtest-all.cc])) -+dnl if test "x$GTEST" = "x"; then -+dnl GTEST="/usr/src/googletest/googletest" -+dnl fi -+dnl AS_IF([test -e "$GTEST/src/gtest-all.cc"], -+dnl AC_SUBST(GTEST), -+dnl AC_MSG_ERROR([Could not find $GTEST/src/gtest-all.cc])) - - dnl Check for recode-library. - AC_MSG_CHECKING([for recode-library]) +-AC_SUBST([GTESTSRC]) +- +-dnl Check for Googletest library. +-PKG_CHECK_MODULES([GTEST], [gtest >= 1.12.0], +- [GTESTLIB='yes'], +- [GTESTLIB='no']) +-AC_SUBST([GTEST_CFLAGS]) +-AC_SUBST([GTEST_LIBS]) +- +-dnl Enable unit tests if Googletest source or library was found. +-AM_CONDITIONAL([ENABLE_TESTS], [test -e "$GTESTSRC/src/gtest-all.cc" || test "x$GTESTLIB" = xyes]) +-AM_CONDITIONAL([GOOGLE_TEST_SRC], [test -e "$GTESTSRC/src/gtest-all.cc"]) +- + dnl Check for iconv-library. + AC_MSG_CHECKING([for iconv-library]) + AC_TRY_LINK([#include <stdbool.h> +@@ -95,6 +78,4 @@ + anymeal/locale/it/Makefile + anymeal/locale/nl/Makefile + anymeal/locale/fr/Makefile +- anymeal/locale/sl/Makefile +- tests/Makefile +- tests/fixtures/Makefile]) ++ anymeal/locale/sl/Makefile]) |