Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated courier-imap, maildrop #30

Merged
merged 4 commits into from
Apr 23, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
added -std=c++11 flag
  • Loading branch information
mbhangui committed Apr 23, 2023
commit 082f086c04656cc00963398e62cefd4b16312993
29 changes: 17 additions & 12 deletions courier-imap-x/libs/maildrop/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ dnl Copyright 1998 - 2022 Double Precision, Inc. See COPYING for
dnl distribution information.

AC_INIT([maildrop],[3.1.4],[[email protected]])
AC_CONFIG_MACRO_DIR([m4])

>confdefs.h # Kill PACKAGE_ macros

AC_CONFIG_SRCDIR(alarm.C)
AC_CONFIG_AUX_DIR(../..)
LPATH="$PATH:/usr/local/bin"
AM_INIT_AUTOMAKE([foreign no-define])

Expand Down Expand Up @@ -204,7 +204,6 @@ AC_DEFINE_UNQUOTED(MAXLONGSIZE, $MAXLONGSIZE,
dnl Checks for library functions.

AC_FUNC_CLOSEDIR_VOID

AC_CHECK_FUNCS(setgroups setlocale)

AC_CHECK_FUNC(getpgrp, HAS_GETPGRP=1, HAS_GETPGRP=0)
Expand Down Expand Up @@ -294,6 +293,14 @@ fi
AC_DEFINE_UNQUOTED(DEFAULT_PATH,"$maildrop_cv_SYS_DEFAULT_PATH",
[ Default value of the PATH variable ])

### use option --enable-indimail to compile in the INDIMAIL support
AC_ARG_ENABLE(indimail,
[ --enable-indimail compile in INDIMAIL protocol support],
[with_INDIMAIL=$enableval],
[with_INDIMAIL=no])
test "$with_INDIMAIL" = "yes" && AC_DEFINE(INDIMAIL,1,Define if you want INDIMAIL support compiled in)
AM_CONDITIONAL(INDIMAIL, test "$with_INDIMAIL" = yes)

if test -x /var/qmail/bin/qmail-inject
then
QMAIL="/var/qmail/bin/qmail-inject"
Expand Down Expand Up @@ -462,9 +469,9 @@ done

# Not found, possibly qmail $HOME/Mailbox

if test "$QMAIL" != ""
if test "$QMAIL" != "" -o "$with_INDIMAIL" != ""
then
SPOOLDIR="./Mailbox"
SPOOLDIR="./Maildir/"
else
AC_MSG_ERROR(Cannot determine default mailbox)
fi
Expand All @@ -479,10 +486,10 @@ check_spooldir() {
fi
}

AC_CACHE_CHECK(location of system mailboxes,maildrop_cv_SYS_INSTALL_MBOXDIR,
check_spooldir
maildrop_cv_SYS_INSTALL_MBOXDIR="$MBOX_DIR"
)
if test "$with_INDIMAIL" != "yes"
then
AC_CACHE_CHECK(location of system mailboxes,maildrop_cv_SYS_INSTALL_MBOXDIR, check_spooldir maildrop_cv_SYS_INSTALL_MBOXDIR="$MBOX_DIR")
fi

AC_CACHE_CHECK(whether maildrop should reset its group ID,maildrop_cv_SYS_INSTALL_RESET_GID,
check_spooldir
Expand Down Expand Up @@ -694,12 +701,10 @@ y*|Y*|1*)
;;
esac



AC_SUBST(VERSION)

CFLAGS="$CFLAGS -I$srcdir/../rfc822 -I$srcdir/../rfc2045 -I.. -I$srcdir/.. -I ../.. -I$srcdir/../.."
CXXFLAGS="$CXXFLAGS -I$srcdir/../rfc822 -I$srcdir/../rfc2045 -I.. -I$srcdir/.. -I../.. -I$srcdir/../.."
CFLAGS="$CFLAGS -std=c99 -I$srcdir/../rfc822 -I$srcdir/../rfc2045 -I.. -I$srcdir/.. -I ../.. -I$srcdir/../.."
CXXFLAGS="$CXXFLAGS -std=c++11 -I$srcdir/../rfc822 -I$srcdir/../rfc2045 -I.. -I$srcdir/.. -I../.. -I$srcdir/../.."

AC_ARG_WITH(etcdir, [ --with-etcdir=dir Instead of /etc, use this. ],
[ withetcdir=$withval],
Expand Down