Skip to content

Commit

Permalink
configure.ac: pass through db link vars to managesieve
Browse files Browse the repository at this point in the history
Should fix #2026

Thanks to Jason Tibbits for help with this patch :)
  • Loading branch information
elliefm committed May 22, 2018
1 parent 5ce6a54 commit defb2cf
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ if test "$with_mysql" != "no"; then
LIBS="${LIBS} ${MYSQL_LIBADD}"
CPPFLAGS="${MYSQL_INCADD} ${CPPFLAGS}"
AC_DEFINE(HAVE_MYSQL,[],[Build in MySQL support?])
AC_SUBST(MYSQL_LIBADD)
fi
AC_MSG_RESULT($with_mysql)

Expand Down Expand Up @@ -318,6 +319,7 @@ if test "$use_pgsql" != "no"; then
CPPFLAGS="${PGSQL_INCADD} ${CPPFLAGS}"

AC_DEFINE(HAVE_PGSQL,[],[Build in PgSQL support?])
AC_SUBST(PGSQL_LIBADD)
fi

dnl End PgSQL Detection
Expand Down Expand Up @@ -1957,6 +1959,7 @@ if test "x$use_sqlite" = xyes; then
LIBS="${LIBS} ${SQLITE_LIBADD}"
CPPFLAGS="${SQLITE_INCADD} ${CPPFLAGS}"
AC_DEFINE(HAVE_SQLITE,[],[Build in SQLite support?])
AC_SUBST(SQLITE_LIBADD)
else
AC_MSG_ERROR([SQLite required but not found])
fi
Expand Down
2 changes: 1 addition & 1 deletion perl/sieve/managesieve/Makefile.PL.in
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ WriteMakefile(
'ABSTRACT' => 'Cyrus Sieve management interface',
'VERSION_FROM' => "@top_srcdir@/perl/sieve/managesieve/managesieve.pm", # finds $VERSION
'MYEXTLIB' => '../lib/.libs/libisieve.a @top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a',
'LIBS' => ["$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@"],
'LIBS' => ["$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@ @SQLITE_LIBADD@ @MYSQL_LIBADD@ @PGSQL_LIBADD@"],
'CCFLAGS' => '@GCOV_CFLAGS@',
'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
'INC' => "-I@top_srcdir@/lib -I@top_srcdir@/perl/sieve -I@top_srcdir@/perl/sieve/lib @SASLFLAGS@ @SSL_CPPFLAGS@",
Expand Down

0 comments on commit defb2cf

Please sign in to comment.