mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-25 04:43:33 +00:00
150 lines
4.8 KiB
Plaintext
150 lines
4.8 KiB
Plaintext
--- configure.ac.orig 2019-04-07 07:54:18 UTC
|
|
+++ configure.ac
|
|
@@ -37,31 +37,31 @@ AC_SUBST(prefix)
|
|
|
|
# AC_PROG_CXX *before* AC_PROG_CC, otherwise configure won't error out
|
|
# when a c++ compiler is not found. Weird, huh?
|
|
-AC_PROG_CXX
|
|
-AC_PROG_CC
|
|
-AC_PROG_CC_STDC
|
|
-AC_PROG_CC_C99
|
|
+#AC_PROG_CXX
|
|
+#AC_PROG_CC
|
|
+#AC_PROG_CC_STDC
|
|
+#AC_PROG_CC_C99
|
|
AC_PROG_INSTALL
|
|
-AC_HEADER_STDC
|
|
+#AC_HEADER_STDC
|
|
|
|
extra_flags="-Wformat-security \
|
|
-Wstack-protector \
|
|
-Wstack-protector-all \
|
|
-Wno-cast-function-type"
|
|
|
|
-AX_CXX_COMPILE_STDCXX_14
|
|
-m4_ifdef([AX_COMPILER_FLAGS],[AX_COMPILER_FLAGS(,,[yes],${extra_flags})])
|
|
-AX_VALGRIND_CHECK
|
|
+#AX_CXX_COMPILE_STDCXX_14
|
|
+#m4_ifdef([AX_COMPILER_FLAGS],[AX_COMPILER_FLAGS(,,[yes],${extra_flags})])
|
|
+#AX_VALGRIND_CHECK
|
|
|
|
# for now, use AM_PROG_LIBTOOL, as we don't want to require
|
|
# a too new setup for autotools/libtool
|
|
-AM_PROG_LIBTOOL
|
|
+#AM_PROG_LIBTOOL
|
|
#LT_INIT([disable-shared])
|
|
|
|
AC_PROG_AWK
|
|
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?
|
|
# we pick some late-2012 version
|
|
-PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.32 gobject-2.0 gio-2.0)
|
|
+# PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.32 gobject-2.0 gio-2.0)
|
|
AC_SUBST(GLIB_CFLAGS)
|
|
AC_SUBST(GLIB_LIBS)
|
|
glib_version="`$PKG_CONFIG --modversion glib-2.0`"
|
|
|
|
# gmime, version 3.0 or higher
|
|
-PKG_CHECK_MODULES(GMIME,gmime-3.0)
|
|
+# PKG_CHECK_MODULES(GMIME,gmime-3.0)
|
|
AC_SUBST(GMIME_CFLAGS)
|
|
AC_SUBST(GMIME_LIBS)
|
|
gmime_version="`$PKG_CONFIG --modversion gmime-3.0`"
|
|
|
|
# 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])
|
|
AS_IF([test "x$have_json_glib" = "xyes"],[
|
|
AC_SUBST(JSON_GLIB_CFLAGS)
|
|
AC_SUBST(JSON_GLIB_LIBS)
|
|
@@ -172,21 +172,21 @@ AS_IF([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
|
|
-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"],[
|
|
- AC_MSG_ERROR([
|
|
- *** xapian could not be found; please install it
|
|
- *** e.g., in debian/ubuntu the package would be 'libxapian-dev'
|
|
- *** If you compiled it yourself, you should ensure that xapian-config
|
|
- *** is in your PATH.])],
|
|
- [xapian_version=$($XAPIAN_CONFIG --version | sed -e 's/.* //')])
|
|
-
|
|
-AS_CASE([$xapian_version],
|
|
- [1.[[4-9]].[[0-9]]*],
|
|
- [AC_DEFINE([XAPIAN_HAVE_OP_WILDCARD],[1],[Xapian::Query::OP_WILDCARD?])],
|
|
- [AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])])
|
|
-
|
|
+# 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"],[
|
|
+# AC_MSG_ERROR([
|
|
+# *** xapian could not be found; please install it
|
|
+# *** e.g., in debian/ubuntu the package would be 'libxapian-dev'
|
|
+# *** If you compiled it yourself, you should ensure that xapian-config
|
|
+# *** is in your PATH.])],
|
|
+# [xapian_version=$($XAPIAN_CONFIG --version | sed -e 's/.* //')])
|
|
+#
|
|
+#AS_CASE([$xapian_version],
|
|
+# [1.[[4-9]].[[0-9]]*],
|
|
+# [AC_DEFINE([XAPIAN_HAVE_OP_WILDCARD],[1],[Xapian::Query::OP_WILDCARD?])],
|
|
+# [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"
|
|
@@ -261,37 +261,19 @@ AC_SUBST(MU_DOC_DIR, "${prefix}/share/doc/mu")
|
|
|
|
###############################################################################
|
|
# check for pmccabe
|
|
-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_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([
|
|
Makefile
|
|
-mu/Makefile
|
|
-mu/tests/Makefile
|
|
-lib/Makefile
|
|
-lib/doxyfile
|
|
-lib/parser/Makefile
|
|
-lib/tests/Makefile
|
|
mu4e/Makefile
|
|
mu4e/mu4e-meta.el
|
|
-guile/Makefile
|
|
-guile/texi.texi
|
|
-guile/mu/Makefile
|
|
-guile/examples/Makefile
|
|
-guile/tests/Makefile
|
|
-guile/scripts/Makefile
|
|
-toys/Makefile
|
|
-toys/mug/Makefile
|
|
-toys/msg2pdf/Makefile
|
|
-man/Makefile
|
|
-m4/Makefile
|
|
-contrib/Makefile
|
|
])
|
|
AC_OUTPUT
|
|
|