diff options
| -rw-r--r-- | configure.ac | 116 | ||||
| -rw-r--r-- | mk/pathnames | 2 |
2 files changed, 0 insertions, 118 deletions
diff --git a/configure.ac b/configure.ac index 7539d641..bc9e8048 100644 --- a/configure.ac +++ b/configure.ac @@ -2470,122 +2470,6 @@ AC_DEFINE_UNQUOTED([PATH_SPOOL], ["$spooldir"], [Specify location of spooler]) AC_SUBST([spooldir]) - - - -# Whether to enable *experimental* LDAP support -EXPERIMENTAL_LDAP=no -AC_ARG_WITH([experimental-ldap], - [ --with-experimental-ldap Enable experimental LDAP support], - [ - if test "x$withval" != "xno" ; then - AC_DEFINE([HAVE_LDAP], [1], - [Define if you have experimental LDAP support]) - EXPERIMENTAL_LDAP=yes - fi - ] -) -AM_CONDITIONAL([HAVE_LDAP], [test $EXPERIMENTAL_LDAP = yes]) - -# Whether to enable *experimental* MySQL support -EXPERIMENTAL_MYSQL=no -AC_ARG_WITH([experimental-mysql], - [ --with-experimental-mysql Enable experimental MySQL support], - [ - if test "x$withval" != "xno" ; then - AC_DEFINE([HAVE_MYSQL], [1], - [Define if you have experimental MySQL support]) - EXPERIMENTAL_MYSQL=yes - fi - ] -) -AM_CONDITIONAL([HAVE_MYSQL], [test $EXPERIMENTAL_MYSQL = yes]) - -# Whether to enable *experimental* PostgreSQL support -EXPERIMENTAL_POSTGRES=no -AC_ARG_WITH([experimental-postgres], - [ --with-experimental-postgres Enable experimental PostgreSQL support], - [ - if test "x$withval" != "xno" ; then - AC_DEFINE([HAVE_POSTGRES], [1], - [Define if you have experimental PostgreSQL support]) - EXPERIMENTAL_POSTGRES=yes - fi - ] -) -AM_CONDITIONAL([HAVE_POSTGRES], [test $EXPERIMENTAL_POSTGRES = yes]) - -# Whether to enable *experimental* SQLite support -EXPERIMENTAL_SQLITE=no -AC_ARG_WITH([experimental-sqlite], - [ --with-experimental-sqlite Enable experimental SQLite support], - [ - if test "x$withval" != "xno" ; then - AC_DEFINE([HAVE_SQLITE], [1], - [Define if you have experimental SQLite support]) - AC_CHECK_HEADER([sqlite3.h], - [AC_DEFINE([HAVE_SQLITE3_H], [], [if you have the <sqlite3.h> header file]) ], - [AC_MSG_ERROR([*** sqlite3.h missing - please install first or check config.log ***])] - ) - - save_LIBS="$LIBS" - saved_CPPFLAGS="$CPPFLAGS" - saved_LDFLAGS="$LDFLAGS" - AC_CHECK_LIB([sqlite3], [sqlite3_open], , - [ - dnl Check default sqlite install dir - if test -n "${need_dash_r}"; then - LDFLAGS="-L/usr/local/lib -R/usr/local/lib ${saved_LDFLAGS}" - else - LDFLAGS="-L/usr/local/lib ${saved_LDFLAGS}" - fi - CPPFLAGS="-I/usr/local/include ${saved_CPPFLAGS}" - LIBS="$LIBS -lsqlite3" - AC_TRY_LINK_FUNC([sqlite3_open], [AC_DEFINE([HAVE_LIBSQLITE3])], - [ - AC_MSG_ERROR([*** sqlite3 missing - please install first or check config.log ***]) - ] - ) - ] - ) - CPPFLAGS="$saved_CPPFLAGS" - LDFLAGS="$saved_LDFLAGS" - LIBS="$save_LIBS" - EXPERIMENTAL_SQLITE=yes - fi - ] -) -AM_CONDITIONAL([HAVE_SQLITE], [test $EXPERIMENTAL_SQLITE = yes]) - -# Whether to enable *experimental* Redis support -EXPERIMENTAL_REDIS=no -AC_ARG_WITH([experimental-redis], - [ --with-experimental-redis Enable experimental Redis support], - [ - if test "x$withval" != "xno" ; then - AC_DEFINE([HAVE_REDIS], [1], - [Define if you have experimental Redis support]) - EXPERIMENTAL_REDIS=yes - fi - ] -) -AM_CONDITIONAL([HAVE_REDIS], [test $EXPERIMENTAL_REDIS = yes]) - -# Whether to enable *experimental* Redis support -EXPERIMENTAL_SOCKETMAP=no -AC_ARG_WITH([experimental-socketmap], - [ --with-experimental-socketmap Enable experimental socketmap support], - [ - if test "x$withval" != "xno" ; then - AC_DEFINE([HAVE_SOCKETMAP], [1], - [Define if you have experimental socketmap support]) - EXPERIMENTAL_SOCKETMAP=yes - fi - ] -) -AM_CONDITIONAL([HAVE_SOCKETMAP], [test $EXPERIMENTAL_SOCKETMAP = yes]) - - dnl AC_DEFINE([_GNU_SOURCE], [], [Enable GNU Extensions]) diff --git a/mk/pathnames b/mk/pathnames index 5adc441b..b1d8986b 100644 --- a/mk/pathnames +++ b/mk/pathnames @@ -2,8 +2,6 @@ smtpd_srcdir = $(top_srcdir)/smtpd asr_srcdir = $(top_srcdir)/contrib/lib/libc/asr compat_srcdir = $(top_srcdir)/openbsd-compat regress_srcdir = $(top_srcdir)/regress/bin -filters_srcdir = $(smtpd_srcdir)/filters -backends_srcdir = $(smtpd_srcdir)/backends PATHS= -DSMTPD_CONFDIR=\"$(sysconfdir)\" \ -DPATH_CHROOT=\"$(PRIVSEP_PATH)\" \ |