From d1fb4e7c0a2d4eeffb26b191f7976d912be0f061 Mon Sep 17 00:00:00 2001 From: ale <ale@incal.net> Date: Mon, 14 Oct 2013 08:33:02 +0000 Subject: [PATCH] link libsodium in mod_sso --- Makefile.defs | 3 --- configure.ac | 2 ++ src/mod_sso/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 745d689..846b52e 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -1,7 +1,4 @@ -#short_hostname := $(shell hostname | sed 's/\..*//' | tr -cd '[a-z][A-Z][0-9]') -#NACL_ABI := $(shell $(top_srcdir)/lib/nacl-20110221/printabi.debian) - AM_CPPFLAGS = \ -I$(top_srcdir)/src AM_LDFLAGS = \ diff --git a/configure.ac b/configure.ac index 7b928a8..e7d07aa 100644 --- a/configure.ac +++ b/configure.ac @@ -25,6 +25,8 @@ LIBS="$PTHREAD_LIBS $LIBS" dnl libsodium PKG_CHECK_MODULES(SODIUM, libsodium) +AC_SUBST(SODIUM_CFLAGS) +AC_SUBST(SODIUM_LIBS) CXXFLAGS="$CXXFLAGS $SODIUM_CFLAGS" LIBS="$LIBS $SODIUM_LIBS" diff --git a/src/mod_sso/Makefile.am b/src/mod_sso/Makefile.am index 2db30a3..34251d3 100644 --- a/src/mod_sso/Makefile.am +++ b/src/mod_sso/Makefile.am @@ -18,6 +18,6 @@ install-exec-local: mod_sso.la: libmod_sso.la $(APXS) -c -o $@ $< $(AM_LDFLAGS) $(APACHE_CFLAGS) \ - $(SSO_LIBS) $(NACL_LIBS) -lstdc++ + $(SSO_LIBS) $(SODIUM_LIBS) -lstdc++ -- GitLab