|
 |
d64f60 |
commit de853e15543f6488cf71833e62f66abf2da3d628
|
|
|
d64f60 |
Author: John Dennis <jdennis@redhat.com>
|
|
|
d64f60 |
Date: Thu Sep 28 16:28:55 2017 -0400
|
|
|
d64f60 |
|
|
|
d64f60 |
Add user_guide to distribution, use AC_DEFINE instead of CFLAGS
|
|
|
d64f60 |
|
|
|
d64f60 |
This patch corrects a few minor autotool issues.
|
|
|
d64f60 |
|
|
|
d64f60 |
The user_guide was recently added but that commit failed to include
|
|
|
d64f60 |
adding the new documentation to the tarball, Makefile.in was augmented
|
|
|
d64f60 |
to include the new files to the list of distribution files.
|
|
|
d64f60 |
|
|
|
d64f60 |
Formerly the #defines generated by configure were passed to the
|
|
|
d64f60 |
compiler on the command line in various CFLAGS values. Although that
|
|
|
d64f60 |
works the more -Dxxx that configure generates the longer the compile
|
|
|
d64f60 |
command becomes and it starts to get unreadable and possibly exceed
|
|
|
d64f60 |
command line length. A more common practice with autotools is to
|
|
|
d64f60 |
employ autoheader whereby configure generates a file typically called
|
|
|
d64f60 |
config.h which then is included by the C files. The contents of
|
|
|
d64f60 |
config.h contains the #defines as generated by configure. configure.ac
|
|
|
d64f60 |
was updated to utilize the AC_DEFINE in lieu of adding -Dxxx to CFLAGS
|
|
|
d64f60 |
and to generate and output config.h.
|
|
|
d64f60 |
|
|
|
d64f60 |
Note: autogen.sh needs to be re-run to pick up these changes so that
|
|
|
d64f60 |
the configure included in the tarball contains the updated version.
|
|
|
d64f60 |
|
|
|
d64f60 |
Signed-off-by: John Dennis <jdennis@redhat.com>
|
|
|
d64f60 |
|
|
|
d64f60 |
diff --git a/Makefile.in b/Makefile.in
|
|
|
d64f60 |
index 3656bec..2934d25 100644
|
|
|
d64f60 |
--- a/Makefile.in
|
|
|
d64f60 |
+++ b/Makefile.in
|
|
|
d64f60 |
@@ -1,4 +1,3 @@
|
|
|
d64f60 |
-
|
|
|
d64f60 |
# Source files. mod_auth_mellon.c must be the first file.
|
|
|
d64f60 |
SRC=mod_auth_mellon.c \
|
|
|
d64f60 |
auth_mellon_cache.c \
|
|
|
d64f60 |
@@ -10,6 +9,18 @@ SRC=mod_auth_mellon.c \
|
|
|
d64f60 |
auth_mellon_session.c \
|
|
|
d64f60 |
auth_mellon_httpclient.c
|
|
|
d64f60 |
|
|
|
d64f60 |
+# Documentation files
|
|
|
d64f60 |
+USER_GUIDE_FILES=\
|
|
|
d64f60 |
+ doc/user_guide/mellon_user_guide.adoc \
|
|
|
d64f60 |
+ doc/user_guide/Guardfile \
|
|
|
d64f60 |
+ doc/user_guide/README \
|
|
|
d64f60 |
+ doc/user_guide/images/chrome_SAML_Chrome_Panel.png \
|
|
|
d64f60 |
+ doc/user_guide/images/chrome_SAML_Chrome_Panel.svg \
|
|
|
d64f60 |
+ doc/user_guide/images/saml-tracer.png \
|
|
|
d64f60 |
+ doc/user_guide/images/saml-tracer.svg \
|
|
|
d64f60 |
+ doc/user_guide/images/saml-web-sso.svg
|
|
|
d64f60 |
+
|
|
|
d64f60 |
+
|
|
|
d64f60 |
# Files to include when making a .tar.gz-file for distribution
|
|
|
d64f60 |
DISTFILES=$(SRC) \
|
|
|
d64f60 |
auth_mellon.h \
|
|
|
d64f60 |
@@ -22,8 +33,8 @@ DISTFILES=$(SRC) \
|
|
|
d64f60 |
README \
|
|
|
d64f60 |
ECP.rst \
|
|
|
d64f60 |
COPYING \
|
|
|
d64f60 |
- NEWS
|
|
|
d64f60 |
-
|
|
|
d64f60 |
+ NEWS \
|
|
|
d64f60 |
+ $(USER_GUIDE_FILES)
|
|
|
d64f60 |
|
|
|
d64f60 |
all: mod_auth_mellon.la
|
|
|
d64f60 |
|
|
|
d64f60 |
diff --git a/auth_mellon.h b/auth_mellon.h
|
|
|
d64f60 |
index c3d444a..defdf28 100644
|
|
|
d64f60 |
--- a/auth_mellon.h
|
|
|
d64f60 |
+++ b/auth_mellon.h
|
|
|
d64f60 |
@@ -22,6 +22,8 @@
|
|
|
d64f60 |
#ifndef MOD_AUTH_MELLON_H
|
|
|
d64f60 |
#define MOD_AUTH_MELLON_H
|
|
|
d64f60 |
|
|
|
d64f60 |
+#include "config.h"
|
|
|
d64f60 |
+
|
|
|
d64f60 |
#include <stdbool.h>
|
|
|
d64f60 |
|
|
|
d64f60 |
#include <lasso/lasso.h>
|
|
|
d64f60 |
diff --git a/configure.ac b/configure.ac
|
|
|
d64f60 |
index ae313e0..dcee35a 100644
|
|
|
d64f60 |
--- a/configure.ac
|
|
|
d64f60 |
+++ b/configure.ac
|
|
|
d64f60 |
@@ -1,4 +1,5 @@
|
|
|
d64f60 |
AC_INIT([mod_auth_mellon],[0.13.1],[olav.morken@uninett.no])
|
|
|
d64f60 |
+AC_CONFIG_HEADERS([config.h])
|
|
|
d64f60 |
|
|
|
d64f60 |
# We require support for C99.
|
|
|
d64f60 |
AC_PROG_CC_C99
|
|
|
d64f60 |
@@ -49,7 +50,7 @@ AC_ARG_ENABLE(
|
|
|
d64f60 |
[enable_diagnostics=no])
|
|
|
d64f60 |
|
|
|
d64f60 |
AS_IF([test "x$enable_diagnostics" != xno],
|
|
|
d64f60 |
- [MELLON_CFLAGS="$MELLON_CFLAGS -DENABLE_DIAGNOSTICS"])
|
|
|
d64f60 |
+ [AC_DEFINE([ENABLE_DIAGNOSTICS],[],[build with diagnostics])])
|
|
|
d64f60 |
|
|
|
d64f60 |
# Replace any occurances of @APXS2@ with the value of $APXS2 in the Makefile.
|
|
|
d64f60 |
AC_SUBST(APXS2)
|
|
|
d64f60 |
@@ -58,13 +59,17 @@ AC_SUBST(APXS2)
|
|
|
d64f60 |
PKG_CHECK_MODULES(LASSO, lasso)
|
|
|
d64f60 |
saved_LIBS=$LIBS; LIBS="$LIBS $LASSO_LIBS";
|
|
|
d64f60 |
AC_CHECK_LIB(lasso, lasso_server_new_from_buffers,
|
|
|
d64f60 |
- LASSO_CFLAGS="$LASSO_CFLAGS -DHAVE_lasso_server_new_from_buffers")
|
|
|
d64f60 |
+ [AC_DEFINE([HAVE_lasso_server_new_from_buffers],[],
|
|
|
d64f60 |
+ [lasso library exports lasso_server_new_from_buffers])])
|
|
|
d64f60 |
AC_CHECK_LIB(lasso, lasso_server_load_metadata,
|
|
|
d64f60 |
- LASSO_CFLAGS="$LASSO_CFLAGS -DHAVE_lasso_server_load_metadata")
|
|
|
d64f60 |
+ [AC_DEFINE([HAVE_lasso_server_load_metadata],[],
|
|
|
d64f60 |
+ [lasso library exports lasso_server_load_metadata])])
|
|
|
d64f60 |
AC_CHECK_LIB(lasso, lasso_profile_set_signature_verify_hint,
|
|
|
d64f60 |
- LASSO_CFLAGS="$LASSO_CFLAGS -DHAVE_lasso_profile_set_signature_verify_hint")
|
|
|
d64f60 |
+ [AC_DEFINE([HAVE_lasso_profile_set_signature_verify_hint],[],
|
|
|
d64f60 |
+ [lasso library exports lasso_profile_set_signature_verify_hint])])
|
|
|
d64f60 |
AC_CHECK_LIB(lasso, lasso_ecp_request_new,
|
|
|
d64f60 |
- LASSO_CFLAGS="$LASSO_CFLAGS -DHAVE_ECP")
|
|
|
d64f60 |
+ [AC_DEFINE([HAVE_ECP],[],
|
|
|
d64f60 |
+ [lasso library supports ECP profile])])
|
|
|
d64f60 |
LIBS=$saved_LIBS;
|
|
|
d64f60 |
AC_SUBST(LASSO_CFLAGS)
|
|
|
d64f60 |
AC_SUBST(LASSO_LIBS)
|