pop3: Move pop3-capability.h to new lib-pop3.

diff --git a/configure.ac b/configure.ac
index ec90fce8643c17d2712ca1beac67184f08f2c31f..a92d402784d9330cc47f392799f5a08824f0b5ac 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -844,6 +844,7 @@ src/lib-fs/Makefile
 src/lib-fts/Makefile
 src/lib-http/Makefile
 src/lib-oauth2/Makefile
+src/lib-pop3/Makefile
 src/lib-imap/Makefile
 src/lib-imap-storage/Makefile
 src/lib-imap-client/Makefile

diff --git a/dovecot-config.in.in b/dovecot-config.in.in
index 21d579da8cc5004270b7b2980017848fc6b33f4c..93b79e3bbfaeff66c7fb4d51e79c217cccbd02e2 100644 (file)
--- a/dovecot-config.in.in
+++ b/dovecot-config.in.in
@@ -28,7 +28,7 @@ LIBDOVECOT_DSYNC_DEPS="@LIBDOVECOT_DSYNC@"
 LIBDOVECOT_LIBFTS_DEPS="@LIBDOVECOT_LIBFTS@"
 LIBDOVECOT_LUA_DEPS="@LIBDOVECOT_LUA@"
 
-LIBDOVECOT_INCLUDE="-I$(incdir) -I$(incdir)/src/lib -I$(incdir)/src/lib-dict -I$(incdir)/src/lib-dns -I$(incdir)/src/lib-http -I$(incdir)/src/lib-mail -I$(incdir)/src/lib-smtp -I$(incdir)/src/lib-imap -I$(incdir)/src/lib-fs -I$(incdir)/src/lib-charset -I$(incdir)/src/lib-auth -I$(incdir)/src/lib-master -I$(incdir)/src/lib-ssl-iostream -I$(incdir)/src/lib-compression -I$(incdir)/src/lib-settings -I$(incdir)/src/lib-test -I$(incdir)/src/lib-sasl -I$(incdir)/src/lib-old-stats -I$(incdir)/src/lib-dcrypt -I$(incdir)/src/lib-program-client"
+LIBDOVECOT_INCLUDE="-I$(incdir) -I$(incdir)/src/lib -I$(incdir)/src/lib-dict -I$(incdir)/src/lib-dns -I$(incdir)/src/lib-http -I$(incdir)/src/lib-mail -I$(incdir)/src/lib-smtp -I$(incdir)/src/lib-imap -I$(incdir)/src/lib-imap -I$(incdir)/src/lib-fs -I$(incdir)/src/lib-charset -I$(incdir)/src/lib-auth -I$(incdir)/src/lib-master -I$(incdir)/src/lib-ssl-iostream -I$(incdir)/src/lib-compression -I$(incdir)/src/lib-settings -I$(incdir)/src/lib-test -I$(incdir)/src/lib-sasl -I$(incdir)/src/lib-old-stats -I$(incdir)/src/lib-dcrypt -I$(incdir)/src/lib-program-client"
 LIBDOVECOT_LDA_INCLUDE="-I$(incdir)/src/lib-lda -I$(incdir)/src/lda"
 LIBDOVECOT_AUTH_INCLUDE="-I$(incdir)/src/auth"
 LIBDOVECOT_DOVEADM_INCLUDE="-I$(incdir)/src/lib-doveadm -I$(incdir)/src/doveadm"

diff --git a/src/Makefile.am b/src/Makefile.am
index ee249fdc2aaa35720ad34eb00afea01ca0395de1..e8fa97059debc8968e27c0ae2c1b14be6ba9f8ff 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,6 +23,7 @@ LIBDOVECOT_SUBDIRS = \
        lib-mail \
        lib-program-client \
        lib-smtp \
+       lib-pop3 \
        lib-imap \
        lib-imap-storage \
        lib-oauth2 \

diff --git a/src/lib-pop3/Makefile.am b/src/lib-pop3/Makefile.am
new file mode 100644 (file)
index 0000000..fc62d66
--- /dev/null
+++ b/src/lib-pop3/Makefile.am
@@ -0,0 +1,5 @@
+headers = \
+       pop3-capability.h
+
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)

diff --git a/src/pop3/pop3-capability.h b/src/lib-pop3/pop3-capability.h
similarity index 100%
rename from src/pop3/pop3-capability.h
rename to src/lib-pop3/pop3-capability.h

diff --git a/src/pop3-login/Makefile.am b/src/pop3-login/Makefile.am
index 0cba57c0d767bfdc30e6f111d004d07b6f9437cd..b3b94918e93083f3fd0252429c05462004877280 100644 (file)
--- a/src/pop3-login/Makefile.am
+++ b/src/pop3-login/Makefile.am
@@ -9,6 +9,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib-sasl \
        -I$(top_srcdir)/src/lib-master \
        -I$(top_srcdir)/src/login-common \
+       -I$(top_srcdir)/src/lib-pop3 \
        $(BINARY_CFLAGS)
 
 pop3_login_LDADD = \

diff --git a/src/pop3-login/client-authenticate.c b/src/pop3-login/client-authenticate.c
index e2158333959a02540ee2f24b4c67d52802d45445..118f65a9f450f354196df4c5f3e186f7b1f1b310 100644 (file)
--- a/src/pop3-login/client-authenticate.c
+++ b/src/pop3-login/client-authenticate.c
@@ -11,7 +11,7 @@
 #include "str.h"
 #include "str-sanitize.h"
 #include "auth-client.h"
-#include "../pop3/pop3-capability.h"
+#include "pop3-capability.h"
 #include "client.h"
 #include "client-authenticate.h"
 #include "pop3-proxy.h"

diff --git a/src/pop3/Makefile.am b/src/pop3/Makefile.am
index fe49741821c9660fe798bb12d637dd9f7d6241d3..a09d7abdef2b953417c02dc4ff1a8ea3f8a39dad 100644 (file)
--- a/src/pop3/Makefile.am
+++ b/src/pop3/Makefile.am
@@ -10,6 +10,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib-mail \
        -I$(top_srcdir)/src/lib-index \
        -I$(top_srcdir)/src/lib-storage \
+       -I$(top_srcdir)/src/lib-pop3 \
        $(BINARY_CFLAGS)
 
 pop3_LDFLAGS = -export-dynamic \
@@ -29,7 +30,6 @@ pop3_SOURCES = \
        pop3-settings.c
 
 headers = \
-       pop3-capability.h \
        pop3-client.h \
        pop3-commands.h \
        pop3-common.h \