ocserv: occtl no longer builds with local protobuf-c

[Nikos Mavrogiannopoulos]

On Tue, Nov 10, 2015 at 5:46 AM, Kevin Cernekee <cernekee at gmail.com> wrote:
> When occtl's rules were split into a new Makefile.am, PROTOBUF_SOURCES
> became undefined.  I used this as a workaround:
>
> diff --git a/src/occtl/Makefile.am b/src/occtl/Makefile.am
> index b1075d4..4f03d80 100644
> --- a/src/occtl/Makefile.am
> +++ b/src/occtl/Makefile.am
> @@ -8,6 +8,12 @@ bin_PROGRAMS = occtl
>
>  COMMON_SOURCES=../common.c ../common.h
>
> +PROTOBUF_SOURCES =
> +if LOCAL_PROTOBUF_C
> +PROTOBUF_SOURCES += $(top_srcdir)/src/protobuf/protobuf-c/protobuf-c.h \
> +    $(top_srcdir)/src/protobuf/protobuf-c/protobuf-c.c
> +endif
> +
>  occtl_SOURCES = occtl.c pager.c occtl.h time.c cache.c ip-cache.c \
>      nl.c ctl.h ../ctl.pb-c.c ../ctl.pb-c.h $(CCAN_SOURCES) $(COMMON_SOURCES) \
>      print.c json.c json.h $(PROTOBUF_SOURCES)
> but I don't know if it's the right solution, because it generates
> build rules for the same file in two different Makefiles.

I'll have to check. Since we have CI server at gitlab it would also
make sense to compile with everything included to catch these things
earlier.


Vaguely related; I may need to refactor again the master branch and
move the libev support to a separate branch, as it is still incomplete
(doesn't cover the sec-mod), and I don't have time to work on that.
(I'm mostly concerned that the performance optimization may not even
worth the added dependency to libev for the work loads of a typical
VPN server).

regards,
Nikos