Page MenuHomeFreeBSD
Differential D26937 Diff 86597 mail/mu4e/files/patch-configure.ac

Changeset View

Standalone View

View Options

mail/mu4e/files/patch-configure.ac

--- configure.ac.orig 2019-04-07 07:54:18 UTC --- configure.ac.orig 2020-10-24 23:20:38 UTC
+++ configure.ac +++ configure.ac
@@ -37,31 +37,31 @@ AC_SUBST(prefix) @@ -37,21 +37,21 @@ AC_SUBST(prefix)
# AC_PROG_CXX *before* AC_PROG_CC, otherwise configure won't error out # AC_PROG_CXX *before* AC_PROG_CC, otherwise configure won't error out
# when a c++ compiler is not found. Weird, huh? # when a c++ compiler is not found. Weird, huh?
-AC_PROG_CXX -AC_PROG_CXX
-AC_PROG_CC -AC_PROG_CC
-AC_PROG_CC_STDC -AC_PROG_CC_STDC
-AC_PROG_CC_C99 -AC_PROG_CC_C99
+#AC_PROG_CXX +#AC_PROG_CXX
+#AC_PROG_CC +#AC_PROG_CC
+#AC_PROG_CC_STDC +#AC_PROG_CC_STDC
+#AC_PROG_CC_C99 +#AC_PROG_CC_C99
AC_PROG_INSTALL AC_PROG_INSTALL
-AC_HEADER_STDC -AC_HEADER_STDC
+#AC_HEADER_STDC +#AC_HEADER_STDC
extra_flags="-Wformat-security \ extra_flags="-Wformat-security \
-Wstack-protector \ -Wstack-protector \
-Wstack-protector-all \ -Wstack-protector-all \
-Wno-cast-function-type" -Wno-cast-function-type"
-AX_CXX_COMPILE_STDCXX_14 -AX_CXX_COMPILE_STDCXX_14
-m4_ifdef([AX_COMPILER_FLAGS],[AX_COMPILER_FLAGS(,,[yes],${extra_flags})]) -m4_ifdef([AX_COMPILER_FLAGS],[AX_COMPILER_FLAGS(,,[yes],${extra_flags})])
-AX_VALGRIND_CHECK -AX_VALGRIND_CHECK
+#AX_CXX_COMPILE_STDCXX_14 +#AX_CXX_COMPILE_STDCXX_14
+#m4_ifdef([AX_COMPILER_FLAGS],[AX_COMPILER_FLAGS(,,[yes],${extra_flags})]) +#m4_ifdef([AX_COMPILER_FLAGS],[AX_COMPILER_FLAGS(,,[yes],${extra_flags})])
+#AX_VALGRIND_CHECK +#AX_VALGRIND_CHECK
# for now, use AM_PROG_LIBTOOL, as we don't want to require LT_INIT
# a too new setup for autotools/libtool
-AM_PROG_LIBTOOL
+#AM_PROG_LIBTOOL
#LT_INIT([disable-shared])
AC_PROG_AWK @@ -138,15 +138,15 @@ AS_IF([test -z "$PKG_CONFIG"],
AC_CHECK_PROG(SORT,sort,sort) )
-AC_CHECK_HEADERS([wordexp.h])
+#AC_CHECK_HEADERS([wordexp.h])
# use the 64-bit versions
AC_SYS_LARGEFILE
@@ -150,19 +150,19 @@ AS_IF([test "x$PKG_CONFIG" = "xno"],[
# glib2? # glib2?
# we pick some late-2012 version -PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.38 gobject-2.0 gio-2.0)
-PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.32 gobject-2.0 gio-2.0) +#PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.38 gobject-2.0 gio-2.0)
+# PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.32 gobject-2.0 gio-2.0) glib_version="$($PKG_CONFIG --modversion glib-2.0)"
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
glib_version="`$PKG_CONFIG --modversion glib-2.0`"
# gmime, version 3.0 or higher # gmime, version 3.0 or higher
-PKG_CHECK_MODULES(GMIME,gmime-3.0) -PKG_CHECK_MODULES(GMIME,gmime-3.0)
+# PKG_CHECK_MODULES(GMIME,gmime-3.0) +#PKG_CHECK_MODULES(GMIME,gmime-3.0)
AC_SUBST(GMIME_CFLAGS) gmime_version="$($PKG_CONFIG --modversion gmime-3.0)"
AC_SUBST(GMIME_LIBS)
gmime_version="`$PKG_CONFIG --modversion gmime-3.0`"
# gmime, version 3.0 or higher # gmime, version 3.0 or higher
-PKG_CHECK_MODULES(JSON_GLIB,json-glib-1.0 >= 1.4,[have_json_glib=yes],[have_json_glib=no]) -PKG_CHECK_MODULES(JSON_GLIB,json-glib-1.0 >= 1.4,[have_json_glib=yes],[have_json_glib=no])
+# PKG_CHECK_MODULES(JSON_GLIB,json-glib-1.0 >= 1.4,[have_json_glib=yes],[have_json_glib=no]) +#PKG_CHECK_MODULES(JSON_GLIB,json-glib-1.0 >= 1.4,[have_json_glib=yes],[have_json_glib=no])
AS_IF([test "x$have_json_glib" = "xyes"],[ AS_IF([test "x$have_json_glib" = "xyes"],[
AC_SUBST(JSON_GLIB_CFLAGS) json_glib_version="$($PKG_CONFIG --modversion json-glib-1.0)"
AC_SUBST(JSON_GLIB_LIBS) AC_DEFINE(HAVE_JSON_GLIB,[1], [Do we support json-glib?])
@@ -172,21 +172,21 @@ AS_IF([test "x$have_json_glib" = "xyes"],[ @@ -154,35 +154,35 @@ AS_IF([test "x$have_json_glib" = "xyes"],[
AM_CONDITIONAL(HAVE_JSON_GLIB,[test "x$have_json_glib" = "xyes"]) AM_CONDITIONAL(HAVE_JSON_GLIB,[test "x$have_json_glib" = "xyes"])
# xapian checking - we need 1.4 at least # xapian checking - we need 1.4 at least
-PKG_CHECK_MODULES(XAPIAN,xapian-core >= 1.4,[
- have_xapian=yes
- xapian_version=$($PKG_CONFIG xapian-core --modversion)
- AC_SUBST(XAPIAN_CXXFLAGS,${XAPIAN_CFLAGS})
-],[
- # fall back to the xapian-config script. Not sure if there are cases where the
- # pkgconfig does not work, but xapian-config does, so keep this for now.
- AC_MSG_NOTICE([falling back to xapian-config])
-AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no) - AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no)
-AM_CONDITIONAL(HAVE_XAPIAN,test "x$XAPIAN_CONFIG" != "xno")
-AS_IF([test "x$XAPIAN_CONFIG" = "xno"],[ - AS_IF([test "x$XAPIAN_CONFIG" = "xno"],[
- AC_MSG_ERROR([ - AC_MSG_ERROR([
- *** xapian could not be found; please install it - *** xapian could not be found; please install it
- *** e.g., in debian/ubuntu the package would be 'libxapian-dev' - *** e.g., in debian/ubuntu the package would be 'libxapian-dev'
- *** If you compiled it yourself, you should ensure that xapian-config - *** If you compiled it yourself, you should ensure that xapian-config
- *** is in your PATH.])], - *** is in your PATH.])],
- [xapian_version=$($XAPIAN_CONFIG --version | sed -e 's/.* //')]) - [xapian_version=$($XAPIAN_CONFIG --version | sed -e 's/.* //')])
- -
-AS_CASE([$xapian_version], - AS_CASE([$xapian_version],
- [1.[[4-9]].[[0-9]]*], - [1.[[4-9]].[[0-9]]*],
- [AC_DEFINE([XAPIAN_HAVE_OP_WILDCARD],[1],[Xapian::Query::OP_WILDCARD?])], - [AC_MSG_NOTICE([xapian $xapian_version found.])],
- [AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])]) - [AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])])
- -
- XAPIAN_CXXFLAGS="$($XAPIAN_CONFIG --cxxflags)"
- XAPIAN_LIBS="$($XAPIAN_CONFIG --libs)"
- have_xapian="yes"
-
- AC_SUBST(XAPIAN_CXXFLAGS)
- AC_SUBST(XAPIAN_LIBS)
-])
+#PKG_CHECK_MODULES(XAPIAN,xapian-core >= 1.4,[
+# have_xapian=yes
+# xapian_version=$($PKG_CONFIG xapian-core --modversion)
+# AC_SUBST(XAPIAN_CXXFLAGS,${XAPIAN_CFLAGS})
+#],[
+# # fall back to the xapian-config script. Not sure if there are cases where the
+# # pkgconfig does not work, but xapian-config does, so keep this for now.
+# AC_MSG_NOTICE([falling back to xapian-config])
+# AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no) +# AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no)
+# AM_CONDITIONAL(HAVE_XAPIAN,test "x$XAPIAN_CONFIG" != "xno")
+# AS_IF([test "x$XAPIAN_CONFIG" = "xno"],[ +# AS_IF([test "x$XAPIAN_CONFIG" = "xno"],[
+# AC_MSG_ERROR([ +# AC_MSG_ERROR([
+# *** xapian could not be found; please install it +# *** xapian could not be found; please install it
+# *** e.g., in debian/ubuntu the package would be 'libxapian-dev' +# *** e.g., in debian/ubuntu the package would be 'libxapian-dev'
+# *** If you compiled it yourself, you should ensure that xapian-config +# *** If you compiled it yourself, you should ensure that xapian-config
+# *** is in your PATH.])], +# *** is in your PATH.])],
+# [xapian_version=$($XAPIAN_CONFIG --version | sed -e 's/.* //')]) +# [xapian_version=$($XAPIAN_CONFIG --version | sed -e 's/.* //')])
+# +#
+#AS_CASE([$xapian_version], +# AS_CASE([$xapian_version],
+# [1.[[4-9]].[[0-9]]*], +# [1.[[4-9]].[[0-9]]*],
+# [AC_DEFINE([XAPIAN_HAVE_OP_WILDCARD],[1],[Xapian::Query::OP_WILDCARD?])], +# [AC_MSG_NOTICE([xapian $xapian_version found.])],
+# [AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])]) +# [AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])])
+# +#
XAPIAN_CXXFLAGS="$($XAPIAN_CONFIG --cxxflags)" +# XAPIAN_CXXFLAGS="$($XAPIAN_CONFIG --cxxflags)"
XAPIAN_LIBS="$($XAPIAN_CONFIG --libs)" +# XAPIAN_LIBS="$($XAPIAN_CONFIG --libs)"
have_xapian="yes" +# have_xapian="yes"
@@ -261,37 +261,19 @@ AC_SUBST(MU_DOC_DIR, "${prefix}/share/doc/mu") +#
+# AC_SUBST(XAPIAN_CXXFLAGS)
+# AC_SUBST(XAPIAN_LIBS)
+#])
############################################################################### ###############################################################################
# check for pmccabe # we set the set the version of the MuStore (Xapian database) layout
-AC_PATH_PROG([PMCCABE],[pmccabe],[no]) # here; it will become part of the db name, so we can automatically
-AS_IF([test "x$PMCCABE" = "xno"],[ @@ -258,27 +258,8 @@ AC_SUBST(MU_DOC_DIR, "${prefix}/share/doc/mu")
- have_pmccabe="no"
- AC_MSG_WARN([
- *** Developers: you do not seem to have the pmccabe tool installed.
- *** Please install it if you want to run the automated code checks])
-],[have_pmccabe="yes"])
+#AC_PATH_PROG([PMCCABE],[pmccabe],[no])
+#AS_IF([test "x$PMCCABE" = "xno"],[
+# have_pmccabe="no"
+# AC_MSG_WARN([
+# *** Developers: you do not seem to have the pmccabe tool installed.
+# *** Please install it if you want to run the automated code checks])
+#],[have_pmccabe="yes"])
###############################################################################
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
-mu/Makefile -mu/Makefile
-mu/tests/Makefile -mu/mu-memcheck
-lib/Makefile -lib/Makefile
-lib/doxyfile -lib/doxyfile
-lib/parser/Makefile -lib/utils/Makefile
-lib/tests/Makefile -lib/query/Makefile
mu4e/Makefile mu4e/Makefile
mu4e/mu4e-meta.el mu4e/mu4e-meta.el
-guile/Makefile -guile/Makefile
-guile/texi.texi -guile/texi.texi
-guile/mu/Makefile -guile/mu/Makefile
-guile/examples/Makefile -guile/examples/Makefile
-guile/tests/Makefile -guile/tests/Makefile
-guile/scripts/Makefile -guile/scripts/Makefile
-toys/Makefile -toys/Makefile
-toys/mug/Makefile -toys/mug/Makefile
-toys/msg2pdf/Makefile
-man/Makefile -man/Makefile
-m4/Makefile -m4/Makefile
-contrib/Makefile -contrib/Makefile
-],[
- [chmod +x mu/mu-memcheck]
]) ])
AC_OUTPUT AC_OUTPUT