From: Scott Cantor Date: Thu, 28 Jan 2016 18:03:32 +0000 (-0500) Subject: Update library/software version. X-Git-Tag: 2.5.6~9 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=commitdiff_plain;h=1fe0319f91a3f03cf47ab1f5aade814d3cdc67dd Update library/software version. --- diff --git a/adfs/adfs.rc b/adfs/adfs.rc index 6d4d1d0..08a6392 100644 --- a/adfs/adfs.rc +++ b/adfs/adfs.rc @@ -1,117 +1,117 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,5,5,0 - PRODUCTVERSION 2,5,5,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "\0" - VALUE "CompanyName", "Shibboleth Consortium\0" - VALUE "FileDescription", "Shibboleth ADFSv1 Plugin\0" - VALUE "FileVersion", "2, 5, 5, 0\0" -#ifdef SHIBSP_LITE - VALUE "InternalName", "adfs-lite\0" -#else - VALUE "InternalName", "adfs\0" -#endif - VALUE "LegalCopyright", "Copyright © 2015 UCAID\0" - VALUE "LegalTrademarks", "\0" -#ifdef SHIBSP_LITE - VALUE "OriginalFilename", "adfs-lite.so\0" -#else - VALUE "OriginalFilename", "adfs.so\0" -#endif - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Shibboleth 2.5.5\0" - VALUE "ProductVersion", "2, 5, 5, 0\0" - VALUE "SpecialBuild", "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 2,5,6,0 + PRODUCTVERSION 2,5,6,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "\0" + VALUE "CompanyName", "Shibboleth Consortium\0" + VALUE "FileDescription", "Shibboleth ADFSv1 Plugin\0" + VALUE "FileVersion", "2, 5, 6, 0\0" +#ifdef SHIBSP_LITE + VALUE "InternalName", "adfs-lite\0" +#else + VALUE "InternalName", "adfs\0" +#endif + VALUE "LegalCopyright", "Copyright © 2016 UCAID\0" + VALUE "LegalTrademarks", "\0" +#ifdef SHIBSP_LITE + VALUE "OriginalFilename", "adfs-lite.so\0" +#else + VALUE "OriginalFilename", "adfs.so\0" +#endif + VALUE "PrivateBuild", "\0" + VALUE "ProductName", "Shibboleth 2.5.6\0" + VALUE "ProductVersion", "2, 5, 6, 0\0" + VALUE "SpecialBuild", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/apache/mod_shib_13.rc b/apache/mod_shib_13.rc index 00ff027..32a28d5 100644 --- a/apache/mod_shib_13.rc +++ b/apache/mod_shib_13.rc @@ -1,109 +1,109 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,5,5,0 - PRODUCTVERSION 2,5,5,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "\0" - VALUE "CompanyName", "Shibboleth Consortium\0" - VALUE "FileDescription", "Shibboleth Apache 1.3 Module\0" - VALUE "FileVersion", "2, 5, 5, 0\0" - VALUE "InternalName", "mod_shib_13\0" - VALUE "LegalCopyright", "Copyright © 2015 UCAID\0" - VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename", "mod_shib_13.so\0" - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Shibboleth 2.5.5\0" - VALUE "ProductVersion", "2, 5, 5, 0\0" - VALUE "SpecialBuild", "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 2,5,6,0 + PRODUCTVERSION 2,5,6,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "\0" + VALUE "CompanyName", "Shibboleth Consortium\0" + VALUE "FileDescription", "Shibboleth Apache 1.3 Module\0" + VALUE "FileVersion", "2, 5, 6, 0\0" + VALUE "InternalName", "mod_shib_13\0" + VALUE "LegalCopyright", "Copyright © 2016 UCAID\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "mod_shib_13.so\0" + VALUE "PrivateBuild", "\0" + VALUE "ProductName", "Shibboleth 2.5.6\0" + VALUE "ProductVersion", "2, 5, 6, 0\0" + VALUE "SpecialBuild", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/apache/mod_shib_20.rc b/apache/mod_shib_20.rc index 32c55be..f22ea17 100644 --- a/apache/mod_shib_20.rc +++ b/apache/mod_shib_20.rc @@ -1,109 +1,109 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,5,5,0 - PRODUCTVERSION 2,5,5,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "\0" - VALUE "CompanyName", "Shibboleth Consortium\0" - VALUE "FileDescription", "Shibboleth Apache 2.0 Module\0" - VALUE "FileVersion", "2, 5, 5, 0\0" - VALUE "InternalName", "mod_shib_20\0" - VALUE "LegalCopyright", "Copyright © 2015 UCAID\0" - VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename", "mod_shib_20.so\0" - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Shibboleth 2.5.5\0" - VALUE "ProductVersion", "2, 5, 5, 0\0" - VALUE "SpecialBuild", "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 2,5,6,0 + PRODUCTVERSION 2,5,6,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "\0" + VALUE "CompanyName", "Shibboleth Consortium\0" + VALUE "FileDescription", "Shibboleth Apache 2.0 Module\0" + VALUE "FileVersion", "2, 5, 6, 0\0" + VALUE "InternalName", "mod_shib_20\0" + VALUE "LegalCopyright", "Copyright © 2016 UCAID\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "mod_shib_20.so\0" + VALUE "PrivateBuild", "\0" + VALUE "ProductName", "Shibboleth 2.5.6\0" + VALUE "ProductVersion", "2, 5, 6, 0\0" + VALUE "SpecialBuild", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/apache/mod_shib_22.rc b/apache/mod_shib_22.rc index 7680d54..b36806b 100644 --- a/apache/mod_shib_22.rc +++ b/apache/mod_shib_22.rc @@ -1,109 +1,109 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,5,5,0 - PRODUCTVERSION 2,5,5,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "\0" - VALUE "CompanyName", "Shibboleth Consortium\0" - VALUE "FileDescription", "Shibboleth Apache 2.2 Module\0" - VALUE "FileVersion", "2, 5, 5, 0\0" - VALUE "InternalName", "mod_shib_22\0" - VALUE "LegalCopyright", "Copyright © 2015 UCAID\0" - VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename", "mod_shib_22.so\0" - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Shibboleth 2.5.5\0" - VALUE "ProductVersion", "2, 5, 5, 0\0" - VALUE "SpecialBuild", "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 2,5,6,0 + PRODUCTVERSION 2,5,6,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "\0" + VALUE "CompanyName", "Shibboleth Consortium\0" + VALUE "FileDescription", "Shibboleth Apache 2.2 Module\0" + VALUE "FileVersion", "2, 5, 6, 0\0" + VALUE "InternalName", "mod_shib_22\0" + VALUE "LegalCopyright", "Copyright © 2016 UCAID\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "mod_shib_22.so\0" + VALUE "PrivateBuild", "\0" + VALUE "ProductName", "Shibboleth 2.5.6\0" + VALUE "ProductVersion", "2, 5, 6, 0\0" + VALUE "SpecialBuild", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/apache/mod_shib_24.rc b/apache/mod_shib_24.rc index d2b1f7d..1270ccc 100644 --- a/apache/mod_shib_24.rc +++ b/apache/mod_shib_24.rc @@ -1,109 +1,109 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,5,5,0 - PRODUCTVERSION 2,5,5,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "\0" - VALUE "CompanyName", "Shibboleth Consortium\0" - VALUE "FileDescription", "Shibboleth Apache 2.4 Module\0" - VALUE "FileVersion", "2, 5, 5, 0\0" - VALUE "InternalName", "mod_shib_24\0" - VALUE "LegalCopyright", "Copyright © 2015 UCAID\0" - VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename", "mod_shib_24.so\0" - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Shibboleth 2.5.5\0" - VALUE "ProductVersion", "2, 5, 5, 0\0" - VALUE "SpecialBuild", "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 2,5,6,0 + PRODUCTVERSION 2,5,6,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "\0" + VALUE "CompanyName", "Shibboleth Consortium\0" + VALUE "FileDescription", "Shibboleth Apache 2.4 Module\0" + VALUE "FileVersion", "2, 5, 6, 0\0" + VALUE "InternalName", "mod_shib_24\0" + VALUE "LegalCopyright", "Copyright © 2016 UCAID\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "mod_shib_24.so\0" + VALUE "PrivateBuild", "\0" + VALUE "ProductName", "Shibboleth 2.5.6\0" + VALUE "ProductVersion", "2, 5, 6, 0\0" + VALUE "SpecialBuild", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/config_win32.h b/config_win32.h index c4023d8..9078e33 100644 --- a/config_win32.h +++ b/config_win32.h @@ -1,163 +1,163 @@ -/** - * Licensed to the University Corporation for Advanced Internet - * Development, Inc. (UCAID) under one or more contributor license - * agreements. See the NOTICE file distributed with this work for - * additional information regarding copyright ownership. - * - * UCAID licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the - * License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific - * language governing permissions and limitations under the License. - */ - -/* config.h. Generated by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you - don't. */ -#define HAVE_DECL_STRERROR_R 0 - -/* Define to 1 if you have the declaration of `svcfd_create', and to 0 if you - don't. */ -#define HAVE_DECL_SVCFD_CREATE 1 - -/* Define to 1 if you have the declaration of `sys_errlist', and to 0 if you - don't. */ -/* #undef HAVE_DECL_SYS_ERRLIST */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DLFCN_H */ - -/* Define to 1 if you have the `gmtime_r' function. */ -/* #undef HAVE_GMTIME_R */ - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the `dmallocxx' library (-ldmallocxx). */ -/* #undef HAVE_LIBDMALLOCXX */ - -/* Define if log4shib library is used. */ -#define SHIBSP_LOG4SHIB 1 - -/* Define if log4cpp library is used. */ -/* #undef SHIBSP_LOG4CPP */ - -#include - -#if (XERCES_VERSION_MAJOR < 3) -# define SHIBSP_XERCESC_HAS_XMLBYTE_RELEASE 1 -# define SHIBSP_XERCESC_SHORT_ACCEPTNODE 1 -#endif - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* define if the compiler implements namespaces */ -#define HAVE_NAMESPACES 1 - -/* Define if you have POSIX threads libraries and header files. */ -/* #undef HAVE_PTHREAD */ - -#ifndef SHIBSP_LITE -# include -# if (_XSEC_VERSION_FULL >= 10600) -# define SHIBSP_XMLSEC_WHITELISTING 1 -# endif -#endif - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_STDINT_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the `strcasecmp' function. */ -/* #undef HAVE_STRCASECMP */ - -/* Define to 1 if you have the `strchr' function. */ -#define HAVE_STRCHR 1 - -/* Define to 1 if you have the `strdup' function. */ -#define HAVE_STRDUP 1 - -/* Define to 1 if you have the `strftime' function. */ -#define HAVE_STRFTIME 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the `strstr' function. */ -#define HAVE_STRSTR 1 - -/* Define to 1 if you have the `strtok_r' function. */ -/* #undef HAVE_STRTOK_R */ - -/* Define to 1 if the system has the type `struct rpcent'. */ -/* #undef HAVE_STRUCT_RPCENT */ - -/* Define to 1 if you have the `strerror_r' function. */ -/* #undef HAVE_STRERROR_R */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the `timegm' function. */ -/* #undef HAVE_TIMEGM */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_UNISTD_H */ - -/* Define to 1 if the system has the type `struct sockaddr_storage'. */ -#define HAVE_STRUCT_SOCKADDR_STORAGE 1 - -/* Name of package */ -#define PACKAGE "shibboleth" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "https://issues.shibboleth.net/" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "shibboleth" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "shibboleth 2.5.5" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "shibboleth-sp" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "2.5.5" - -/* Define to the necessary symbol if this constant uses a non-standard name on - your system. */ -/* #undef PTHREAD_CREATE_JOINABLE */ - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define to 1 if your declares `struct tm'. */ -/* #undef TM_IN_SYS_TIME */ - -/* Version number of package */ -#define VERSION "2.5.5" - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* Define to `unsigned' if does not define. */ -/* #undef size_t */ +/** + * Licensed to the University Corporation for Advanced Internet + * Development, Inc. (UCAID) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + * + * UCAID licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the + * License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific + * language governing permissions and limitations under the License. + */ + +/* config.h. Generated by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_R 0 + +/* Define to 1 if you have the declaration of `svcfd_create', and to 0 if you + don't. */ +#define HAVE_DECL_SVCFD_CREATE 1 + +/* Define to 1 if you have the declaration of `sys_errlist', and to 0 if you + don't. */ +/* #undef HAVE_DECL_SYS_ERRLIST */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_DLFCN_H */ + +/* Define to 1 if you have the `gmtime_r' function. */ +/* #undef HAVE_GMTIME_R */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `dmallocxx' library (-ldmallocxx). */ +/* #undef HAVE_LIBDMALLOCXX */ + +/* Define if log4shib library is used. */ +#define SHIBSP_LOG4SHIB 1 + +/* Define if log4cpp library is used. */ +/* #undef SHIBSP_LOG4CPP */ + +#include + +#if (XERCES_VERSION_MAJOR < 3) +# define SHIBSP_XERCESC_HAS_XMLBYTE_RELEASE 1 +# define SHIBSP_XERCESC_SHORT_ACCEPTNODE 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* define if the compiler implements namespaces */ +#define HAVE_NAMESPACES 1 + +/* Define if you have POSIX threads libraries and header files. */ +/* #undef HAVE_PTHREAD */ + +#ifndef SHIBSP_LITE +# include +# if (_XSEC_VERSION_FULL >= 10600) +# define SHIBSP_XMLSEC_WHITELISTING 1 +# endif +#endif + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_STDINT_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strcasecmp' function. */ +/* #undef HAVE_STRCASECMP */ + +/* Define to 1 if you have the `strchr' function. */ +#define HAVE_STRCHR 1 + +/* Define to 1 if you have the `strdup' function. */ +#define HAVE_STRDUP 1 + +/* Define to 1 if you have the `strftime' function. */ +#define HAVE_STRFTIME 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strstr' function. */ +#define HAVE_STRSTR 1 + +/* Define to 1 if you have the `strtok_r' function. */ +/* #undef HAVE_STRTOK_R */ + +/* Define to 1 if the system has the type `struct rpcent'. */ +/* #undef HAVE_STRUCT_RPCENT */ + +/* Define to 1 if you have the `strerror_r' function. */ +/* #undef HAVE_STRERROR_R */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the `timegm' function. */ +/* #undef HAVE_TIMEGM */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_UNISTD_H */ + +/* Define to 1 if the system has the type `struct sockaddr_storage'. */ +#define HAVE_STRUCT_SOCKADDR_STORAGE 1 + +/* Name of package */ +#define PACKAGE "shibboleth" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://issues.shibboleth.net/" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "shibboleth" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "shibboleth 2.5.6" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "shibboleth-sp" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "2.5.6" + +/* Define to the necessary symbol if this constant uses a non-standard name on + your system. */ +/* #undef PTHREAD_CREATE_JOINABLE */ + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define to 1 if your declares `struct tm'. */ +/* #undef TM_IN_SYS_TIME */ + +/* Version number of package */ +#define VERSION "2.5.6" + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `unsigned' if does not define. */ +/* #undef size_t */ diff --git a/configure.ac b/configure.ac index 44598d5..ae51a66 100644 --- a/configure.ac +++ b/configure.ac @@ -1,1381 +1,1381 @@ -AC_PREREQ([2.50]) -AC_INIT([shibboleth],[2.5.5],[https://issues.shibboleth.net/],[shibboleth-sp]) -AC_CONFIG_SRCDIR(shibsp) -AC_CONFIG_AUX_DIR(build-aux) -AC_CONFIG_MACRO_DIR(m4) -AM_INIT_AUTOMAKE -AC_DISABLE_STATIC -AC_PROG_LIBTOOL - -# Docygen features -DX_HTML_FEATURE(ON) -DX_CHM_FEATURE(OFF) -DX_CHI_FEATURE(OFF) -DX_MAN_FEATURE(OFF) -DX_RTF_FEATURE(OFF) -DX_XML_FEATURE(OFF) -DX_PDF_FEATURE(OFF) -DX_PS_FEATURE(OFF) -DX_INIT_DOXYGEN(shibboleth, doxygen.cfg, doc/api) -DX_INCLUDE= - -AC_ARG_ENABLE(debug, - AS_HELP_STRING([--enable-debug],[Have GCC compile with symbols (Default = no)]), - enable_debug=$enableval, enable_debug=no) - -if test "$enable_debug" = "yes" ; then - GCC_CFLAGS="$CFLAGS -g -D_DEBUG" - GCC_CXXFLAGS="$CXXFLAGS -g -D_DEBUG" -else - GCC_CFLAGS="$CFLAGS -O2 -DNDEBUG" - GCC_CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG" -fi - -AC_CONFIG_HEADERS([config.h shibsp/config_pub.h]) -AC_CONFIG_FILES([shibboleth.spec]) - -AC_PROG_CC([gcc gcc3 cc]) -AC_PROG_CXX([g++ g++3 c++ CC]) -AC_CANONICAL_HOST - -if test "$GCC" = "yes" ; then -# AC_HAVE_GCC_VERSION(4,0,0,0, -# [ -# AC_DEFINE(GCC_HASCLASSVISIBILITY,1, -# [Define to enable class visibility control in gcc.]) -# GCC_CFLAGS="$GCC_CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden" -# GCC_CXXFLAGS="$GCC_CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden" -# ]) - CFLAGS="-Wall $GCC_CFLAGS" - CXXFLAGS="-Wall $GCC_CXXFLAGS" -fi - -# Fix for Sun Workshop compiler in debug mode, may be Sun case #6360993 -# Also enables POSIX semantics for some functions. -case "${host_cpu}-${host_os}" in - *solaris*) - CFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS" - CXXFLAGS="$CXXFLAGS -D_POSIX_PTHREAD_SEMANTICS" - if test "$CXX" = "CC" ; then - CXXFLAGS="$CXXFLAGS -Qoption ccfe -stabs=no%dfltlit+no%dflthlp" - fi - ;; - *osf*) - CXXFLAGS="$CXXFLAGS -D_POSIX_PII_SOCKET" - ;; -esac - -AC_LANG(C) - -# Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_TYPE_SIZE_T -AC_STRUCT_TM - -# Checks for library functions. -AC_FUNC_STRFTIME -AC_FUNC_STRERROR_R -AC_CHECK_HEADERS([sys/utsname.h grp.h pwd.h]) -AC_CHECK_HEADERS([sys/socket.h], [AC_DEFINE([SHIBSP_HAVE_SYS_SOCKET_H],[1],[Define to 1 if you have the header file.])], []) -AC_CHECK_FUNCS([strchr strdup strstr timegm gmtime_r localtime_r strtok_r strcasecmp getpwnam getgrnam initgroups]) -AC_CHECK_TYPES([struct sockaddr_storage], [], [], [[#include ]]) -AC_CHECK_MEMBERS([struct sockaddr.sa_len], [], [], [[#include ]]) - -AC_CACHE_CHECK([for SOCK_CLOEXEC support], [shib_cv_sock_cloexec], -[AC_TRY_RUN([ -#include -#include -int main() -{ -return socket(AF_INET, SOCK_STREAM|SOCK_CLOEXEC, 0) == -1; -}], [shib_cv_sock_cloexec=yes], [shib_cv_sock_cloexec=no], [shib_cv_sock_cloexec=no])]) - -if test "$shib_cv_sock_cloexec" = "yes"; then - AC_DEFINE([HAVE_SOCK_CLOEXEC], 1, [Define if the SOCK_CLOEXEC flag is supported]) -fi - -# checks for pthreads -ACX_PTHREAD([enable_threads="pthread"],[enable_threads="no"]) -if test $enable_threads != "pthread"; then - AC_MSG_ERROR([unable to find pthreads, currently this is required]) -else - AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.]) - LIBS="$PTHREAD_LIBS $LIBS" - CFLAGS="$PTHREAD_CFLAGS $CFLAGS" - CXXFLAGS="$PTHREAD_CFLAGS $CXXFLAGS" -fi - -# OpenSSL settings -AC_ARG_WITH(openssl, - AS_HELP_STRING([--with-openssl=PATH],[where openssl is installed]), - [if test x_$with_openssl != x_/usr; then - SSLFLAGS="-I${with_openssl}/include" - fi]) - -if test "x$with_openssl" = "x" ; then - AC_PATH_PROG(PKG_CONFIG, pkg-config) - if test "x$PKG_CONFIG" != x && test "x$PKG_CONFIG" != "xno" ; then - if pkg-config openssl ; then - SSLFLAGS="`$PKG_CONFIG --cflags openssl`" - else - AC_MSG_WARN([OpenSSL not supported by pkg-config, try --with-openssl instead]) - fi - fi -fi - -AC_MSG_CHECKING(for OpenSSL cflags) -AC_MSG_RESULT($SSLFLAGS) -CPPFLAGS="$SSLFLAGS $CPPFLAGS" - -AC_CHECK_HEADER([openssl/x509.h],,AC_MSG_ERROR([unable to find openssl header files])) - -AC_LANG([C++]) - -# C++ requirements -AC_CXX_NAMESPACES -AC_CXX_REQUIRE_STL - -# Boost -BOOST_REQUIRE -BOOST_BIND -BOOST_LAMBDA -BOOST_POINTER_CONTAINER -BOOST_SMART_PTR -BOOST_STRING_ALGO -BOOST_TUPLE -CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS" - -# Thank you Solaris, really. -AC_MSG_CHECKING(for ctime_r) -if test -z "$ac_cv_ctime_args"; then - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[#include ]], [[time_t clock; char buf[26]; ctime_r(&clock, buf);]])], - [ac_cv_ctime_args=2],[]) - - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[#include ]], [[time_t clock; char buf[26]; ctime_r(&clock, buf, 26);]])], - [ac_cv_ctime_args=3],[]) -fi -if test -z "$ac_cv_ctime_args"; then - AC_MSG_RESULT(no) -else - if test "$ac_cv_ctime_args" = 2; then - AC_DEFINE([HAVE_CTIME_R_2],[1],[Define if ctime_r is present with 2 parameters.]) - elif test "$ac_cv_ctime_args" = 3; then - AC_DEFINE([HAVE_CTIME_R_3],[1],[Define if ctime_r is present with 3 parameters.]) - fi - AC_MSG_RESULT([yes, and it takes $ac_cv_ctime_args arguments]) -fi - -# log4shib settings (favor this version over the log4cpp code) -AC_PATH_PROG(LOG4SHIB_CONFIG,log4shib-config) -AC_ARG_WITH(log4shib, - AS_HELP_STRING([--with-log4shib=PATH],[where log4shib-config is installed]), - [ - LOG4SHIB_CONFIG="${with_log4shib}" - if ! test -f "${LOG4SHIB_CONFIG}"; then - LOG4SHIB_CONFIG="${with_log4shib}/bin/log4shib-config" - fi - ]) -if test -f "${LOG4SHIB_CONFIG}" ; then - LIBS="`${LOG4SHIB_CONFIG} --libs` $LIBS" - CPPFLAGS="`${LOG4SHIB_CONFIG} --cflags` $CPPFLAGS" - AC_CHECK_HEADER([log4shib/CategoryStream.hh],,AC_MSG_ERROR([unable to find log4shib header files])) - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[#include -#include ]], - [[log4shib::Category::getInstance("foo").errorStream() << log4shib::eol]])], - [AC_DEFINE([SHIBSP_LOG4SHIB],[1],[Define to 1 if log4shib library is used.])], - [AC_MSG_ERROR([unable to link with log4shib])]) -else - AC_MSG_WARN([log4shib-config not found, may need to use --with-log4shib option]) - AC_MSG_WARN([will look for original log4cpp library]) - - # log4cpp settings - AC_PATH_PROG(LOG4CPP_CONFIG,log4cpp-config) - AC_ARG_WITH(log4cpp, - AS_HELP_STRING([--with-log4cpp=PATH],[where log4cpp-config is installed]), - [ - LOG4CPP_CONFIG="${with_log4cpp}" - if ! test -f "${LOG4CPP_CONFIG}"; then - LOG4CPP_CONFIG="${with_log4cpp}/bin/log4cpp-config" - fi - ]) - if test -f "${LOG4CPP_CONFIG}"; then - AC_MSG_WARN([will try to use log4cpp, note that most non-Internet2 supplied versions are not thread-safe]) - LIBS="`${LOG4CPP_CONFIG} --libs` $LIBS" - CPPFLAGS="`${LOG4CPP_CONFIG} --cflags` $CPPFLAGS" - AC_CHECK_HEADER([log4cpp/CategoryStream.hh],,AC_MSG_ERROR([unable to find log4cpp header files])) - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[#include -#include ]], - [[log4cpp::Category::getInstance("foo").errorStream() << log4cpp::eol]])], - [AC_DEFINE([SHIBSP_LOG4CPP],[1],[Define to 1 if log4cpp library is used.])], - [AC_MSG_ERROR([unable to link with log4cpp, need version 1.0 or later])]) - else - AC_MSG_ERROR([log4cpp-config not found, may need to use --with-log4cpp option]) - fi -fi - -# Xerces settings -AC_ARG_WITH(xerces, - AS_HELP_STRING([--with-xerces=PATH],[where xerces-c is installed]),, - [with_xerces=/usr]) -if test x_$with_xerces != x_/usr; then - CPPFLAGS="-I${with_xerces}/include $CPPFLAGS" - LIBS="-L${with_xerces}/lib -lxerces-c $LIBS" -else - LIBS="-lxerces-c $LIBS" -fi - -AC_CHECK_HEADER([xercesc/dom/DOM.hpp],,AC_MSG_ERROR([unable to find xerces header files])) -AC_MSG_CHECKING([Xerces version]) -AC_PREPROC_IFELSE( - [AC_LANG_PROGRAM([#include ], -[#if _XERCES_VERSION >= 20700 -int i = 0; -#else -#error version 2.7.0 or above required -#endif])], - [AC_MSG_RESULT(OK)], - [AC_MSG_FAILURE([Xerces-C v2.7.0 or higher is required, v3.x preferred])]) -AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[#include ]],[[xercesc::XMLPlatformUtils::Initialize()]])], - ,[AC_MSG_ERROR([unable to link with Xerces])]) - -AC_MSG_CHECKING([whether Xerces XMLString::release(XMLByte**) exists]) -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[#include ]], - [[using namespace XERCES_CPP_NAMESPACE; XMLByte* buf=NULL; XMLString::release(&buf);]])], - [AC_MSG_RESULT([yes])AC_DEFINE([SHIBSP_XERCESC_HAS_XMLBYTE_RELEASE],[1],[Define to 1 if Xerces XMLString includes XMLByte release.])], - [AC_MSG_RESULT([no])]) - -AC_MSG_CHECKING([whether Xerces DOMNodeFilter API returns a short]) -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[#include ]], - [[using namespace XERCES_CPP_NAMESPACE; - class Blocker : public DOMNodeFilter { - public: - short acceptNode(const DOMNode* node) const { - return FILTER_REJECT; - } - }; - static Blocker g_Blocker; - ]])], - [AC_MSG_RESULT([yes])AC_DEFINE([SHIBSP_XERCESC_SHORT_ACCEPTNODE],[1],[Define to 1 if Xerces DOMNodeFilter API returns a short.])], - [AC_MSG_RESULT([no])]) - -# XML-Security settings -AC_ARG_WITH(xmlsec, - AS_HELP_STRING([--with-xmlsec=PATH],[where xmlsec is installed]),, - [with_xmlsec=/usr]) -if test x_$with_xmlsec != x_/usr; then - CPPFLAGS="-I${with_xmlsec}/include $CPPFLAGS" - XMLSEC_LIBS="-L${with_xmlsec}/lib -lxml-security-c $XMLSEC_LIBS" -else - XMLSEC_LIBS="-lxml-security-c $XMLSEC_LIBS" -fi - -# save and append master libs -save_LIBS="$LIBS" -LIBS="$XMLSEC_LIBS $LIBS" - -AC_CHECK_HEADER([xsec/utils/XSECPlatformUtils.hpp],,AC_MSG_ERROR([unable to find XML-Security-C header files])) -AC_MSG_CHECKING([XML-Security-C version]) -AC_PREPROC_IFELSE( - [AC_LANG_PROGRAM([#include ], - [#if XSEC_VERSION_MAJOR > 1 || (XSEC_VERSION_MAJOR == 1 && XSEC_VERSION_MEDIUM > 3) -int i = 0; -#else -#error need version 1.4.0 or later -#endif])], - [AC_MSG_RESULT(OK)], - [AC_MSG_FAILURE([XML-Security-C version 1.4.0 or greater is required.])]) -AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[#include ]], - [[XSECPlatformUtils::Initialise()]])],, - [AC_MSG_ERROR([unable to link with XML-Security])]) - -AC_MSG_CHECKING([whether XML-Security-C supports white/blacklisting of algorithms]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[XSECAlgorithmMapper* mapper; mapper->whitelistAlgorithm(NULL);]])],[AC_MSG_RESULT([yes]) - AC_DEFINE([SHIBSP_XMLSEC_WHITELISTING],[1],[Define to 1 if XML-Security-C supports white/blacklisting algorithms.])],[AC_MSG_RESULT([no])]) - -# restore master libs -LIBS="$save_LIBS" - -#XML-Tooling settings -AC_ARG_WITH(xmltooling, - AS_HELP_STRING([--with-xmltooling=PATH],[where xmltooling is installed]),, - [with_xmltooling=/usr]) -if test x_$with_xmltooling != x_/usr; then - CPPFLAGS="-I${with_xmltooling}/include $CPPFLAGS" - DX_INCLUDE="${with_xmltooling}/include" - LITE_LIBS="-L${with_xmltooling}/lib -lxmltooling-lite" - XMLSEC_LIBS="-L${with_xmltooling}/lib -lxmltooling $XMLSEC_LIBS" -else - LITE_LIBS="-lxmltooling-lite" - XMLSEC_LIBS="-lxmltooling $XMLSEC_LIBS" -fi - -AC_CHECK_HEADER([xmltooling/base.h],,AC_MSG_ERROR([unable to find xmltooling header files])) - -# save and append master libs -save_LIBS="$LIBS" -LIBS="$XMLSEC_LIBS $LIBS" - -AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[#include -#include ]], - [[#if _XMLTOOLING_VERSION >= 10500 -xmltooling::XMLToolingConfig::getConfig(); -#else -#error Need XMLTooling version 1.5 or higher -#endif]])], - ,[AC_MSG_ERROR([unable to link with XMLTooling, or version was too old])]) - -# restore master libs -LIBS="$save_LIBS" - -# Establish location of xmltooling catalog. -XMLTOOLINGXMLDIR="" -if test "x$with_xmltooling" = "x" ; then - with_xmltooling="/usr" -fi -if test -f $with_xmltooling/share/xml/xmltooling/catalog.xml ; then - XMLTOOLINGXMLDIR="$with_xmltooling" -elif test -f $with_xerces/share/xml/xmltooling/catalog.xml ; then - XMLTOOLINGXMLDIR="$with_xerces" -elif test -f $with_log4shib/share/xml/xmltooling/catalog.xml ; then - XMLTOOLINGXMLDIR="$with_log4shib" -fi -if test "x$XMLTOOLINGXMLDIR" = "x" ; then - AC_MSG_ERROR([xmltooling XML catalog not found, may need to use --with-xmltooling option]) -fi -XMLTOOLINGXMLDIR="$XMLTOOLINGXMLDIR/share/xml/xmltooling" -AC_SUBST(XMLTOOLINGXMLDIR) - -# OpenSAML settings -AC_ARG_WITH(saml, - AS_HELP_STRING([--with-saml=PATH],[where opensaml is installed]),, - [with_saml=/usr]) -if test x_$with_saml != x_/usr; then - CPPFLAGS="-I${with_saml}/include $CPPFLAGS" - DX_INCLUDE="$DX_INCLUDE ${with_saml}/include" - XMLSEC_LIBS="-L${with_saml}/lib -lsaml $XMLSEC_LIBS" -else - XMLSEC_LIBS="-lsaml $XMLSEC_LIBS" -fi - -# save and append master libs -save_LIBS="$LIBS" -LIBS="$XMLSEC_LIBS $LIBS" - -AC_CHECK_HEADER([saml/saml2/metadata/Metadata.h],,AC_MSG_ERROR([unable to find OpenSAML header files])) -AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[#include -#include ]], -[[#if _OPENSAML_VERSION >= 20500 -opensaml::SAMLConfig::getConfig(); -#else -#error Need OpenSAML version 2.5 or higher -#endif]])], - ,[AC_MSG_ERROR([unable to link with OpenSAML, or version was too old]) - ]) - -# restore master libs -LIBS="$save_LIBS" - -# Establish location of opensaml catalogs. -OPENSAMLXMLDIR="" -if test "x$with_saml" = "x" ; then - with_saml="/usr" -fi -if test -f $with_saml/share/xml/opensaml/saml20-catalog.xml ; then - OPENSAMLXMLDIR="$with_saml" -elif test -f $with_xmltooling/share/xml/opensaml/saml20-catalog.xml ; then - OPENSAMLXMLDIR="$with_xmltooling" -elif test -f $with_xerces/share/xml/opensaml/saml20-catalog.xml ; then - OPENSAMLXMLDIR="$with_xerces" -elif test -f $with_log4shib/share/xml/opensaml/saml20-catalog.xml ; then - OPENSAMLXMLDIR="$with_log4shib" -fi -if test "x$OPENSAMLXMLDIR" = "x" ; then - AC_MSG_ERROR([opensaml XML catalogs not found, may need to use --with-saml option]) -fi -OPENSAMLXMLDIR="$OPENSAMLXMLDIR/share/xml/opensaml" -AC_SUBST(OPENSAMLXMLDIR) - -AC_SUBST(LITE_LIBS) -AC_SUBST(XMLSEC_LIBS) - -# output the underlying makefiles -WANT_SUBDIRS="doc schemas configs shibsp plugins shibd util" -AC_CONFIG_FILES([Makefile doc/Makefile schemas/Makefile \ - configs/Makefile shibsp/Makefile plugins/Makefile \ - shibd/Makefile util/Makefile selinux/Makefile]) - -## ADFS? -AC_CONFIG_FILES([adfs/Makefile]) -AC_ARG_ENABLE([adfs], - AS_HELP_STRING([--disable-adfs],[don't build the ADFS module]), - [adfs_enabled=$enableval], [adfs_enabled=yes]) -if test "x$adfs_enabled" = "x" ; then - adfs_enabled=yes -fi -AC_MSG_CHECKING(whether to build the ADFS module) -if test "$adfs_enabled" = "no" ; then - AC_MSG_RESULT(no) -else - AC_MSG_RESULT(yes) - WANT_SUBDIRS="$WANT_SUBDIRS adfs" -fi - -## systemd -dnl Systemd will be disabled by default and requires you to run configure with -dnl --enable-systemd to look for and enable systemd. -AC_ARG_ENABLE(systemd, - AS_HELP_STRING([--enable-systemd],[Build with systemd (Default = no)]), - [if test "x$enableval" = "x" ; then - WANT_SYSTEMD=no - else - WANT_SYSTEMD="$enableval" - fi - ],[ WANT_SYSTEMD=no ]) -AC_MSG_CHECKING(whether to build with systemd) - -AC_MSG_RESULT($WANT_SYSTEMD) -if test "$WANT_SYSTEMD" = "yes" ; then - AC_CHECK_HEADER([systemd/sd-daemon.h], [ - AC_CHECK_LIB([systemd-daemon], [sd_notify], [hassdnotify="y"])]) - AS_IF([test "x$hassdnotify=" = x], [ - AC_MSG_ERROR([Unable to find a suitable libsystemd-daemon library]) - ]) - AC_DEFINE([HAVE_SD_NOTIFY],[1],[Define to 1 if you have the sd_notify function.]) - PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon]) - AC_SUBST([SYSTEMD_CFLAGS]) - AC_SUBST([SYSTEMD_LIBS]) -fi - -# -# Build NSAPI module? -# -AC_MSG_CHECKING(for NSAPI module option) -AC_ARG_WITH(nsapi, - AS_HELP_STRING([--with-nsapi=DIR],[Build NSAPI module for Netscape/iPlanet/SunONE]), - [WANT_NSAPI=$withval],[WANT_NSAPI=no]) -AC_MSG_RESULT($WANT_NSAPI) - -if test "$WANT_NSAPI" != "no"; then - if test ! -d $WANT_NSAPI/bin ; then - AC_MSG_ERROR([Please specify the path to the root of your Netscape/iPlanet/SunONE server using --with-nsapi=DIR]) - fi - AC_MSG_CHECKING(for NSAPI include files) - if test -d $WANT_NSAPI/include ; then - NSAPI_INCLUDE=$WANT_NSAPI/include - AC_MSG_RESULT(Netscape-Enterprise 3.x style) - AC_CHECK_HEADERS([$NSAPI_INCLUDE/nsapi.h],,,[#define XP_UNIX]) - NSAPI_INCLUDE="$NSAPI_INC_DIR -I$NSAPI_INCLUDE" - fi - if test -d $WANT_NSAPI/plugins/include ; then - test -n "$NSAPI_INCLUDE" && NSAPI_INC_DIR="-I$NSAPI_INCLUDE" - NSAPI_INCLUDE="$WANT_NSAPI/plugins/include" - AC_MSG_RESULT(iPlanet 4.x / SunONE 6.x style) - AC_CHECK_HEADERS([$NSAPI_INCLUDE/nsapi.h],,,[#define XP_UNIX]) - NSAPI_INCLUDE="$NSAPI_INC_DIR -I$NSAPI_INCLUDE" - fi - if test "$NSAPI_INCLUDE" = ""; then - AC_MSG_ERROR([Please check you have nsapi.h in either $WANT_NSAPI/include or $WANT_NSAPI/plugins/include]) - fi -fi - -AC_SUBST(NSAPI_INCLUDE) - -# always output the Makefile, even if you don't use it -AC_CONFIG_FILES([nsapi_shib/Makefile]) -AM_CONDITIONAL(BUILD_NSAPI,test ! "$WANT_NSAPI" = "no") - -# add the NSAPI module to the list of wanted subdirs.. -if test ! "$WANT_NSAPI" = "no" ; then - WANT_SUBDIRS="$WANT_SUBDIRS nsapi_shib" -fi - - -# -# Build FastCGI support? -# -AC_MSG_CHECKING(for FastCGI support) -AC_ARG_WITH(fastcgi, - AS_HELP_STRING([--with-fastcgi=DIR],[Build FastCGI support]), - [WANT_FASTCGI=$withval],[WANT_FASTCGI=no]) -AC_MSG_RESULT($WANT_FASTCGI) - -if test "$WANT_FASTCGI" != "no"; then - - if test "$WANT_FASTCGI" != "yes"; then - if test x_$WANT_FASTCGI != x_/usr; then - FASTCGI_INCLUDE="-I$WANT_FASTCGI/include" - FASTCGI_LDFLAGS="-L$WANT_FASTCGI/lib" - fi - fi - - # save and append master flags - save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$FASTCGI_INCLUDE $CPPFLAGS" - - AC_CHECK_HEADER([fcgio.h],,AC_MSG_ERROR([unable to find FastCGI header files])) - FASTCGI_LIBS="-lfcgi -lfcgi++" - - # restore standard flags - CPPFLAGS="$save_CPPFLAGS" -fi - -AC_SUBST(FASTCGI_INCLUDE) -AC_SUBST(FASTCGI_LDFLAGS) -AC_SUBST(FASTCGI_LIBS) - -# always output the Makefile, even if you don't use it -AC_CONFIG_FILES([fastcgi/Makefile]) -AM_CONDITIONAL(BUILD_FASTCGI,test ! "$WANT_FASTCGI" = "no") - -if test ! "$WANT_FASTCGI" = "no" ; then - WANT_SUBDIRS="$WANT_SUBDIRS fastcgi" -fi - -# -# Build Memcached support? -# -AC_MSG_CHECKING(for Memcached support) -AC_ARG_WITH(memcached, - AS_HELP_STRING([--with-memcached=DIR],[Build Memcached support]), - [WANT_MEMCACHED=$withval],[WANT_MEMCACHED=no]) -AC_MSG_RESULT($WANT_MEMCACHED) - -if test "$WANT_MEMCACHED" != "no"; then - - if test "$WANT_MEMCACHED" != "yes"; then - if test x_$WANT_MEMCACHED != x_/usr; then - MEMCACHED_INCLUDE="-I$WANT_MEMCACHED/include" - MEMCACHED_LDFLAGS="-L$WANT_MEMCACHED/lib" - fi - fi - - # save and append master flags - save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$MEMCACHED_INCLUDE $CPPFLAGS" - - AC_CHECK_HEADER([libmemcached/memcached.h],, - AC_MSG_ERROR([unable to find Memcached header files])) - AC_CHECK_DECL([memcached_last_error_message], - [AC_DEFINE([HAVE_MEMCACHED_LAST_ERROR_MESSAGE],[1],[Define to 1 if libmemcached supports error handling function.])],, - [#include ]) - MEMCACHED_LIBS="-lmemcached" - - # restore standard flags - CPPFLAGS="$save_CPPFLAGS" -fi - -AC_SUBST(MEMCACHED_INCLUDE) -AC_SUBST(MEMCACHED_LDFLAGS) -AC_SUBST(MEMCACHED_LIBS) - -# always output the Makefile, even if you don't use it -AC_CONFIG_FILES([memcache-store/Makefile]) -AM_CONDITIONAL(BUILD_MEMCACHED,test ! "$WANT_MEMCACHED" = "no") - -if test ! "$WANT_MEMCACHED" = "no" ; then - WANT_SUBDIRS="$WANT_SUBDIRS memcache-store" -fi - - -# -# If no --enable-apache-xx specified -# find a default and fake the specific parameters -# - -# simple macro to peek at an enable or a with -AC_DEFUN([Peek], -if test "[${[$1]_][$2]+set}" = set; then - peekval="${[$1]_[$2]}" - $3 -fi; dnl -) - -AC_MSG_CHECKING(if default apache needed) -need_default=yes -Peek(enable,apache_13,need_default=no) -Peek(enable,apache_20,need_default=no) -Peek(enable,apache_22,need_default=no) -Peek(enable,apache_24,need_default=no) -AC_MSG_RESULT($need_default) - -if test "$need_default" = "yes"; then - # find an apxs, then the httpd - xs= - Peek(with,apxs,xs="$peekval") - Peek(with,apxs2,xs="$peekval") - Peek(with,apxs22,xs="$peekval") - Peek(with,apxs24,xs="$peekval") - if test "x$xs" = "x"; then - AC_PATH_PROGS(xs, apxs2 apxs, - AC_MSG_ERROR(No apxs, no Apache found. Try --with-apxs, --with-apxs2, etc.), - [/usr/local/apache2/bin:/usr/local/apache/bin:/usr/sbin:$PATH]) - fi - # ask the daemon for the version and set parameters - AC_MSG_CHECKING(default apache version) - httpd="`$xs -q SBINDIR`/`$xs -q TARGET`" - if test "x$httpd" != "x" && test -f $httpd ; then - v=`$httpd -v|$SED -n -e 's/.*Apache\/\.*//p'` - case $v in - 1.3*) [enable_apache_13]=yes - [with_apxs]=$xs - AC_MSG_RESULT(1.3) - ;; - 2.0*) [enable_apache_20]=yes - [with_apxs2]=$xs - AC_MSG_RESULT(2.0) - ;; - 2.2*) [enable_apache_22]=yes - [with_apxs22]=$xs - AC_MSG_RESULT(2.2) - ;; - 2.4*) [enable_apache_24]=yes - [with_apxs24]=$xs - AC_MSG_RESULT(2.4) - ;; - *) AC_MSG_ERROR(unusable Apache versions: $v. Try setting --with-apxs, --with=apxs2, etc.) - esac - else - AC_MSG_RESULT(cannot determine Apache version. Try setting --with-apxs, --with-apxs2, etc.) - fi -fi - -# Apache 1.3 (mod_shib_13) -# --enable-apache-13 -# --with-apxs (DSO build, the normal way, uses apxs to derive build flags) - -AC_ARG_ENABLE(apache-13, - AS_HELP_STRING([--enable-apache-13],[enable the Apache 1.3 module]), - [if test "x$enableval" = "x" ; then - WANT_APACHE_13=yes - else - WANT_APACHE_13="$enableval" - fi - ],[ WANT_APACHE_13=no ]) -AC_MSG_CHECKING(whether to build Apache 1.3 module) -if test "$WANT_APACHE_13" != yes && test "$WANT_APACHE_13" != no ; then - WANT_APACHE_13=yes -fi -AC_MSG_RESULT($WANT_APACHE_13) - -if test "$WANT_APACHE_13" = "yes" ; then - AC_ARG_WITH(apxs, - AS_HELP_STRING([--with-apxs=FILE],[Specifies where to find the Apache 1.3 apxs script.]), - [ - AC_MSG_CHECKING(for user-specified apxs name/location) - if test "$withval" != "no" ; then - if test "$withval" != "yes"; then - APXS=$withval - AC_MSG_RESULT("$withval") - fi - fi - ], - [ - AC_PATH_PROG(APXS, apxs, no) - if test "$APXS" = "no" ; then - for i in /usr/sbin /usr/local/apache/bin ; do - if test "$APXS" = "no" && test -f "$i/apxs"; then - APXS="$i/apxs" - fi - done - fi - ]) - - AC_MSG_CHECKING([to see if apxs was located]) - if test ! -f "$APXS" ; then - AC_MSG_RESULT(no) - AC_MSG_ERROR([Unable to locate apxs script. An Apache development package may be missing from your server, or you may need to use the --with-apxs option.]) - fi - AC_MSG_RESULT($APXS) - AC_SUBST(APXS) - - # extract settings we need from APXS -q - APXS_CC="`$APXS -q CC`" - APXS_CFLAGS="`$APXS -q CFLAGS` `$APXS -q CFLAGS_SHLIB`" - APXS_INCLUDE="`$APXS -q INCLUDEDIR`" -fi - -AC_SUBST(APXS_CFLAGS) -AC_SUBST(APXS_INCLUDE) - - -# Apache 2.0 (mod_shib_20) -# --enable-apache-20 -# --with-apxs2 (DSO build, the normal way, uses apxs to derive build flags) -# --with-apr (DSO build, APR development package installed separately) -# --with-apu (DSO build, APR-UTIL development package installed separately) - -AC_ARG_ENABLE(apache-20, - AS_HELP_STRING([--enable-apache-20],[enable the Apache 2.0 module]), - [if test "x$enableval" = "x" ; then - WANT_APACHE_20=yes - else - WANT_APACHE_20="$enableval" - fi - ],[ WANT_APACHE_20=no ]) -AC_MSG_CHECKING(whether to build Apache 2.0 module) -if test "$WANT_APACHE_20" != yes && test "$WANT_APACHE_20" != no ; then - WANT_APACHE_20=yes -fi -AC_MSG_RESULT($WANT_APACHE_20) - -if test "$WANT_APACHE_20" = "yes" ; then - AC_ARG_WITH(apxs2, - AS_HELP_STRING([--with-apxs2=FILE],[Specifies where to find the Apache 2.0 apxs script.]), - [ - AC_MSG_CHECKING(for user-specified Apache 2.0 apxs name/location) - if test "$withval" != "no" ; then - if test "$withval" != "yes"; then - APXS2=$withval - AC_MSG_RESULT("$withval") - fi - fi - ], - [ - AC_PATH_PROG(APXS2, apxs2, no) - if test "$APXS2" = "no" ; then - AC_PATH_PROG(APXS2, apxs, no) - fi - if test "$APXS2" = "no" ; then - for i in /usr/sbin /usr/local/apache2/bin /usr/local/apache/bin ; do - if test "$APXS2" = "no" && test -f "$i/apxs2" ; then - APXS2="$i/apxs2" - fi - done - if test "$APXS2" = "no" ; then - for i in /usr/sbin /usr/local/apache2/bin /usr/local/apache/bin ; do - if test "$APXS2" = "no" && test -f "$i/apxs" ; then - APXS2="$i/apxs" - fi - done - fi - fi - ]) - - AC_MSG_CHECKING([to see if Apache 2.0 apxs was located]) - if test ! -f "$APXS2" ; then - AC_MSG_RESULT(no) - AC_MSG_ERROR([Unable to locate Apache 2.0 apxs script. An Apache development package may be missing from your server, or you may need to use the --with-apxs2 option.]) - fi - AC_MSG_RESULT($APXS2) - AC_SUBST(APXS2) - - # APR settings - AC_ARG_WITH(apr, - AS_HELP_STRING([--with-apr=PATH],[where apr-config is installed]), - [ - AC_MSG_CHECKING(for user-specified apr-config name/location) - if test "$withval" != "no" ; then - if test "$withval" != "yes"; then - APR_CONFIG=$withval - AC_MSG_RESULT("$withval") - fi - fi - ], - [ - AC_PATH_PROG(APR_CONFIG, apr-config,,[`$APXS2 -q SBINDIR`]:[$PATH]) - ]) - if test -f "${APR_CONFIG}"; then - APR_CFLAGS="`${APR_CONFIG} --cflags` `${APR_CONFIG} --cppflags` `${APR_CONFIG} --includes`" - else - AC_MSG_ERROR([Unable to locate apr-config, may need --with-apr option.]) - fi - - # APU settings - AC_ARG_WITH(apu, - AS_HELP_STRING([--with-apu=PATH],[where apu-config is installed]), - [ - AC_MSG_CHECKING(for user-specified apu-config name/location) - if test "$withval" != "no" ; then - if test "$withval" != "yes"; then - APU_CONFIG=$withval - AC_MSG_RESULT("$withval") - fi - fi - ], - [ - AC_PATH_PROG(APU_CONFIG, apu-config,,[`$APXS2 -q SBINDIR`]:[$PATH]) - ]) - if test -f "${APU_CONFIG}"; then - APU_CFLAGS="`${APU_CONFIG} --includes`" - else - AC_MSG_ERROR([Unable to locate apu-config, may need --with-apu option.]) - fi - - # extract settings we need from APXS2 -q - APXS2_CC="`$APXS2 -q CC`" - APXS2_CFLAGS="`$APXS2 -q CPPFLAGS` `$APXS2 -q CFLAGS` $APR_CFLAGS $APU_CFLAGS" - APXS2_INCLUDE="`$APXS2 -q INCLUDEDIR`" -fi - -AC_SUBST(APXS2_CFLAGS) -AC_SUBST(APXS2_INCLUDE) - - -# Apache 2.2 (mod_shib_22) -# --enable-apache-22 -# --with-apxs22 (DSO build, the normal way, uses apxs to derive build flags) -# --with-apr1 (DSO build, APR development package installed separately) -# --with-apu1 (DSO build, APR-UTIL development package installed separately) - -AC_ARG_ENABLE(apache-22, - AS_HELP_STRING([--enable-apache-22],[enable the Apache 2.2 module]), - [if test "x$enableval" = "x" ; then - WANT_APACHE_22=yes - else - WANT_APACHE_22="$enableval" - fi - ],[ WANT_APACHE_22=no ]) -AC_MSG_CHECKING(whether to build Apache 2.2 module) -if test "$WANT_APACHE_22" != yes && test "$WANT_APACHE_22" != no ; then - WANT_APACHE_22=yes -fi -AC_MSG_RESULT($WANT_APACHE_22) - -if test "$WANT_APACHE_22" = "yes" ; then - AC_ARG_WITH(apxs22, - AS_HELP_STRING([--with-apxs22=FILE],[Specifies where to find the Apache 2.2 apxs script.]), - [ - AC_MSG_CHECKING(for user-specified Apache 2.2 apxs name/location) - if test "$withval" != "no" ; then - if test "$withval" != "yes"; then - APXS22=$withval - AC_MSG_RESULT("$withval") - fi - fi - ], - [ - AC_PATH_PROG(APXS22, apxs2, no) - if test "$APXS22" = "no" ; then - AC_PATH_PROG(APXS22, apxs, no) - fi - if test "$APXS22" = "no" ; then - for i in /usr/sbin /usr/local/apache2/bin /usr/local/apache/bin ; do - if test "$APXS22" = "no" && test -f "$i/apxs2" ; then - APXS22="$i/apxs2" - fi - done - if test "$APXS22" = "no" ; then - for i in /usr/sbin /usr/local/apache2/bin /usr/local/apache/bin ; do - if test "$APXS22" = "no" && test -f "$i/apxs" ; then - APXS22="$i/apxs" - fi - done - fi - fi - ]) - - AC_MSG_CHECKING([to see if Apache 2.2 apxs was located]) - if test ! -f "$APXS22" ; then - AC_MSG_RESULT(no) - AC_MSG_ERROR([Unable to locate Apache 2.2 apxs script. An Apache development package may be missing from your server, or you may need to use the --with-apxs22 option.]) - fi - AC_MSG_RESULT($APXS22) - AC_SUBST(APXS22) - - # APR1 settings - AC_ARG_WITH(apr1, - AS_HELP_STRING([--with-apr1=PATH],[where apr-1-config is installed]), - [ - AC_MSG_CHECKING(for user-specified apr-1-config name/location) - if test "$withval" != "no" ; then - if test "$withval" != "yes"; then - APR1_CONFIG=$withval - AC_MSG_RESULT("$withval") - fi - fi - ], - [ - AC_PATH_PROG(APR1_CONFIG, apr-1-config,,[`$APXS22 -q SBINDIR`]:[$PATH]) - ]) - if test -f "${APR1_CONFIG}"; then - APR1_CFLAGS="`${APR1_CONFIG} --cflags` `${APR1_CONFIG} --cppflags` `${APR1_CONFIG} --includes`" - else - AC_MSG_ERROR([Unable to locate apr-1-config, may need --with-apr1 option.]) - fi - - # APU1 settings - AC_ARG_WITH(apu1, - AS_HELP_STRING([--with-apu1=PATH],[where apu-1-config is installed]), - [ - AC_MSG_CHECKING(for user-specified apu-1-config name/location) - if test "$withval" != "no" ; then - if test "$withval" != "yes"; then - APU1_CONFIG=$withval - AC_MSG_RESULT("$withval") - fi - fi - ], - [ - AC_PATH_PROG(APU1_CONFIG, apu-1-config,,[`$APXS22 -q SBINDIR`]:[$PATH]) - ]) - if test -f "${APU1_CONFIG}"; then - APU1_CFLAGS="`${APU1_CONFIG} --includes`" - else - AC_MSG_ERROR([Unable to locate apu-1-config, may need --with-apu1 option.]) - fi - - # extract settings we need from APXS22 -q - APXS22_CC="`$APXS22 -q CC`" - APXS22_CFLAGS="`$APXS22 -q CPPFLAGS` `$APXS22 -q CFLAGS` $APR1_CFLAGS $APU1_CFLAGS" - APXS22_INCLUDE="`$APXS22 -q INCLUDEDIR`" -fi - -AC_SUBST(APXS22_CFLAGS) -AC_SUBST(APXS22_INCLUDE) - -# Apache 2.4 (mod_shib_24) -# --enable-apache-24 -# --with-apxs24 (DSO build, the normal way, uses apxs to derive build flags) -# --with-apr1 (DSO build, APR development package installed separately) -# --with-apu1 (DSO build, APR-UTIL development package installed separately) - -AC_ARG_ENABLE(apache-24, - AS_HELP_STRING([--enable-apache-24],[enable the Apache 2.4 module]), - [if test "x$enableval" = "x" ; then - WANT_APACHE_24=yes - else - WANT_APACHE_24="$enableval" - fi - ],[ WANT_APACHE_24=no ]) -AC_MSG_CHECKING(whether to build Apache 2.4 module) -if test "$WANT_APACHE_24" != yes && test "$WANT_APACHE_24" != no ; then - WANT_APACHE_24=yes -fi -AC_MSG_RESULT($WANT_APACHE_24) - -if test "$WANT_APACHE_24" = "yes" ; then - AC_ARG_WITH(apxs24, - AS_HELP_STRING([--with-apxs24=FILE],[Specifies where to find the Apache 2.4 apxs script.]), - [ - AC_MSG_CHECKING(for user-specified Apache 2.4 apxs name/location) - if test "$withval" != "no" ; then - if test "$withval" != "yes"; then - APXS24=$withval - AC_MSG_RESULT("$withval") - fi - fi - ], - [ - AC_PATH_PROG(APXS24, apxs2, no) - if test "$APXS24" = "no" ; then - AC_PATH_PROG(APXS24, apxs, no) - fi - if test "$APXS24" = "no" ; then - for i in /usr/sbin /usr/local/apache2/bin /usr/local/apache/bin ; do - if test "$APXS24" = "no" && test -f "$i/apxs2" ; then - APXS24="$i/apxs2" - fi - done - if test "$APXS24" = "no" ; then - for i in /usr/sbin /usr/local/apache2/bin /usr/local/apache/bin ; do - if test "$APXS24" = "no" && test -f "$i/apxs" ; then - APXS24="$i/apxs" - fi - done - fi - fi - ]) - - AC_MSG_CHECKING([to see if Apache 2.4 apxs was located]) - if test ! -f "$APXS24" ; then - AC_MSG_RESULT(no) - AC_MSG_ERROR([Unable to locate Apache 2.4 apxs script. An Apache development package may be missing from your server, or you may need to use the --with-apxs24 option.]) - fi - AC_MSG_RESULT($APXS24) - AC_SUBST(APXS24) - - # If we haven't done this work already for Apache 2.2 - if test "$WANT_APACHE_22" != "yes" ; then - # APR1 settings - AC_ARG_WITH(apr1, - AS_HELP_STRING([--with-apr1=PATH],[where apr-1-config is installed]), - [ - AC_MSG_CHECKING(for user-specified apr-1-config name/location) - if test "$withval" != "no" ; then - if test "$withval" != "yes"; then - APR1_CONFIG=$withval - AC_MSG_RESULT("$withval") - fi - fi - ], - [ - AC_PATH_PROG(APR1_CONFIG, apr-1-config,,[`$APXS24 -q SBINDIR`]:[$PATH]) - ]) - if test -f "${APR1_CONFIG}"; then - APR1_CFLAGS="`${APR1_CONFIG} --cflags` `${APR1_CONFIG} --cppflags` `${APR1_CONFIG} --includes`" - else - AC_MSG_ERROR([Unable to locate apr-1-config, may need --with-apr1 option.]) - fi - - # APU1 settings - AC_ARG_WITH(apu1, - AS_HELP_STRING([--with-apu1=PATH],[where apu-1-config is installed]), - [ - AC_MSG_CHECKING(for user-specified apu-1-config name/location) - if test "$withval" != "no" ; then - if test "$withval" != "yes"; then - APU1_CONFIG=$withval - AC_MSG_RESULT("$withval") - fi - fi - ], - [ - AC_PATH_PROG(APU1_CONFIG, apu-1-config,,[`$APXS24 -q SBINDIR`]:[$PATH]) - ]) - if test -f "${APU1_CONFIG}"; then - APU1_CFLAGS="`${APU1_CONFIG} --includes`" - else - AC_MSG_ERROR([Unable to locate apu-1-config, may need --with-apu1 option.]) - fi - fi - - # extract settings we need from APXS24 -q - APXS24_CC="`$APXS24 -q CC`" - APXS24_CFLAGS="`$APXS24 -q CPPFLAGS` `$APXS24 -q CFLAGS` $APR1_CFLAGS $APU1_CFLAGS" - APXS24_INCLUDE="`$APXS24 -q INCLUDEDIR`" -fi - -AC_SUBST(APXS24_CFLAGS) -AC_SUBST(APXS24_INCLUDE) - -# always output the Makefile, even if you don't use it -AC_CONFIG_FILES([apache/Makefile]) -AM_CONDITIONAL(BUILD_AP13,test "$WANT_APACHE_13" = "yes") -AM_CONDITIONAL(BUILD_AP20,test "$WANT_APACHE_20" = "yes") -AM_CONDITIONAL(BUILD_AP22,test "$WANT_APACHE_22" = "yes") -AM_CONDITIONAL(BUILD_AP24,test "$WANT_APACHE_24" = "yes") - -# add the apache module to the list of wanted subdirs.. -if test "$WANT_APACHE_13" = "yes" || test "$WANT_APACHE_20" = "yes" || test "$WANT_APACHE_22" = "yes" || test "$WANT_APACHE_24" = "yes" ; then - WANT_SUBDIRS="$WANT_SUBDIRS apache" -fi - - -# -# Implement the checks of the ODBC Storage Service -# -# 1) Assume the user wants ODBC; if it's not found then just continue without -# 2) If the user specifically requested odbc, look for it and ERROR if not found -# 3) If the user specifically requested no odbc, don't build it. -# - -AC_CONFIG_FILES([odbc-store/Makefile]) - -# determine whether we should enable the odbc ccache -AC_ARG_ENABLE([odbc], - AS_HELP_STRING([--disable-odbc],[disable the ODBC Storage Service]), - [odbc_enabled=$enableval], [odbc_enabled=default]) -if test "x$odbc_enabled" = "x" ; then - odbc_enabled=yes -fi - -# Are we trying to build ODBC? -AC_MSG_CHECKING(whether to build the ODBC storage service) -if test "$odbc_enabled" = "yes" ; then - build_odbc=yes - AC_MSG_RESULT(yes) -elif test "$odbc_enabled" = "default" ; then - build_odbc=yes - AC_MSG_RESULT([yes, if it can be found]) -else - build_odbc=no - AC_MSG_RESULT(no) -fi - -# If we're trying to build ODBC, try to find the odbc_config program. -if test "$build_odbc" = "yes" ; then - odbc_dir="" - AC_ARG_WITH(odbc, - AS_HELP_STRING([--with-odbc=PATH],[directory where odbc is installed]), - [if test "$with_odbc" = no ; then - AC_MSG_ERROR([Try running --disable-odbc instead.]) - elif test "$with_odbc" != yes ; then - odbc_dir="$with_odbc/bin" - if test "$with_odbc" != /usr ; then - ODBC_CFLAGS="-I$with_odbc/include" - ODBC_LIBS="-L$with_odbc/lib" - fi - fi]) - - AC_PATH_PROG(ODBC_CONFIG, odbc_config, no, $odbc_dir $PATH ) - if test "$ODBC_CONFIG" = no ; then - AC_MSG_WARN([Cannot find odbc_config, will try to guess settings.]) - ODBC_LIBS="$ODBC_LIBS -lodbc" - else - ODBC_CFLAGS=`$ODBC_CONFIG --cflags` - ODBC_LIBS=`$ODBC_CONFIG --libs` - fi - - save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $ODBC_CFLAGS" - - AC_CHECK_HEADER([sql.h], [have_sql_h=yes], [have_sql_h=no]) - if test "$have_sql_h" = no -a "$odbc_enabled" = "yes" ; then - AC_MSG_ERROR(unable to find ODBC header files) - fi - - if test "$have_sql_h" = yes ; then - save_LIBS="$LIBS" - LIBS="$LIBS $ODBC_LIBS" - AC_MSG_CHECKING(if we can link againt ODBC) - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[#include - #include - #include ]], - [[SQLSetEnvAttr(SQL_NULL_HANDLE, SQL_ATTR_CONNECTION_POOLING, (void*)SQL_CP_ONE_PER_HENV, 0)]])], - [have_odbc_libs=yes],[have_odbc_libs=no]) - LIBS="$save_LIBS" - if test "$have_odbc_libs" = no ; then - if test "$odbc_enabled" = "yes" ; then - AC_MSG_ERROR([unable to link with ODBC Library]) - else - AC_MSG_RESULT([no, skipping ODBC]) - fi - fi - fi - - CPPFLAGS="$save_CPPFLAGS" -fi - -# if have_odbc_libs=yes then go ahead with building ODBC -if test "$have_odbc_libs" = yes ; then - # this AC_MSG_RESULT is from above! - AC_MSG_RESULT(yes) - WANT_SUBDIRS="$WANT_SUBDIRS odbc-store" - AC_SUBST(ODBC_CFLAGS) - AC_SUBST(ODBC_LIBS) -fi - -# GSS-API checking - -GSSAPI_ROOT="/usr" -AC_ARG_WITH(gssapi-includes, - AS_HELP_STRING([--with-gssapi-includes=DIR],[Specify location of GSSAPI header]), - [ GSSAPI_INCS="-I$withval" - want_gss="yes" ] -) - -AC_ARG_WITH(gssapi-libs, - AS_HELP_STRING([--with-gssapi-libs=DIR],[Specify location of GSSAPI libs]), - [ GSSAPI_LIB_DIR="-L$withval" - want_gss="yes" ] -) - -AC_ARG_WITH(gssapi, - AS_HELP_STRING([--with-gssapi=DIR],[Where to look for GSSAPI]), - [ GSSAPI_ROOT="$withval" - if test x"$GSSAPI_ROOT" != xno; then - want_gss="yes" - if test x"$GSSAPI_ROOT" = xyes; then - dnl if yes, then use default root - GSSAPI_ROOT="/usr" - fi - fi -]) - -save_CPPFLAGS="$CPPFLAGS" -AC_MSG_CHECKING([if GSSAPI support is requested]) -if test x"$want_gss" = xyes; then - AC_MSG_RESULT(yes) - - if test -z "$GSSAPI_INCS"; then - if test -f "$GSSAPI_ROOT/bin/krb5-config"; then - GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi` - elif test "$GSSAPI_ROOT" != "yes"; then - GSSAPI_INCS="-I$GSSAPI_ROOT/include" - fi - fi - - CPPFLAGS="$CPPFLAGS $GSSAPI_INCS" - - AC_CHECK_HEADER(gss.h, - [ - dnl found in the given dirs - AC_DEFINE([SHIBSP_HAVE_GSSGNU],[1],[if you have the GNU gssapi libraries]) - gnu_gss=yes - ], - [ - dnl not found, check Heimdal or MIT - AC_CHECK_HEADERS([gssapi/gssapi.h], [], [not_mit=1]) - AC_CHECK_HEADERS( - [gssapi/gssapi_generic.h gssapi/gssapi_krb5.h], - [], - [not_mit=1], - [ -AC_INCLUDES_DEFAULT -#ifdef HAVE_GSSAPI_GSSAPI_H -#include -#endif - ]) - if test "x$not_mit" = "x1"; then - dnl MIT not found, check for Heimdal - AC_CHECK_HEADER([gssapi.h], - [ - dnl found - AC_DEFINE([SHIBSP_HAVE_GSSHEIMDAL],[1],[if you have the Heimdal gssapi libraries]) - ], - [ - dnl no header found, disabling GSS - want_gss=no - AC_MSG_WARN([disabling GSSAPI since no header files was found]) - ] - ) - else - dnl MIT found - AC_DEFINE([SHIBSP_HAVE_GSSMIT],[1],[if you have the MIT gssapi libraries]) - dnl check if we have a really old MIT kerberos (<= 1.2) - AC_MSG_CHECKING([if gssapi headers declare GSS_C_NT_HOSTBASED_SERVICE]) - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([[ -#include -#include -#include - ]],[[ - gss_import_name( - (OM_uint32 *)0, - (gss_buffer_t)0, - GSS_C_NT_HOSTBASED_SERVICE, - (gss_name_t *)0); - ]]) - ],[ - AC_MSG_RESULT([yes]) - ],[ - AC_MSG_RESULT([no]) - AC_DEFINE([HAVE_OLD_GSSMIT],[1],[if you have an old MIT gssapi library, lacking GSS_C_NT_HOSTBASED_SERVICE]) - ]) - fi - ] - ) -else - AC_MSG_RESULT(no) -fi -if test x"$want_gss" = xyes; then - AC_DEFINE([SHIBSP_HAVE_GSSAPI],[1],[if you have the gssapi libraries]) - - if test -n "$gnu_gss"; then - LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR" - LIBS="$LIBS -lgss" - else - if test -z "$GSSAPI_LIB_DIR"; then - GSSAPI_LIB_DIR="$GSSAPI_ROOT/lib$libsuff" - fi - if test "$GSSAPI_ROOT" != "yes"; then - LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff" - fi - if test -f "$GSSAPI_ROOT/bin/krb5-config"; then - dnl krb5-config doesn't have --libs-only-L or similar, put everything - dnl into LIBS - gss_libs=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi` - else - if test "x$not_mit" = "x1"; then - gss_libs="-lgssapi" - else - gss_libs="-lgssapi_krb5" - fi - fi - LIBS="$LIBS $gss_libs" - fi - - AC_MSG_CHECKING([whether GSS-API naming extensions are available]) - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[ -#ifdef SHIBSP_HAVE_GSSGNU -# include -#elif defined SHIBSP_HAVE_GSSMIT -# include -# include -#else -# include -#endif]], - [[gss_get_name_attribute(NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);]])], - [AC_MSG_RESULT([yes])AC_DEFINE([HAVE_GSSAPI_NAMINGEXTS],[1],[Define to 1 if GSS-API naming extensions are available.])], - [AC_MSG_RESULT([no])]) - - AC_MSG_CHECKING([whether GSS-API composite name import is available]) - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[ -#ifdef SHIBSP_HAVE_GSSGNU -# include -#elif defined SHIBSP_HAVE_GSSMIT -# include -# include -#else -# include -#endif]], - [[ - OM_uint32 minor; - gss_name_t srcname; - gss_buffer_desc importbuf; - gss_import_name(&minor, &importbuf, GSS_C_NT_EXPORT_NAME_COMPOSITE, &srcname); - ]])], - [AC_MSG_RESULT([yes])AC_DEFINE([HAVE_GSSAPI_COMPOSITE_NAME],[1],[Define to 1 if GSS-API composite name import is available.])], - [AC_MSG_RESULT([no])]) - -else - CPPFLAGS="$save_CPPFLAGS" -fi - - -AC_SUBST(WANT_SUBDIRS) - -if test -n "$APXS_CC" && test "$APXS_CC" != "$CC" ; then - echo "==================================================================" - echo "WARNING: You have chosen to compile Apache-1.3 modules with a different" - echo " compiler than the one used to compile Apache." - echo "" - echo " Current compiler: $CC" - echo " Apache's compiler: $APXS_CC" - echo "" - echo "This could cause problems." - echo "==================================================================" -fi - -if test -n "$APXS2_CC" && test "$APXS2_CC" != "$CC" ; then - echo "==================================================================" - echo "WARNING: You have chosen to compile Apache-2.0 modules with a different" - echo " compiler than the one used to compile Apache." - echo "" - echo " Current compiler: $CC" - echo " Apache's compiler: $APXS2_CC" - echo "" - echo "This could cause problems." - echo "==================================================================" -fi - -if test -n "$APXS22_CC" && test "$APXS22_CC" != "$CC" ; then - echo "==================================================================" - echo "WARNING: You have chosen to compile Apache-2.2 modules with a different" - echo " compiler than the one used to compile Apache." - echo "" - echo " Current compiler: $CC" - echo " Apache's compiler: $APXS22_CC" - echo "" - echo "This could cause problems." - echo "==================================================================" -fi - -if test -n "$APXS24_CC" && test "$APXS24_CC" != "$CC" ; then - echo "==================================================================" - echo "WARNING: You have chosen to compile Apache-2.4 modules with a different" - echo " compiler than the one used to compile Apache." - echo "" - echo " Current compiler: $CC" - echo " Apache's compiler: $APXS24_CC" - echo "" - echo "This could cause problems." - echo "==================================================================" -fi - -LIBTOOL="$LIBTOOL --silent" - -AC_OUTPUT +AC_PREREQ([2.50]) +AC_INIT([shibboleth],[2.5.6],[https://issues.shibboleth.net/],[shibboleth-sp]) +AC_CONFIG_SRCDIR(shibsp) +AC_CONFIG_AUX_DIR(build-aux) +AC_CONFIG_MACRO_DIR(m4) +AM_INIT_AUTOMAKE +AC_DISABLE_STATIC +AC_PROG_LIBTOOL + +# Docygen features +DX_HTML_FEATURE(ON) +DX_CHM_FEATURE(OFF) +DX_CHI_FEATURE(OFF) +DX_MAN_FEATURE(OFF) +DX_RTF_FEATURE(OFF) +DX_XML_FEATURE(OFF) +DX_PDF_FEATURE(OFF) +DX_PS_FEATURE(OFF) +DX_INIT_DOXYGEN(shibboleth, doxygen.cfg, doc/api) +DX_INCLUDE= + +AC_ARG_ENABLE(debug, + AS_HELP_STRING([--enable-debug],[Have GCC compile with symbols (Default = no)]), + enable_debug=$enableval, enable_debug=no) + +if test "$enable_debug" = "yes" ; then + GCC_CFLAGS="$CFLAGS -g -D_DEBUG" + GCC_CXXFLAGS="$CXXFLAGS -g -D_DEBUG" +else + GCC_CFLAGS="$CFLAGS -O2 -DNDEBUG" + GCC_CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG" +fi + +AC_CONFIG_HEADERS([config.h shibsp/config_pub.h]) +AC_CONFIG_FILES([shibboleth.spec]) + +AC_PROG_CC([gcc gcc3 cc]) +AC_PROG_CXX([g++ g++3 c++ CC]) +AC_CANONICAL_HOST + +if test "$GCC" = "yes" ; then +# AC_HAVE_GCC_VERSION(4,0,0,0, +# [ +# AC_DEFINE(GCC_HASCLASSVISIBILITY,1, +# [Define to enable class visibility control in gcc.]) +# GCC_CFLAGS="$GCC_CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden" +# GCC_CXXFLAGS="$GCC_CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden" +# ]) + CFLAGS="-Wall $GCC_CFLAGS" + CXXFLAGS="-Wall $GCC_CXXFLAGS" +fi + +# Fix for Sun Workshop compiler in debug mode, may be Sun case #6360993 +# Also enables POSIX semantics for some functions. +case "${host_cpu}-${host_os}" in + *solaris*) + CFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS" + CXXFLAGS="$CXXFLAGS -D_POSIX_PTHREAD_SEMANTICS" + if test "$CXX" = "CC" ; then + CXXFLAGS="$CXXFLAGS -Qoption ccfe -stabs=no%dfltlit+no%dflthlp" + fi + ;; + *osf*) + CXXFLAGS="$CXXFLAGS -D_POSIX_PII_SOCKET" + ;; +esac + +AC_LANG(C) + +# Checks for typedefs, structures, and compiler characteristics. +AC_C_CONST +AC_TYPE_SIZE_T +AC_STRUCT_TM + +# Checks for library functions. +AC_FUNC_STRFTIME +AC_FUNC_STRERROR_R +AC_CHECK_HEADERS([sys/utsname.h grp.h pwd.h]) +AC_CHECK_HEADERS([sys/socket.h], [AC_DEFINE([SHIBSP_HAVE_SYS_SOCKET_H],[1],[Define to 1 if you have the header file.])], []) +AC_CHECK_FUNCS([strchr strdup strstr timegm gmtime_r localtime_r strtok_r strcasecmp getpwnam getgrnam initgroups]) +AC_CHECK_TYPES([struct sockaddr_storage], [], [], [[#include ]]) +AC_CHECK_MEMBERS([struct sockaddr.sa_len], [], [], [[#include ]]) + +AC_CACHE_CHECK([for SOCK_CLOEXEC support], [shib_cv_sock_cloexec], +[AC_TRY_RUN([ +#include +#include +int main() +{ +return socket(AF_INET, SOCK_STREAM|SOCK_CLOEXEC, 0) == -1; +}], [shib_cv_sock_cloexec=yes], [shib_cv_sock_cloexec=no], [shib_cv_sock_cloexec=no])]) + +if test "$shib_cv_sock_cloexec" = "yes"; then + AC_DEFINE([HAVE_SOCK_CLOEXEC], 1, [Define if the SOCK_CLOEXEC flag is supported]) +fi + +# checks for pthreads +ACX_PTHREAD([enable_threads="pthread"],[enable_threads="no"]) +if test $enable_threads != "pthread"; then + AC_MSG_ERROR([unable to find pthreads, currently this is required]) +else + AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.]) + LIBS="$PTHREAD_LIBS $LIBS" + CFLAGS="$PTHREAD_CFLAGS $CFLAGS" + CXXFLAGS="$PTHREAD_CFLAGS $CXXFLAGS" +fi + +# OpenSSL settings +AC_ARG_WITH(openssl, + AS_HELP_STRING([--with-openssl=PATH],[where openssl is installed]), + [if test x_$with_openssl != x_/usr; then + SSLFLAGS="-I${with_openssl}/include" + fi]) + +if test "x$with_openssl" = "x" ; then + AC_PATH_PROG(PKG_CONFIG, pkg-config) + if test "x$PKG_CONFIG" != x && test "x$PKG_CONFIG" != "xno" ; then + if pkg-config openssl ; then + SSLFLAGS="`$PKG_CONFIG --cflags openssl`" + else + AC_MSG_WARN([OpenSSL not supported by pkg-config, try --with-openssl instead]) + fi + fi +fi + +AC_MSG_CHECKING(for OpenSSL cflags) +AC_MSG_RESULT($SSLFLAGS) +CPPFLAGS="$SSLFLAGS $CPPFLAGS" + +AC_CHECK_HEADER([openssl/x509.h],,AC_MSG_ERROR([unable to find openssl header files])) + +AC_LANG([C++]) + +# C++ requirements +AC_CXX_NAMESPACES +AC_CXX_REQUIRE_STL + +# Boost +BOOST_REQUIRE +BOOST_BIND +BOOST_LAMBDA +BOOST_POINTER_CONTAINER +BOOST_SMART_PTR +BOOST_STRING_ALGO +BOOST_TUPLE +CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS" + +# Thank you Solaris, really. +AC_MSG_CHECKING(for ctime_r) +if test -z "$ac_cv_ctime_args"; then + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#include ]], [[time_t clock; char buf[26]; ctime_r(&clock, buf);]])], + [ac_cv_ctime_args=2],[]) + + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#include ]], [[time_t clock; char buf[26]; ctime_r(&clock, buf, 26);]])], + [ac_cv_ctime_args=3],[]) +fi +if test -z "$ac_cv_ctime_args"; then + AC_MSG_RESULT(no) +else + if test "$ac_cv_ctime_args" = 2; then + AC_DEFINE([HAVE_CTIME_R_2],[1],[Define if ctime_r is present with 2 parameters.]) + elif test "$ac_cv_ctime_args" = 3; then + AC_DEFINE([HAVE_CTIME_R_3],[1],[Define if ctime_r is present with 3 parameters.]) + fi + AC_MSG_RESULT([yes, and it takes $ac_cv_ctime_args arguments]) +fi + +# log4shib settings (favor this version over the log4cpp code) +AC_PATH_PROG(LOG4SHIB_CONFIG,log4shib-config) +AC_ARG_WITH(log4shib, + AS_HELP_STRING([--with-log4shib=PATH],[where log4shib-config is installed]), + [ + LOG4SHIB_CONFIG="${with_log4shib}" + if ! test -f "${LOG4SHIB_CONFIG}"; then + LOG4SHIB_CONFIG="${with_log4shib}/bin/log4shib-config" + fi + ]) +if test -f "${LOG4SHIB_CONFIG}" ; then + LIBS="`${LOG4SHIB_CONFIG} --libs` $LIBS" + CPPFLAGS="`${LOG4SHIB_CONFIG} --cflags` $CPPFLAGS" + AC_CHECK_HEADER([log4shib/CategoryStream.hh],,AC_MSG_ERROR([unable to find log4shib header files])) + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include +#include ]], + [[log4shib::Category::getInstance("foo").errorStream() << log4shib::eol]])], + [AC_DEFINE([SHIBSP_LOG4SHIB],[1],[Define to 1 if log4shib library is used.])], + [AC_MSG_ERROR([unable to link with log4shib])]) +else + AC_MSG_WARN([log4shib-config not found, may need to use --with-log4shib option]) + AC_MSG_WARN([will look for original log4cpp library]) + + # log4cpp settings + AC_PATH_PROG(LOG4CPP_CONFIG,log4cpp-config) + AC_ARG_WITH(log4cpp, + AS_HELP_STRING([--with-log4cpp=PATH],[where log4cpp-config is installed]), + [ + LOG4CPP_CONFIG="${with_log4cpp}" + if ! test -f "${LOG4CPP_CONFIG}"; then + LOG4CPP_CONFIG="${with_log4cpp}/bin/log4cpp-config" + fi + ]) + if test -f "${LOG4CPP_CONFIG}"; then + AC_MSG_WARN([will try to use log4cpp, note that most non-Internet2 supplied versions are not thread-safe]) + LIBS="`${LOG4CPP_CONFIG} --libs` $LIBS" + CPPFLAGS="`${LOG4CPP_CONFIG} --cflags` $CPPFLAGS" + AC_CHECK_HEADER([log4cpp/CategoryStream.hh],,AC_MSG_ERROR([unable to find log4cpp header files])) + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include +#include ]], + [[log4cpp::Category::getInstance("foo").errorStream() << log4cpp::eol]])], + [AC_DEFINE([SHIBSP_LOG4CPP],[1],[Define to 1 if log4cpp library is used.])], + [AC_MSG_ERROR([unable to link with log4cpp, need version 1.0 or later])]) + else + AC_MSG_ERROR([log4cpp-config not found, may need to use --with-log4cpp option]) + fi +fi + +# Xerces settings +AC_ARG_WITH(xerces, + AS_HELP_STRING([--with-xerces=PATH],[where xerces-c is installed]),, + [with_xerces=/usr]) +if test x_$with_xerces != x_/usr; then + CPPFLAGS="-I${with_xerces}/include $CPPFLAGS" + LIBS="-L${with_xerces}/lib -lxerces-c $LIBS" +else + LIBS="-lxerces-c $LIBS" +fi + +AC_CHECK_HEADER([xercesc/dom/DOM.hpp],,AC_MSG_ERROR([unable to find xerces header files])) +AC_MSG_CHECKING([Xerces version]) +AC_PREPROC_IFELSE( + [AC_LANG_PROGRAM([#include ], +[#if _XERCES_VERSION >= 20700 +int i = 0; +#else +#error version 2.7.0 or above required +#endif])], + [AC_MSG_RESULT(OK)], + [AC_MSG_FAILURE([Xerces-C v2.7.0 or higher is required, v3.x preferred])]) +AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include ]],[[xercesc::XMLPlatformUtils::Initialize()]])], + ,[AC_MSG_ERROR([unable to link with Xerces])]) + +AC_MSG_CHECKING([whether Xerces XMLString::release(XMLByte**) exists]) +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#include ]], + [[using namespace XERCES_CPP_NAMESPACE; XMLByte* buf=NULL; XMLString::release(&buf);]])], + [AC_MSG_RESULT([yes])AC_DEFINE([SHIBSP_XERCESC_HAS_XMLBYTE_RELEASE],[1],[Define to 1 if Xerces XMLString includes XMLByte release.])], + [AC_MSG_RESULT([no])]) + +AC_MSG_CHECKING([whether Xerces DOMNodeFilter API returns a short]) +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#include ]], + [[using namespace XERCES_CPP_NAMESPACE; + class Blocker : public DOMNodeFilter { + public: + short acceptNode(const DOMNode* node) const { + return FILTER_REJECT; + } + }; + static Blocker g_Blocker; + ]])], + [AC_MSG_RESULT([yes])AC_DEFINE([SHIBSP_XERCESC_SHORT_ACCEPTNODE],[1],[Define to 1 if Xerces DOMNodeFilter API returns a short.])], + [AC_MSG_RESULT([no])]) + +# XML-Security settings +AC_ARG_WITH(xmlsec, + AS_HELP_STRING([--with-xmlsec=PATH],[where xmlsec is installed]),, + [with_xmlsec=/usr]) +if test x_$with_xmlsec != x_/usr; then + CPPFLAGS="-I${with_xmlsec}/include $CPPFLAGS" + XMLSEC_LIBS="-L${with_xmlsec}/lib -lxml-security-c $XMLSEC_LIBS" +else + XMLSEC_LIBS="-lxml-security-c $XMLSEC_LIBS" +fi + +# save and append master libs +save_LIBS="$LIBS" +LIBS="$XMLSEC_LIBS $LIBS" + +AC_CHECK_HEADER([xsec/utils/XSECPlatformUtils.hpp],,AC_MSG_ERROR([unable to find XML-Security-C header files])) +AC_MSG_CHECKING([XML-Security-C version]) +AC_PREPROC_IFELSE( + [AC_LANG_PROGRAM([#include ], + [#if XSEC_VERSION_MAJOR > 1 || (XSEC_VERSION_MAJOR == 1 && XSEC_VERSION_MEDIUM > 3) +int i = 0; +#else +#error need version 1.4.0 or later +#endif])], + [AC_MSG_RESULT(OK)], + [AC_MSG_FAILURE([XML-Security-C version 1.4.0 or greater is required.])]) +AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include ]], + [[XSECPlatformUtils::Initialise()]])],, + [AC_MSG_ERROR([unable to link with XML-Security])]) + +AC_MSG_CHECKING([whether XML-Security-C supports white/blacklisting of algorithms]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[XSECAlgorithmMapper* mapper; mapper->whitelistAlgorithm(NULL);]])],[AC_MSG_RESULT([yes]) + AC_DEFINE([SHIBSP_XMLSEC_WHITELISTING],[1],[Define to 1 if XML-Security-C supports white/blacklisting algorithms.])],[AC_MSG_RESULT([no])]) + +# restore master libs +LIBS="$save_LIBS" + +#XML-Tooling settings +AC_ARG_WITH(xmltooling, + AS_HELP_STRING([--with-xmltooling=PATH],[where xmltooling is installed]),, + [with_xmltooling=/usr]) +if test x_$with_xmltooling != x_/usr; then + CPPFLAGS="-I${with_xmltooling}/include $CPPFLAGS" + DX_INCLUDE="${with_xmltooling}/include" + LITE_LIBS="-L${with_xmltooling}/lib -lxmltooling-lite" + XMLSEC_LIBS="-L${with_xmltooling}/lib -lxmltooling $XMLSEC_LIBS" +else + LITE_LIBS="-lxmltooling-lite" + XMLSEC_LIBS="-lxmltooling $XMLSEC_LIBS" +fi + +AC_CHECK_HEADER([xmltooling/base.h],,AC_MSG_ERROR([unable to find xmltooling header files])) + +# save and append master libs +save_LIBS="$LIBS" +LIBS="$XMLSEC_LIBS $LIBS" + +AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include +#include ]], + [[#if _XMLTOOLING_VERSION >= 10500 +xmltooling::XMLToolingConfig::getConfig(); +#else +#error Need XMLTooling version 1.5 or higher +#endif]])], + ,[AC_MSG_ERROR([unable to link with XMLTooling, or version was too old])]) + +# restore master libs +LIBS="$save_LIBS" + +# Establish location of xmltooling catalog. +XMLTOOLINGXMLDIR="" +if test "x$with_xmltooling" = "x" ; then + with_xmltooling="/usr" +fi +if test -f $with_xmltooling/share/xml/xmltooling/catalog.xml ; then + XMLTOOLINGXMLDIR="$with_xmltooling" +elif test -f $with_xerces/share/xml/xmltooling/catalog.xml ; then + XMLTOOLINGXMLDIR="$with_xerces" +elif test -f $with_log4shib/share/xml/xmltooling/catalog.xml ; then + XMLTOOLINGXMLDIR="$with_log4shib" +fi +if test "x$XMLTOOLINGXMLDIR" = "x" ; then + AC_MSG_ERROR([xmltooling XML catalog not found, may need to use --with-xmltooling option]) +fi +XMLTOOLINGXMLDIR="$XMLTOOLINGXMLDIR/share/xml/xmltooling" +AC_SUBST(XMLTOOLINGXMLDIR) + +# OpenSAML settings +AC_ARG_WITH(saml, + AS_HELP_STRING([--with-saml=PATH],[where opensaml is installed]),, + [with_saml=/usr]) +if test x_$with_saml != x_/usr; then + CPPFLAGS="-I${with_saml}/include $CPPFLAGS" + DX_INCLUDE="$DX_INCLUDE ${with_saml}/include" + XMLSEC_LIBS="-L${with_saml}/lib -lsaml $XMLSEC_LIBS" +else + XMLSEC_LIBS="-lsaml $XMLSEC_LIBS" +fi + +# save and append master libs +save_LIBS="$LIBS" +LIBS="$XMLSEC_LIBS $LIBS" + +AC_CHECK_HEADER([saml/saml2/metadata/Metadata.h],,AC_MSG_ERROR([unable to find OpenSAML header files])) +AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include +#include ]], +[[#if _OPENSAML_VERSION >= 20500 +opensaml::SAMLConfig::getConfig(); +#else +#error Need OpenSAML version 2.5 or higher +#endif]])], + ,[AC_MSG_ERROR([unable to link with OpenSAML, or version was too old]) + ]) + +# restore master libs +LIBS="$save_LIBS" + +# Establish location of opensaml catalogs. +OPENSAMLXMLDIR="" +if test "x$with_saml" = "x" ; then + with_saml="/usr" +fi +if test -f $with_saml/share/xml/opensaml/saml20-catalog.xml ; then + OPENSAMLXMLDIR="$with_saml" +elif test -f $with_xmltooling/share/xml/opensaml/saml20-catalog.xml ; then + OPENSAMLXMLDIR="$with_xmltooling" +elif test -f $with_xerces/share/xml/opensaml/saml20-catalog.xml ; then + OPENSAMLXMLDIR="$with_xerces" +elif test -f $with_log4shib/share/xml/opensaml/saml20-catalog.xml ; then + OPENSAMLXMLDIR="$with_log4shib" +fi +if test "x$OPENSAMLXMLDIR" = "x" ; then + AC_MSG_ERROR([opensaml XML catalogs not found, may need to use --with-saml option]) +fi +OPENSAMLXMLDIR="$OPENSAMLXMLDIR/share/xml/opensaml" +AC_SUBST(OPENSAMLXMLDIR) + +AC_SUBST(LITE_LIBS) +AC_SUBST(XMLSEC_LIBS) + +# output the underlying makefiles +WANT_SUBDIRS="doc schemas configs shibsp plugins shibd util" +AC_CONFIG_FILES([Makefile doc/Makefile schemas/Makefile \ + configs/Makefile shibsp/Makefile plugins/Makefile \ + shibd/Makefile util/Makefile selinux/Makefile]) + +## ADFS? +AC_CONFIG_FILES([adfs/Makefile]) +AC_ARG_ENABLE([adfs], + AS_HELP_STRING([--disable-adfs],[don't build the ADFS module]), + [adfs_enabled=$enableval], [adfs_enabled=yes]) +if test "x$adfs_enabled" = "x" ; then + adfs_enabled=yes +fi +AC_MSG_CHECKING(whether to build the ADFS module) +if test "$adfs_enabled" = "no" ; then + AC_MSG_RESULT(no) +else + AC_MSG_RESULT(yes) + WANT_SUBDIRS="$WANT_SUBDIRS adfs" +fi + +## systemd +dnl Systemd will be disabled by default and requires you to run configure with +dnl --enable-systemd to look for and enable systemd. +AC_ARG_ENABLE(systemd, + AS_HELP_STRING([--enable-systemd],[Build with systemd (Default = no)]), + [if test "x$enableval" = "x" ; then + WANT_SYSTEMD=no + else + WANT_SYSTEMD="$enableval" + fi + ],[ WANT_SYSTEMD=no ]) +AC_MSG_CHECKING(whether to build with systemd) + +AC_MSG_RESULT($WANT_SYSTEMD) +if test "$WANT_SYSTEMD" = "yes" ; then + AC_CHECK_HEADER([systemd/sd-daemon.h], [ + AC_CHECK_LIB([systemd-daemon], [sd_notify], [hassdnotify="y"])]) + AS_IF([test "x$hassdnotify=" = x], [ + AC_MSG_ERROR([Unable to find a suitable libsystemd-daemon library]) + ]) + AC_DEFINE([HAVE_SD_NOTIFY],[1],[Define to 1 if you have the sd_notify function.]) + PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon]) + AC_SUBST([SYSTEMD_CFLAGS]) + AC_SUBST([SYSTEMD_LIBS]) +fi + +# +# Build NSAPI module? +# +AC_MSG_CHECKING(for NSAPI module option) +AC_ARG_WITH(nsapi, + AS_HELP_STRING([--with-nsapi=DIR],[Build NSAPI module for Netscape/iPlanet/SunONE]), + [WANT_NSAPI=$withval],[WANT_NSAPI=no]) +AC_MSG_RESULT($WANT_NSAPI) + +if test "$WANT_NSAPI" != "no"; then + if test ! -d $WANT_NSAPI/bin ; then + AC_MSG_ERROR([Please specify the path to the root of your Netscape/iPlanet/SunONE server using --with-nsapi=DIR]) + fi + AC_MSG_CHECKING(for NSAPI include files) + if test -d $WANT_NSAPI/include ; then + NSAPI_INCLUDE=$WANT_NSAPI/include + AC_MSG_RESULT(Netscape-Enterprise 3.x style) + AC_CHECK_HEADERS([$NSAPI_INCLUDE/nsapi.h],,,[#define XP_UNIX]) + NSAPI_INCLUDE="$NSAPI_INC_DIR -I$NSAPI_INCLUDE" + fi + if test -d $WANT_NSAPI/plugins/include ; then + test -n "$NSAPI_INCLUDE" && NSAPI_INC_DIR="-I$NSAPI_INCLUDE" + NSAPI_INCLUDE="$WANT_NSAPI/plugins/include" + AC_MSG_RESULT(iPlanet 4.x / SunONE 6.x style) + AC_CHECK_HEADERS([$NSAPI_INCLUDE/nsapi.h],,,[#define XP_UNIX]) + NSAPI_INCLUDE="$NSAPI_INC_DIR -I$NSAPI_INCLUDE" + fi + if test "$NSAPI_INCLUDE" = ""; then + AC_MSG_ERROR([Please check you have nsapi.h in either $WANT_NSAPI/include or $WANT_NSAPI/plugins/include]) + fi +fi + +AC_SUBST(NSAPI_INCLUDE) + +# always output the Makefile, even if you don't use it +AC_CONFIG_FILES([nsapi_shib/Makefile]) +AM_CONDITIONAL(BUILD_NSAPI,test ! "$WANT_NSAPI" = "no") + +# add the NSAPI module to the list of wanted subdirs.. +if test ! "$WANT_NSAPI" = "no" ; then + WANT_SUBDIRS="$WANT_SUBDIRS nsapi_shib" +fi + + +# +# Build FastCGI support? +# +AC_MSG_CHECKING(for FastCGI support) +AC_ARG_WITH(fastcgi, + AS_HELP_STRING([--with-fastcgi=DIR],[Build FastCGI support]), + [WANT_FASTCGI=$withval],[WANT_FASTCGI=no]) +AC_MSG_RESULT($WANT_FASTCGI) + +if test "$WANT_FASTCGI" != "no"; then + + if test "$WANT_FASTCGI" != "yes"; then + if test x_$WANT_FASTCGI != x_/usr; then + FASTCGI_INCLUDE="-I$WANT_FASTCGI/include" + FASTCGI_LDFLAGS="-L$WANT_FASTCGI/lib" + fi + fi + + # save and append master flags + save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$FASTCGI_INCLUDE $CPPFLAGS" + + AC_CHECK_HEADER([fcgio.h],,AC_MSG_ERROR([unable to find FastCGI header files])) + FASTCGI_LIBS="-lfcgi -lfcgi++" + + # restore standard flags + CPPFLAGS="$save_CPPFLAGS" +fi + +AC_SUBST(FASTCGI_INCLUDE) +AC_SUBST(FASTCGI_LDFLAGS) +AC_SUBST(FASTCGI_LIBS) + +# always output the Makefile, even if you don't use it +AC_CONFIG_FILES([fastcgi/Makefile]) +AM_CONDITIONAL(BUILD_FASTCGI,test ! "$WANT_FASTCGI" = "no") + +if test ! "$WANT_FASTCGI" = "no" ; then + WANT_SUBDIRS="$WANT_SUBDIRS fastcgi" +fi + +# +# Build Memcached support? +# +AC_MSG_CHECKING(for Memcached support) +AC_ARG_WITH(memcached, + AS_HELP_STRING([--with-memcached=DIR],[Build Memcached support]), + [WANT_MEMCACHED=$withval],[WANT_MEMCACHED=no]) +AC_MSG_RESULT($WANT_MEMCACHED) + +if test "$WANT_MEMCACHED" != "no"; then + + if test "$WANT_MEMCACHED" != "yes"; then + if test x_$WANT_MEMCACHED != x_/usr; then + MEMCACHED_INCLUDE="-I$WANT_MEMCACHED/include" + MEMCACHED_LDFLAGS="-L$WANT_MEMCACHED/lib" + fi + fi + + # save and append master flags + save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$MEMCACHED_INCLUDE $CPPFLAGS" + + AC_CHECK_HEADER([libmemcached/memcached.h],, + AC_MSG_ERROR([unable to find Memcached header files])) + AC_CHECK_DECL([memcached_last_error_message], + [AC_DEFINE([HAVE_MEMCACHED_LAST_ERROR_MESSAGE],[1],[Define to 1 if libmemcached supports error handling function.])],, + [#include ]) + MEMCACHED_LIBS="-lmemcached" + + # restore standard flags + CPPFLAGS="$save_CPPFLAGS" +fi + +AC_SUBST(MEMCACHED_INCLUDE) +AC_SUBST(MEMCACHED_LDFLAGS) +AC_SUBST(MEMCACHED_LIBS) + +# always output the Makefile, even if you don't use it +AC_CONFIG_FILES([memcache-store/Makefile]) +AM_CONDITIONAL(BUILD_MEMCACHED,test ! "$WANT_MEMCACHED" = "no") + +if test ! "$WANT_MEMCACHED" = "no" ; then + WANT_SUBDIRS="$WANT_SUBDIRS memcache-store" +fi + + +# +# If no --enable-apache-xx specified +# find a default and fake the specific parameters +# + +# simple macro to peek at an enable or a with +AC_DEFUN([Peek], +if test "[${[$1]_][$2]+set}" = set; then + peekval="${[$1]_[$2]}" + $3 +fi; dnl +) + +AC_MSG_CHECKING(if default apache needed) +need_default=yes +Peek(enable,apache_13,need_default=no) +Peek(enable,apache_20,need_default=no) +Peek(enable,apache_22,need_default=no) +Peek(enable,apache_24,need_default=no) +AC_MSG_RESULT($need_default) + +if test "$need_default" = "yes"; then + # find an apxs, then the httpd + xs= + Peek(with,apxs,xs="$peekval") + Peek(with,apxs2,xs="$peekval") + Peek(with,apxs22,xs="$peekval") + Peek(with,apxs24,xs="$peekval") + if test "x$xs" = "x"; then + AC_PATH_PROGS(xs, apxs2 apxs, + AC_MSG_ERROR(No apxs, no Apache found. Try --with-apxs, --with-apxs2, etc.), + [/usr/local/apache2/bin:/usr/local/apache/bin:/usr/sbin:$PATH]) + fi + # ask the daemon for the version and set parameters + AC_MSG_CHECKING(default apache version) + httpd="`$xs -q SBINDIR`/`$xs -q TARGET`" + if test "x$httpd" != "x" && test -f $httpd ; then + v=`$httpd -v|$SED -n -e 's/.*Apache\/\.*//p'` + case $v in + 1.3*) [enable_apache_13]=yes + [with_apxs]=$xs + AC_MSG_RESULT(1.3) + ;; + 2.0*) [enable_apache_20]=yes + [with_apxs2]=$xs + AC_MSG_RESULT(2.0) + ;; + 2.2*) [enable_apache_22]=yes + [with_apxs22]=$xs + AC_MSG_RESULT(2.2) + ;; + 2.4*) [enable_apache_24]=yes + [with_apxs24]=$xs + AC_MSG_RESULT(2.4) + ;; + *) AC_MSG_ERROR(unusable Apache versions: $v. Try setting --with-apxs, --with=apxs2, etc.) + esac + else + AC_MSG_RESULT(cannot determine Apache version. Try setting --with-apxs, --with-apxs2, etc.) + fi +fi + +# Apache 1.3 (mod_shib_13) +# --enable-apache-13 +# --with-apxs (DSO build, the normal way, uses apxs to derive build flags) + +AC_ARG_ENABLE(apache-13, + AS_HELP_STRING([--enable-apache-13],[enable the Apache 1.3 module]), + [if test "x$enableval" = "x" ; then + WANT_APACHE_13=yes + else + WANT_APACHE_13="$enableval" + fi + ],[ WANT_APACHE_13=no ]) +AC_MSG_CHECKING(whether to build Apache 1.3 module) +if test "$WANT_APACHE_13" != yes && test "$WANT_APACHE_13" != no ; then + WANT_APACHE_13=yes +fi +AC_MSG_RESULT($WANT_APACHE_13) + +if test "$WANT_APACHE_13" = "yes" ; then + AC_ARG_WITH(apxs, + AS_HELP_STRING([--with-apxs=FILE],[Specifies where to find the Apache 1.3 apxs script.]), + [ + AC_MSG_CHECKING(for user-specified apxs name/location) + if test "$withval" != "no" ; then + if test "$withval" != "yes"; then + APXS=$withval + AC_MSG_RESULT("$withval") + fi + fi + ], + [ + AC_PATH_PROG(APXS, apxs, no) + if test "$APXS" = "no" ; then + for i in /usr/sbin /usr/local/apache/bin ; do + if test "$APXS" = "no" && test -f "$i/apxs"; then + APXS="$i/apxs" + fi + done + fi + ]) + + AC_MSG_CHECKING([to see if apxs was located]) + if test ! -f "$APXS" ; then + AC_MSG_RESULT(no) + AC_MSG_ERROR([Unable to locate apxs script. An Apache development package may be missing from your server, or you may need to use the --with-apxs option.]) + fi + AC_MSG_RESULT($APXS) + AC_SUBST(APXS) + + # extract settings we need from APXS -q + APXS_CC="`$APXS -q CC`" + APXS_CFLAGS="`$APXS -q CFLAGS` `$APXS -q CFLAGS_SHLIB`" + APXS_INCLUDE="`$APXS -q INCLUDEDIR`" +fi + +AC_SUBST(APXS_CFLAGS) +AC_SUBST(APXS_INCLUDE) + + +# Apache 2.0 (mod_shib_20) +# --enable-apache-20 +# --with-apxs2 (DSO build, the normal way, uses apxs to derive build flags) +# --with-apr (DSO build, APR development package installed separately) +# --with-apu (DSO build, APR-UTIL development package installed separately) + +AC_ARG_ENABLE(apache-20, + AS_HELP_STRING([--enable-apache-20],[enable the Apache 2.0 module]), + [if test "x$enableval" = "x" ; then + WANT_APACHE_20=yes + else + WANT_APACHE_20="$enableval" + fi + ],[ WANT_APACHE_20=no ]) +AC_MSG_CHECKING(whether to build Apache 2.0 module) +if test "$WANT_APACHE_20" != yes && test "$WANT_APACHE_20" != no ; then + WANT_APACHE_20=yes +fi +AC_MSG_RESULT($WANT_APACHE_20) + +if test "$WANT_APACHE_20" = "yes" ; then + AC_ARG_WITH(apxs2, + AS_HELP_STRING([--with-apxs2=FILE],[Specifies where to find the Apache 2.0 apxs script.]), + [ + AC_MSG_CHECKING(for user-specified Apache 2.0 apxs name/location) + if test "$withval" != "no" ; then + if test "$withval" != "yes"; then + APXS2=$withval + AC_MSG_RESULT("$withval") + fi + fi + ], + [ + AC_PATH_PROG(APXS2, apxs2, no) + if test "$APXS2" = "no" ; then + AC_PATH_PROG(APXS2, apxs, no) + fi + if test "$APXS2" = "no" ; then + for i in /usr/sbin /usr/local/apache2/bin /usr/local/apache/bin ; do + if test "$APXS2" = "no" && test -f "$i/apxs2" ; then + APXS2="$i/apxs2" + fi + done + if test "$APXS2" = "no" ; then + for i in /usr/sbin /usr/local/apache2/bin /usr/local/apache/bin ; do + if test "$APXS2" = "no" && test -f "$i/apxs" ; then + APXS2="$i/apxs" + fi + done + fi + fi + ]) + + AC_MSG_CHECKING([to see if Apache 2.0 apxs was located]) + if test ! -f "$APXS2" ; then + AC_MSG_RESULT(no) + AC_MSG_ERROR([Unable to locate Apache 2.0 apxs script. An Apache development package may be missing from your server, or you may need to use the --with-apxs2 option.]) + fi + AC_MSG_RESULT($APXS2) + AC_SUBST(APXS2) + + # APR settings + AC_ARG_WITH(apr, + AS_HELP_STRING([--with-apr=PATH],[where apr-config is installed]), + [ + AC_MSG_CHECKING(for user-specified apr-config name/location) + if test "$withval" != "no" ; then + if test "$withval" != "yes"; then + APR_CONFIG=$withval + AC_MSG_RESULT("$withval") + fi + fi + ], + [ + AC_PATH_PROG(APR_CONFIG, apr-config,,[`$APXS2 -q SBINDIR`]:[$PATH]) + ]) + if test -f "${APR_CONFIG}"; then + APR_CFLAGS="`${APR_CONFIG} --cflags` `${APR_CONFIG} --cppflags` `${APR_CONFIG} --includes`" + else + AC_MSG_ERROR([Unable to locate apr-config, may need --with-apr option.]) + fi + + # APU settings + AC_ARG_WITH(apu, + AS_HELP_STRING([--with-apu=PATH],[where apu-config is installed]), + [ + AC_MSG_CHECKING(for user-specified apu-config name/location) + if test "$withval" != "no" ; then + if test "$withval" != "yes"; then + APU_CONFIG=$withval + AC_MSG_RESULT("$withval") + fi + fi + ], + [ + AC_PATH_PROG(APU_CONFIG, apu-config,,[`$APXS2 -q SBINDIR`]:[$PATH]) + ]) + if test -f "${APU_CONFIG}"; then + APU_CFLAGS="`${APU_CONFIG} --includes`" + else + AC_MSG_ERROR([Unable to locate apu-config, may need --with-apu option.]) + fi + + # extract settings we need from APXS2 -q + APXS2_CC="`$APXS2 -q CC`" + APXS2_CFLAGS="`$APXS2 -q CPPFLAGS` `$APXS2 -q CFLAGS` $APR_CFLAGS $APU_CFLAGS" + APXS2_INCLUDE="`$APXS2 -q INCLUDEDIR`" +fi + +AC_SUBST(APXS2_CFLAGS) +AC_SUBST(APXS2_INCLUDE) + + +# Apache 2.2 (mod_shib_22) +# --enable-apache-22 +# --with-apxs22 (DSO build, the normal way, uses apxs to derive build flags) +# --with-apr1 (DSO build, APR development package installed separately) +# --with-apu1 (DSO build, APR-UTIL development package installed separately) + +AC_ARG_ENABLE(apache-22, + AS_HELP_STRING([--enable-apache-22],[enable the Apache 2.2 module]), + [if test "x$enableval" = "x" ; then + WANT_APACHE_22=yes + else + WANT_APACHE_22="$enableval" + fi + ],[ WANT_APACHE_22=no ]) +AC_MSG_CHECKING(whether to build Apache 2.2 module) +if test "$WANT_APACHE_22" != yes && test "$WANT_APACHE_22" != no ; then + WANT_APACHE_22=yes +fi +AC_MSG_RESULT($WANT_APACHE_22) + +if test "$WANT_APACHE_22" = "yes" ; then + AC_ARG_WITH(apxs22, + AS_HELP_STRING([--with-apxs22=FILE],[Specifies where to find the Apache 2.2 apxs script.]), + [ + AC_MSG_CHECKING(for user-specified Apache 2.2 apxs name/location) + if test "$withval" != "no" ; then + if test "$withval" != "yes"; then + APXS22=$withval + AC_MSG_RESULT("$withval") + fi + fi + ], + [ + AC_PATH_PROG(APXS22, apxs2, no) + if test "$APXS22" = "no" ; then + AC_PATH_PROG(APXS22, apxs, no) + fi + if test "$APXS22" = "no" ; then + for i in /usr/sbin /usr/local/apache2/bin /usr/local/apache/bin ; do + if test "$APXS22" = "no" && test -f "$i/apxs2" ; then + APXS22="$i/apxs2" + fi + done + if test "$APXS22" = "no" ; then + for i in /usr/sbin /usr/local/apache2/bin /usr/local/apache/bin ; do + if test "$APXS22" = "no" && test -f "$i/apxs" ; then + APXS22="$i/apxs" + fi + done + fi + fi + ]) + + AC_MSG_CHECKING([to see if Apache 2.2 apxs was located]) + if test ! -f "$APXS22" ; then + AC_MSG_RESULT(no) + AC_MSG_ERROR([Unable to locate Apache 2.2 apxs script. An Apache development package may be missing from your server, or you may need to use the --with-apxs22 option.]) + fi + AC_MSG_RESULT($APXS22) + AC_SUBST(APXS22) + + # APR1 settings + AC_ARG_WITH(apr1, + AS_HELP_STRING([--with-apr1=PATH],[where apr-1-config is installed]), + [ + AC_MSG_CHECKING(for user-specified apr-1-config name/location) + if test "$withval" != "no" ; then + if test "$withval" != "yes"; then + APR1_CONFIG=$withval + AC_MSG_RESULT("$withval") + fi + fi + ], + [ + AC_PATH_PROG(APR1_CONFIG, apr-1-config,,[`$APXS22 -q SBINDIR`]:[$PATH]) + ]) + if test -f "${APR1_CONFIG}"; then + APR1_CFLAGS="`${APR1_CONFIG} --cflags` `${APR1_CONFIG} --cppflags` `${APR1_CONFIG} --includes`" + else + AC_MSG_ERROR([Unable to locate apr-1-config, may need --with-apr1 option.]) + fi + + # APU1 settings + AC_ARG_WITH(apu1, + AS_HELP_STRING([--with-apu1=PATH],[where apu-1-config is installed]), + [ + AC_MSG_CHECKING(for user-specified apu-1-config name/location) + if test "$withval" != "no" ; then + if test "$withval" != "yes"; then + APU1_CONFIG=$withval + AC_MSG_RESULT("$withval") + fi + fi + ], + [ + AC_PATH_PROG(APU1_CONFIG, apu-1-config,,[`$APXS22 -q SBINDIR`]:[$PATH]) + ]) + if test -f "${APU1_CONFIG}"; then + APU1_CFLAGS="`${APU1_CONFIG} --includes`" + else + AC_MSG_ERROR([Unable to locate apu-1-config, may need --with-apu1 option.]) + fi + + # extract settings we need from APXS22 -q + APXS22_CC="`$APXS22 -q CC`" + APXS22_CFLAGS="`$APXS22 -q CPPFLAGS` `$APXS22 -q CFLAGS` $APR1_CFLAGS $APU1_CFLAGS" + APXS22_INCLUDE="`$APXS22 -q INCLUDEDIR`" +fi + +AC_SUBST(APXS22_CFLAGS) +AC_SUBST(APXS22_INCLUDE) + +# Apache 2.4 (mod_shib_24) +# --enable-apache-24 +# --with-apxs24 (DSO build, the normal way, uses apxs to derive build flags) +# --with-apr1 (DSO build, APR development package installed separately) +# --with-apu1 (DSO build, APR-UTIL development package installed separately) + +AC_ARG_ENABLE(apache-24, + AS_HELP_STRING([--enable-apache-24],[enable the Apache 2.4 module]), + [if test "x$enableval" = "x" ; then + WANT_APACHE_24=yes + else + WANT_APACHE_24="$enableval" + fi + ],[ WANT_APACHE_24=no ]) +AC_MSG_CHECKING(whether to build Apache 2.4 module) +if test "$WANT_APACHE_24" != yes && test "$WANT_APACHE_24" != no ; then + WANT_APACHE_24=yes +fi +AC_MSG_RESULT($WANT_APACHE_24) + +if test "$WANT_APACHE_24" = "yes" ; then + AC_ARG_WITH(apxs24, + AS_HELP_STRING([--with-apxs24=FILE],[Specifies where to find the Apache 2.4 apxs script.]), + [ + AC_MSG_CHECKING(for user-specified Apache 2.4 apxs name/location) + if test "$withval" != "no" ; then + if test "$withval" != "yes"; then + APXS24=$withval + AC_MSG_RESULT("$withval") + fi + fi + ], + [ + AC_PATH_PROG(APXS24, apxs2, no) + if test "$APXS24" = "no" ; then + AC_PATH_PROG(APXS24, apxs, no) + fi + if test "$APXS24" = "no" ; then + for i in /usr/sbin /usr/local/apache2/bin /usr/local/apache/bin ; do + if test "$APXS24" = "no" && test -f "$i/apxs2" ; then + APXS24="$i/apxs2" + fi + done + if test "$APXS24" = "no" ; then + for i in /usr/sbin /usr/local/apache2/bin /usr/local/apache/bin ; do + if test "$APXS24" = "no" && test -f "$i/apxs" ; then + APXS24="$i/apxs" + fi + done + fi + fi + ]) + + AC_MSG_CHECKING([to see if Apache 2.4 apxs was located]) + if test ! -f "$APXS24" ; then + AC_MSG_RESULT(no) + AC_MSG_ERROR([Unable to locate Apache 2.4 apxs script. An Apache development package may be missing from your server, or you may need to use the --with-apxs24 option.]) + fi + AC_MSG_RESULT($APXS24) + AC_SUBST(APXS24) + + # If we haven't done this work already for Apache 2.2 + if test "$WANT_APACHE_22" != "yes" ; then + # APR1 settings + AC_ARG_WITH(apr1, + AS_HELP_STRING([--with-apr1=PATH],[where apr-1-config is installed]), + [ + AC_MSG_CHECKING(for user-specified apr-1-config name/location) + if test "$withval" != "no" ; then + if test "$withval" != "yes"; then + APR1_CONFIG=$withval + AC_MSG_RESULT("$withval") + fi + fi + ], + [ + AC_PATH_PROG(APR1_CONFIG, apr-1-config,,[`$APXS24 -q SBINDIR`]:[$PATH]) + ]) + if test -f "${APR1_CONFIG}"; then + APR1_CFLAGS="`${APR1_CONFIG} --cflags` `${APR1_CONFIG} --cppflags` `${APR1_CONFIG} --includes`" + else + AC_MSG_ERROR([Unable to locate apr-1-config, may need --with-apr1 option.]) + fi + + # APU1 settings + AC_ARG_WITH(apu1, + AS_HELP_STRING([--with-apu1=PATH],[where apu-1-config is installed]), + [ + AC_MSG_CHECKING(for user-specified apu-1-config name/location) + if test "$withval" != "no" ; then + if test "$withval" != "yes"; then + APU1_CONFIG=$withval + AC_MSG_RESULT("$withval") + fi + fi + ], + [ + AC_PATH_PROG(APU1_CONFIG, apu-1-config,,[`$APXS24 -q SBINDIR`]:[$PATH]) + ]) + if test -f "${APU1_CONFIG}"; then + APU1_CFLAGS="`${APU1_CONFIG} --includes`" + else + AC_MSG_ERROR([Unable to locate apu-1-config, may need --with-apu1 option.]) + fi + fi + + # extract settings we need from APXS24 -q + APXS24_CC="`$APXS24 -q CC`" + APXS24_CFLAGS="`$APXS24 -q CPPFLAGS` `$APXS24 -q CFLAGS` $APR1_CFLAGS $APU1_CFLAGS" + APXS24_INCLUDE="`$APXS24 -q INCLUDEDIR`" +fi + +AC_SUBST(APXS24_CFLAGS) +AC_SUBST(APXS24_INCLUDE) + +# always output the Makefile, even if you don't use it +AC_CONFIG_FILES([apache/Makefile]) +AM_CONDITIONAL(BUILD_AP13,test "$WANT_APACHE_13" = "yes") +AM_CONDITIONAL(BUILD_AP20,test "$WANT_APACHE_20" = "yes") +AM_CONDITIONAL(BUILD_AP22,test "$WANT_APACHE_22" = "yes") +AM_CONDITIONAL(BUILD_AP24,test "$WANT_APACHE_24" = "yes") + +# add the apache module to the list of wanted subdirs.. +if test "$WANT_APACHE_13" = "yes" || test "$WANT_APACHE_20" = "yes" || test "$WANT_APACHE_22" = "yes" || test "$WANT_APACHE_24" = "yes" ; then + WANT_SUBDIRS="$WANT_SUBDIRS apache" +fi + + +# +# Implement the checks of the ODBC Storage Service +# +# 1) Assume the user wants ODBC; if it's not found then just continue without +# 2) If the user specifically requested odbc, look for it and ERROR if not found +# 3) If the user specifically requested no odbc, don't build it. +# + +AC_CONFIG_FILES([odbc-store/Makefile]) + +# determine whether we should enable the odbc ccache +AC_ARG_ENABLE([odbc], + AS_HELP_STRING([--disable-odbc],[disable the ODBC Storage Service]), + [odbc_enabled=$enableval], [odbc_enabled=default]) +if test "x$odbc_enabled" = "x" ; then + odbc_enabled=yes +fi + +# Are we trying to build ODBC? +AC_MSG_CHECKING(whether to build the ODBC storage service) +if test "$odbc_enabled" = "yes" ; then + build_odbc=yes + AC_MSG_RESULT(yes) +elif test "$odbc_enabled" = "default" ; then + build_odbc=yes + AC_MSG_RESULT([yes, if it can be found]) +else + build_odbc=no + AC_MSG_RESULT(no) +fi + +# If we're trying to build ODBC, try to find the odbc_config program. +if test "$build_odbc" = "yes" ; then + odbc_dir="" + AC_ARG_WITH(odbc, + AS_HELP_STRING([--with-odbc=PATH],[directory where odbc is installed]), + [if test "$with_odbc" = no ; then + AC_MSG_ERROR([Try running --disable-odbc instead.]) + elif test "$with_odbc" != yes ; then + odbc_dir="$with_odbc/bin" + if test "$with_odbc" != /usr ; then + ODBC_CFLAGS="-I$with_odbc/include" + ODBC_LIBS="-L$with_odbc/lib" + fi + fi]) + + AC_PATH_PROG(ODBC_CONFIG, odbc_config, no, $odbc_dir $PATH ) + if test "$ODBC_CONFIG" = no ; then + AC_MSG_WARN([Cannot find odbc_config, will try to guess settings.]) + ODBC_LIBS="$ODBC_LIBS -lodbc" + else + ODBC_CFLAGS=`$ODBC_CONFIG --cflags` + ODBC_LIBS=`$ODBC_CONFIG --libs` + fi + + save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $ODBC_CFLAGS" + + AC_CHECK_HEADER([sql.h], [have_sql_h=yes], [have_sql_h=no]) + if test "$have_sql_h" = no -a "$odbc_enabled" = "yes" ; then + AC_MSG_ERROR(unable to find ODBC header files) + fi + + if test "$have_sql_h" = yes ; then + save_LIBS="$LIBS" + LIBS="$LIBS $ODBC_LIBS" + AC_MSG_CHECKING(if we can link againt ODBC) + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include + #include + #include ]], + [[SQLSetEnvAttr(SQL_NULL_HANDLE, SQL_ATTR_CONNECTION_POOLING, (void*)SQL_CP_ONE_PER_HENV, 0)]])], + [have_odbc_libs=yes],[have_odbc_libs=no]) + LIBS="$save_LIBS" + if test "$have_odbc_libs" = no ; then + if test "$odbc_enabled" = "yes" ; then + AC_MSG_ERROR([unable to link with ODBC Library]) + else + AC_MSG_RESULT([no, skipping ODBC]) + fi + fi + fi + + CPPFLAGS="$save_CPPFLAGS" +fi + +# if have_odbc_libs=yes then go ahead with building ODBC +if test "$have_odbc_libs" = yes ; then + # this AC_MSG_RESULT is from above! + AC_MSG_RESULT(yes) + WANT_SUBDIRS="$WANT_SUBDIRS odbc-store" + AC_SUBST(ODBC_CFLAGS) + AC_SUBST(ODBC_LIBS) +fi + +# GSS-API checking + +GSSAPI_ROOT="/usr" +AC_ARG_WITH(gssapi-includes, + AS_HELP_STRING([--with-gssapi-includes=DIR],[Specify location of GSSAPI header]), + [ GSSAPI_INCS="-I$withval" + want_gss="yes" ] +) + +AC_ARG_WITH(gssapi-libs, + AS_HELP_STRING([--with-gssapi-libs=DIR],[Specify location of GSSAPI libs]), + [ GSSAPI_LIB_DIR="-L$withval" + want_gss="yes" ] +) + +AC_ARG_WITH(gssapi, + AS_HELP_STRING([--with-gssapi=DIR],[Where to look for GSSAPI]), + [ GSSAPI_ROOT="$withval" + if test x"$GSSAPI_ROOT" != xno; then + want_gss="yes" + if test x"$GSSAPI_ROOT" = xyes; then + dnl if yes, then use default root + GSSAPI_ROOT="/usr" + fi + fi +]) + +save_CPPFLAGS="$CPPFLAGS" +AC_MSG_CHECKING([if GSSAPI support is requested]) +if test x"$want_gss" = xyes; then + AC_MSG_RESULT(yes) + + if test -z "$GSSAPI_INCS"; then + if test -f "$GSSAPI_ROOT/bin/krb5-config"; then + GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi` + elif test "$GSSAPI_ROOT" != "yes"; then + GSSAPI_INCS="-I$GSSAPI_ROOT/include" + fi + fi + + CPPFLAGS="$CPPFLAGS $GSSAPI_INCS" + + AC_CHECK_HEADER(gss.h, + [ + dnl found in the given dirs + AC_DEFINE([SHIBSP_HAVE_GSSGNU],[1],[if you have the GNU gssapi libraries]) + gnu_gss=yes + ], + [ + dnl not found, check Heimdal or MIT + AC_CHECK_HEADERS([gssapi/gssapi.h], [], [not_mit=1]) + AC_CHECK_HEADERS( + [gssapi/gssapi_generic.h gssapi/gssapi_krb5.h], + [], + [not_mit=1], + [ +AC_INCLUDES_DEFAULT +#ifdef HAVE_GSSAPI_GSSAPI_H +#include +#endif + ]) + if test "x$not_mit" = "x1"; then + dnl MIT not found, check for Heimdal + AC_CHECK_HEADER([gssapi.h], + [ + dnl found + AC_DEFINE([SHIBSP_HAVE_GSSHEIMDAL],[1],[if you have the Heimdal gssapi libraries]) + ], + [ + dnl no header found, disabling GSS + want_gss=no + AC_MSG_WARN([disabling GSSAPI since no header files was found]) + ] + ) + else + dnl MIT found + AC_DEFINE([SHIBSP_HAVE_GSSMIT],[1],[if you have the MIT gssapi libraries]) + dnl check if we have a really old MIT kerberos (<= 1.2) + AC_MSG_CHECKING([if gssapi headers declare GSS_C_NT_HOSTBASED_SERVICE]) + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([[ +#include +#include +#include + ]],[[ + gss_import_name( + (OM_uint32 *)0, + (gss_buffer_t)0, + GSS_C_NT_HOSTBASED_SERVICE, + (gss_name_t *)0); + ]]) + ],[ + AC_MSG_RESULT([yes]) + ],[ + AC_MSG_RESULT([no]) + AC_DEFINE([HAVE_OLD_GSSMIT],[1],[if you have an old MIT gssapi library, lacking GSS_C_NT_HOSTBASED_SERVICE]) + ]) + fi + ] + ) +else + AC_MSG_RESULT(no) +fi +if test x"$want_gss" = xyes; then + AC_DEFINE([SHIBSP_HAVE_GSSAPI],[1],[if you have the gssapi libraries]) + + if test -n "$gnu_gss"; then + LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR" + LIBS="$LIBS -lgss" + else + if test -z "$GSSAPI_LIB_DIR"; then + GSSAPI_LIB_DIR="$GSSAPI_ROOT/lib$libsuff" + fi + if test "$GSSAPI_ROOT" != "yes"; then + LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff" + fi + if test -f "$GSSAPI_ROOT/bin/krb5-config"; then + dnl krb5-config doesn't have --libs-only-L or similar, put everything + dnl into LIBS + gss_libs=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi` + else + if test "x$not_mit" = "x1"; then + gss_libs="-lgssapi" + else + gss_libs="-lgssapi_krb5" + fi + fi + LIBS="$LIBS $gss_libs" + fi + + AC_MSG_CHECKING([whether GSS-API naming extensions are available]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ +#ifdef SHIBSP_HAVE_GSSGNU +# include +#elif defined SHIBSP_HAVE_GSSMIT +# include +# include +#else +# include +#endif]], + [[gss_get_name_attribute(NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);]])], + [AC_MSG_RESULT([yes])AC_DEFINE([HAVE_GSSAPI_NAMINGEXTS],[1],[Define to 1 if GSS-API naming extensions are available.])], + [AC_MSG_RESULT([no])]) + + AC_MSG_CHECKING([whether GSS-API composite name import is available]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ +#ifdef SHIBSP_HAVE_GSSGNU +# include +#elif defined SHIBSP_HAVE_GSSMIT +# include +# include +#else +# include +#endif]], + [[ + OM_uint32 minor; + gss_name_t srcname; + gss_buffer_desc importbuf; + gss_import_name(&minor, &importbuf, GSS_C_NT_EXPORT_NAME_COMPOSITE, &srcname); + ]])], + [AC_MSG_RESULT([yes])AC_DEFINE([HAVE_GSSAPI_COMPOSITE_NAME],[1],[Define to 1 if GSS-API composite name import is available.])], + [AC_MSG_RESULT([no])]) + +else + CPPFLAGS="$save_CPPFLAGS" +fi + + +AC_SUBST(WANT_SUBDIRS) + +if test -n "$APXS_CC" && test "$APXS_CC" != "$CC" ; then + echo "==================================================================" + echo "WARNING: You have chosen to compile Apache-1.3 modules with a different" + echo " compiler than the one used to compile Apache." + echo "" + echo " Current compiler: $CC" + echo " Apache's compiler: $APXS_CC" + echo "" + echo "This could cause problems." + echo "==================================================================" +fi + +if test -n "$APXS2_CC" && test "$APXS2_CC" != "$CC" ; then + echo "==================================================================" + echo "WARNING: You have chosen to compile Apache-2.0 modules with a different" + echo " compiler than the one used to compile Apache." + echo "" + echo " Current compiler: $CC" + echo " Apache's compiler: $APXS2_CC" + echo "" + echo "This could cause problems." + echo "==================================================================" +fi + +if test -n "$APXS22_CC" && test "$APXS22_CC" != "$CC" ; then + echo "==================================================================" + echo "WARNING: You have chosen to compile Apache-2.2 modules with a different" + echo " compiler than the one used to compile Apache." + echo "" + echo " Current compiler: $CC" + echo " Apache's compiler: $APXS22_CC" + echo "" + echo "This could cause problems." + echo "==================================================================" +fi + +if test -n "$APXS24_CC" && test "$APXS24_CC" != "$CC" ; then + echo "==================================================================" + echo "WARNING: You have chosen to compile Apache-2.4 modules with a different" + echo " compiler than the one used to compile Apache." + echo "" + echo " Current compiler: $CC" + echo " Apache's compiler: $APXS24_CC" + echo "" + echo "This could cause problems." + echo "==================================================================" +fi + +LIBTOOL="$LIBTOOL --silent" + +AC_OUTPUT diff --git a/fastcgi/shibauthorizer.rc b/fastcgi/shibauthorizer.rc index e695be9..0ad49bb 100644 --- a/fastcgi/shibauthorizer.rc +++ b/fastcgi/shibauthorizer.rc @@ -1,109 +1,109 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,5,5,0 - PRODUCTVERSION 2,5,5,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "\0" - VALUE "CompanyName", "Shibboleth Consortium\0" - VALUE "FileDescription", "Shibboleth FastCGI Authorizer\0" - VALUE "FileVersion", "2, 5, 5, 0\0" - VALUE "InternalName", "shibauthorizer\0" - VALUE "LegalCopyright", "Copyright © 2015 UCAID\0" - VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename", "shibauthorizer.exe\0" - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Shibboleth 2.5.5\0" - VALUE "ProductVersion", "2, 5, 5, 0\0" - VALUE "SpecialBuild", "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 2,5,6,0 + PRODUCTVERSION 2,5,6,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "\0" + VALUE "CompanyName", "Shibboleth Consortium\0" + VALUE "FileDescription", "Shibboleth FastCGI Authorizer\0" + VALUE "FileVersion", "2, 5, 6, 0\0" + VALUE "InternalName", "shibauthorizer\0" + VALUE "LegalCopyright", "Copyright © 2016 UCAID\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "shibauthorizer.exe\0" + VALUE "PrivateBuild", "\0" + VALUE "ProductName", "Shibboleth 2.5.6\0" + VALUE "ProductVersion", "2, 5, 6, 0\0" + VALUE "SpecialBuild", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/fastcgi/shibresponder.rc b/fastcgi/shibresponder.rc index 1a90591..91804aa 100644 --- a/fastcgi/shibresponder.rc +++ b/fastcgi/shibresponder.rc @@ -1,109 +1,109 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,5,5,0 - PRODUCTVERSION 2,5,5,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "\0" - VALUE "CompanyName", "Shibboleth Consortium\0" - VALUE "FileDescription", "Shibboleth FastCGI Responder\0" - VALUE "FileVersion", "2, 5, 5, 0\0" - VALUE "InternalName", "shibresponder\0" - VALUE "LegalCopyright", "Copyright © 2015 UCAID\0" - VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename", "shibresponder.exe\0" - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Shibboleth 2.5.5\0" - VALUE "ProductVersion", "2, 5, 5, 0\0" - VALUE "SpecialBuild", "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 2,5,6,0 + PRODUCTVERSION 2,5,6,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "\0" + VALUE "CompanyName", "Shibboleth Consortium\0" + VALUE "FileDescription", "Shibboleth FastCGI Responder\0" + VALUE "FileVersion", "2, 5, 6, 0\0" + VALUE "InternalName", "shibresponder\0" + VALUE "LegalCopyright", "Copyright © 2016 UCAID\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "shibresponder.exe\0" + VALUE "PrivateBuild", "\0" + VALUE "ProductName", "Shibboleth 2.5.6\0" + VALUE "ProductVersion", "2, 5, 6, 0\0" + VALUE "SpecialBuild", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/isapi_shib/isapi_shib.rc b/isapi_shib/isapi_shib.rc index 633d9f4..1336a32 100644 --- a/isapi_shib/isapi_shib.rc +++ b/isapi_shib/isapi_shib.rc @@ -1,109 +1,109 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,5,5,0 - PRODUCTVERSION 2,5,5,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "\0" - VALUE "CompanyName", "Shibboleth Consortium\0" - VALUE "FileDescription", "Shibboleth ISAPI Filter / Extension\0" - VALUE "FileVersion", "2, 5, 5, 0\0" - VALUE "InternalName", "isapi_shib\0" - VALUE "LegalCopyright", "Copyright © 2015 UCAID\0" - VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename", "isapi_shib.dll\0" - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Shibboleth 2.5.5\0" - VALUE "ProductVersion", "2, 5, 5, 0\0" - VALUE "SpecialBuild", "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 2,5,6,0 + PRODUCTVERSION 2,5,6,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "\0" + VALUE "CompanyName", "Shibboleth Consortium\0" + VALUE "FileDescription", "Shibboleth ISAPI Filter / Extension\0" + VALUE "FileVersion", "2, 5, 6, 0\0" + VALUE "InternalName", "isapi_shib\0" + VALUE "LegalCopyright", "Copyright © 2016 UCAID\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "isapi_shib.dll\0" + VALUE "PrivateBuild", "\0" + VALUE "ProductName", "Shibboleth 2.5.6\0" + VALUE "ProductVersion", "2, 5, 6, 0\0" + VALUE "SpecialBuild", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/memcache-store/memcache-store.rc b/memcache-store/memcache-store.rc index b1b0a84..0716ee3 100644 --- a/memcache-store/memcache-store.rc +++ b/memcache-store/memcache-store.rc @@ -1,101 +1,101 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,5,5,0 - PRODUCTVERSION 2,5,5,0 - FILEFLAGSMASK 0x17L -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "Shibboleth Consortium\0" - VALUE "FileDescription", "Shibboleth Memcache Storage Service Plugin\0" - VALUE "FileVersion", "2, 5, 5, 0\0" - VALUE "InternalName", "memcache-store\0" - VALUE "LegalCopyright", "Copyright © 2015 UCAID\0" - VALUE "OriginalFilename", "memcache-store.so\0" - VALUE "ProductName", "Shibboleth 2.5.5\0" - VALUE "ProductVersion", "2, 5, 5, 0\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 2,5,6,0 + PRODUCTVERSION 2,5,6,0 + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "Shibboleth Consortium\0" + VALUE "FileDescription", "Shibboleth Memcache Storage Service Plugin\0" + VALUE "FileVersion", "2, 5, 6, 0\0" + VALUE "InternalName", "memcache-store\0" + VALUE "LegalCopyright", "Copyright © 2016 UCAID\0" + VALUE "OriginalFilename", "memcache-store.so\0" + VALUE "ProductName", "Shibboleth 2.5.6\0" + VALUE "ProductVersion", "2, 5, 6, 0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/nsapi_shib/nsapi_shib.rc b/nsapi_shib/nsapi_shib.rc index 6cfabb5..e60bea3 100644 --- a/nsapi_shib/nsapi_shib.rc +++ b/nsapi_shib/nsapi_shib.rc @@ -1,109 +1,109 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,5,5,0 - PRODUCTVERSION 2,5,5,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "\0" - VALUE "CompanyName", "Shibboleth Consortium\0" - VALUE "FileDescription", "Shibboleth NSAPI Extension\0" - VALUE "FileVersion", "2, 5, 5, 0\0" - VALUE "InternalName", "nsapi_shib\0" - VALUE "LegalCopyright", "Copyright © 2015 UCAID\0" - VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename", "nsapi_shib.dll\0" - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Shibboleth 2.5.5\0" - VALUE "ProductVersion", "2, 5, 5, 0\0" - VALUE "SpecialBuild", "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 2,5,6,0 + PRODUCTVERSION 2,5,6,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "\0" + VALUE "CompanyName", "Shibboleth Consortium\0" + VALUE "FileDescription", "Shibboleth NSAPI Extension\0" + VALUE "FileVersion", "2, 5, 6, 0\0" + VALUE "InternalName", "nsapi_shib\0" + VALUE "LegalCopyright", "Copyright © 2016 UCAID\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "nsapi_shib.dll\0" + VALUE "PrivateBuild", "\0" + VALUE "ProductName", "Shibboleth 2.5.6\0" + VALUE "ProductVersion", "2, 5, 6, 0\0" + VALUE "SpecialBuild", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/odbc-store/odbc-store.rc b/odbc-store/odbc-store.rc index 299d013..4e2d780 100644 --- a/odbc-store/odbc-store.rc +++ b/odbc-store/odbc-store.rc @@ -1,101 +1,101 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,5,5,0 - PRODUCTVERSION 2,5,5,0 - FILEFLAGSMASK 0x17L -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "Shibboleth Consortium\0" - VALUE "FileDescription", "Shibboleth ODBC Storage Service Plugin\0" - VALUE "FileVersion", "2, 5, 5, 0\0" - VALUE "InternalName", "odbc-store\0" - VALUE "LegalCopyright", "Copyright © 2015 UCAID\0" - VALUE "OriginalFilename", "odbc-store.so\0" - VALUE "ProductName", "Shibboleth 2.5.5\0" - VALUE "ProductVersion", "2, 5, 5, 0\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 2,5,6,0 + PRODUCTVERSION 2,5,6,0 + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "Shibboleth Consortium\0" + VALUE "FileDescription", "Shibboleth ODBC Storage Service Plugin\0" + VALUE "FileVersion", "2, 5, 6, 0\0" + VALUE "InternalName", "odbc-store\0" + VALUE "LegalCopyright", "Copyright © 2016 UCAID\0" + VALUE "OriginalFilename", "odbc-store.so\0" + VALUE "ProductName", "Shibboleth 2.5.6\0" + VALUE "ProductVersion", "2, 5, 6, 0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/plugins/plugins.rc b/plugins/plugins.rc index 1a8ce93..d60041f 100644 --- a/plugins/plugins.rc +++ b/plugins/plugins.rc @@ -1,117 +1,117 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,5,5,0 - PRODUCTVERSION 2,5,5,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "\0" - VALUE "CompanyName", "Shibboleth Consortium\0" - VALUE "FileDescription", "Shibboleth SP Plugins\0" - VALUE "FileVersion", "2, 5, 5, 0\0" -#ifdef SHIBSP_LITE - VALUE "InternalName", "plugins-lite\0" -#else - VALUE "InternalName", "plugins\0" -#endif - VALUE "LegalCopyright", "Copyright © 2015 UCAID\0" - VALUE "LegalTrademarks", "\0" -#ifdef SHIBSP_LITE - VALUE "OriginalFilename", "plugins-lite.so\0" -#else - VALUE "OriginalFilename", "plugins.so\0" -#endif - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Shibboleth 2.5.5\0" - VALUE "ProductVersion", "2, 5, 5, 0\0" - VALUE "SpecialBuild", "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 2,5,6,0 + PRODUCTVERSION 2,5,6,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "\0" + VALUE "CompanyName", "Shibboleth Consortium\0" + VALUE "FileDescription", "Shibboleth SP Plugins\0" + VALUE "FileVersion", "2, 5, 6, 0\0" +#ifdef SHIBSP_LITE + VALUE "InternalName", "plugins-lite\0" +#else + VALUE "InternalName", "plugins\0" +#endif + VALUE "LegalCopyright", "Copyright © 2016 UCAID\0" + VALUE "LegalTrademarks", "\0" +#ifdef SHIBSP_LITE + VALUE "OriginalFilename", "plugins-lite.so\0" +#else + VALUE "OriginalFilename", "plugins.so\0" +#endif + VALUE "PrivateBuild", "\0" + VALUE "ProductName", "Shibboleth 2.5.6\0" + VALUE "ProductVersion", "2, 5, 6, 0\0" + VALUE "SpecialBuild", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/shibd/shibd.rc b/shibd/shibd.rc index 04ac207..722c028 100644 --- a/shibd/shibd.rc +++ b/shibd/shibd.rc @@ -1,109 +1,109 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,5,5,0 - PRODUCTVERSION 2,5,5,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "\0" - VALUE "CompanyName", "Shibboleth Consortium\0" - VALUE "FileDescription", "Shibboleth Daemon Service\0" - VALUE "FileVersion", "2, 5, 5, 0\0" - VALUE "InternalName", "shibd\0" - VALUE "LegalCopyright", "Copyright © 2015 UCAID\0" - VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename", "shibd.exe\0" - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Shibboleth 2.5.5\0" - VALUE "ProductVersion", "2, 5, 5, 0\0" - VALUE "SpecialBuild", "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 2,5,6,0 + PRODUCTVERSION 2,5,6,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "\0" + VALUE "CompanyName", "Shibboleth Consortium\0" + VALUE "FileDescription", "Shibboleth Daemon Service\0" + VALUE "FileVersion", "2, 5, 6, 0\0" + VALUE "InternalName", "shibd\0" + VALUE "LegalCopyright", "Copyright © 2016 UCAID\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "shibd.exe\0" + VALUE "PrivateBuild", "\0" + VALUE "ProductName", "Shibboleth 2.5.6\0" + VALUE "ProductVersion", "2, 5, 6, 0\0" + VALUE "SpecialBuild", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am index 6b49f8c..6ed7299 100644 --- a/shibsp/Makefile.am +++ b/shibsp/Makefile.am @@ -1,280 +1,280 @@ -AUTOMAKE_OPTIONS = foreign - -lib_LTLIBRARIES = libshibsp.la libshibsp-lite.la - -libshibspincludedir = $(includedir)/shibsp - -attrincludedir = $(includedir)/shibsp/attribute - -attrresincludedir = $(includedir)/shibsp/attribute/resolver - -attrfiltincludedir = $(includedir)/shibsp/attribute/filtering - -bindincludedir = $(includedir)/shibsp/binding - -handincludedir = $(includedir)/shibsp/handler - -liteincludedir = $(includedir)/shibsp/lite - -mdincludedir = $(includedir)/shibsp/metadata - -remincludedir = $(includedir)/shibsp/remoting - -secincludedir = $(includedir)/shibsp/security - -utilincludedir = $(includedir)/shibsp/util - -libshibspinclude_HEADERS = \ - AbstractSPRequest.h \ - AccessControl.h \ - Application.h \ - base.h \ - config_pub.h \ - exceptions.h \ - paths.h \ - GSSRequest.h \ - RequestMapper.h \ - ServiceProvider.h \ - SessionCache.h \ - SessionCacheEx.h \ - SPConfig.h \ - SPRequest.h \ - TransactionLog.h \ - version.h - -attrinclude_HEADERS = \ - attribute/Attribute.h \ - attribute/AttributeDecoder.h \ - attribute/BinaryAttribute.h \ - attribute/ExtensibleAttribute.h \ - attribute/NameIDAttribute.h \ - attribute/ScopedAttribute.h \ - attribute/SimpleAttribute.h \ - attribute/XMLAttribute.h - -attrfiltinclude_HEADERS = \ - attribute/filtering/AttributeFilter.h \ - attribute/filtering/BasicFilteringContext.h \ - attribute/filtering/FilteringContext.h \ - attribute/filtering/FilterPolicyContext.h \ - attribute/filtering/MatchFunctor.h - -attrresinclude_HEADERS = \ - attribute/resolver/AttributeExtractor.h \ - attribute/resolver/AttributeResolver.h \ - attribute/resolver/ResolutionContext.h - -bindinclude_HEADERS = \ - binding/ArtifactResolver.h \ - binding/ProtocolProvider.h \ - binding/SOAPClient.h - -handinclude_HEADERS = \ - handler/AbstractHandler.h \ - handler/AssertionConsumerService.h \ - handler/Handler.h \ - handler/LogoutHandler.h \ - handler/LogoutInitiator.h \ - handler/RemotedHandler.h \ - handler/SecuredHandler.h \ - handler/SessionInitiator.h - -liteinclude_HEADERS = \ - lite/CommonDomainCookie.h \ - lite/SAMLConstants.h - -mdinclude_HEADERS = \ - metadata/MetadataExt.h \ - metadata/MetadataProviderCriteria.h - -reminclude_HEADERS = \ - remoting/ddf.h \ - remoting/ListenerService.h - -secinclude_HEADERS = \ - security/PKIXTrustEngine.h \ - security/SecurityPolicy.h \ - security/SecurityPolicyProvider.h - -utilinclude_HEADERS = \ - util/CGIParser.h \ - util/DOMPropertySet.h \ - util/IPRange.h \ - util/PropertySet.h \ - util/SPConstants.h \ - util/TemplateParameters.h - -noinst_HEADERS = \ - internal.h \ - remoting/impl/SocketListener.h - -common_sources = \ - AbstractSPRequest.cpp \ - Application.cpp \ - ServiceProvider.cpp \ - SPConfig.cpp \ - version.cpp \ - attribute/Attribute.cpp \ - attribute/BinaryAttribute.cpp \ - attribute/ExtensibleAttribute.cpp \ - attribute/NameIDAttribute.cpp \ - attribute/SimpleAttribute.cpp \ - attribute/ScopedAttribute.cpp \ - attribute/XMLAttribute.cpp \ - binding/impl/XMLProtocolProvider.cpp \ - handler/impl/AbstractHandler.cpp \ - handler/impl/AssertionConsumerService.cpp \ - handler/impl/AssertionLookup.cpp \ - handler/impl/AttributeCheckerHandler.cpp \ - handler/impl/ChainingLogoutInitiator.cpp \ - handler/impl/ChainingSessionInitiator.cpp \ - handler/impl/CookieSessionInitiator.cpp \ - handler/impl/DiscoveryFeed.cpp \ - handler/impl/ExternalAuthHandler.cpp \ - handler/impl/FormSessionInitiator.cpp \ - handler/impl/LocalLogoutInitiator.cpp \ - handler/impl/LogoutHandler.cpp \ - handler/impl/LogoutInitiator.cpp \ - handler/impl/MetadataGenerator.cpp \ - handler/impl/RemotedHandler.cpp \ - handler/impl/SAML1Consumer.cpp \ - handler/impl/SAML2Consumer.cpp \ - handler/impl/SAML2ArtifactResolution.cpp \ - handler/impl/SAML2Logout.cpp \ - handler/impl/SAML2LogoutInitiator.cpp \ - handler/impl/SAML2NameIDMgmt.cpp \ - handler/impl/SAML2SessionInitiator.cpp \ - handler/impl/SAMLDSSessionInitiator.cpp \ - handler/impl/SecuredHandler.cpp \ - handler/impl/SessionHandler.cpp \ - handler/impl/SessionInitiator.cpp \ - handler/impl/Shib1SessionInitiator.cpp \ - handler/impl/StatusHandler.cpp \ - handler/impl/TransformSessionInitiator.cpp \ - handler/impl/WAYFSessionInitiator.cpp \ - impl/ChainingAccessControl.cpp \ - impl/StorageServiceSessionCache.cpp \ - impl/XMLAccessControl.cpp \ - impl/XMLRequestMapper.cpp \ - impl/XMLServiceProvider.cpp \ - remoting/impl/ddf.cpp \ - remoting/impl/ListenerService.cpp \ - remoting/impl/SocketListener.cpp \ - remoting/impl/TCPListener.cpp \ - remoting/impl/UnixListener.cpp \ - util/CGIParser.cpp \ - util/DOMPropertySet.cpp \ - util/IPRange.cpp \ - util/SPConstants.cpp \ - util/TemplateParameters.cpp - -libshibsp_lite_la_SOURCES = \ - ${common_sources} \ - lite/CommonDomainCookie.cpp \ - lite/SAMLConstants.cpp - -libshibsp_la_SOURCES = \ - ${common_sources} \ - attribute/Base64AttributeDecoder.cpp \ - attribute/DOMAttributeDecoder.cpp \ - attribute/KeyInfoAttributeDecoder.cpp \ - attribute/NameIDAttributeDecoder.cpp \ - attribute/NameIDFromScopedAttributeDecoder.cpp \ - attribute/ScopedAttributeDecoder.cpp \ - attribute/StringAttributeDecoder.cpp \ - attribute/XMLAttributeDecoder.cpp \ - attribute/filtering/impl/AttributeFilter.cpp \ - attribute/filtering/impl/ChainingAttributeFilter.cpp \ - attribute/filtering/impl/DummyAttributeFilter.cpp \ - attribute/filtering/impl/XMLAttributeFilter.cpp \ - attribute/filtering/impl/BasicFilteringContext.cpp \ - attribute/filtering/impl/MatchFunctor.cpp \ - attribute/filtering/impl/AndMatchFunctor.cpp \ - attribute/filtering/impl/AnyMatchFunctor.cpp \ - attribute/filtering/impl/NotMatchFunctor.cpp \ - attribute/filtering/impl/OrMatchFunctor.cpp \ - attribute/filtering/impl/AttributeIssuerStringFunctor.cpp \ - attribute/filtering/impl/AttributeRequesterStringFunctor.cpp \ - attribute/filtering/impl/AttributeScopeStringFunctor.cpp \ - attribute/filtering/impl/AttributeValueStringFunctor.cpp \ - attribute/filtering/impl/AuthenticationMethodStringFunctor.cpp \ - attribute/filtering/impl/AttributeIssuerRegexFunctor.cpp \ - attribute/filtering/impl/AttributeRequesterRegexFunctor.cpp \ - attribute/filtering/impl/AttributeScopeRegexFunctor.cpp \ - attribute/filtering/impl/AttributeValueRegexFunctor.cpp \ - attribute/filtering/impl/AuthenticationMethodRegexFunctor.cpp \ - attribute/filtering/impl/NameIDQualifierStringFunctor.cpp \ - attribute/filtering/impl/NumberOfAttributeValuesFunctor.cpp \ - attribute/filtering/impl/AttributeIssuerInEntityGroupFunctor.cpp \ - attribute/filtering/impl/AttributeRequesterInEntityGroupFunctor.cpp \ - attribute/filtering/impl/AttributeIssuerEntityAttributeFunctor.cpp \ - attribute/filtering/impl/AttributeRequesterEntityAttributeFunctor.cpp \ - attribute/filtering/impl/AttributeIssuerEntityMatcherFunctor.cpp \ - attribute/filtering/impl/AttributeRequesterEntityMatcherFunctor.cpp \ - attribute/filtering/impl/AttributeScopeMatchesShibMDScopeFunctor.cpp \ - attribute/resolver/impl/ChainingAttributeResolver.cpp \ - attribute/resolver/impl/QueryAttributeResolver.cpp \ - attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp \ - attribute/resolver/impl/AssertionAttributeExtractor.cpp \ - attribute/resolver/impl/ChainingAttributeExtractor.cpp \ - attribute/resolver/impl/DelegationAttributeExtractor.cpp \ - attribute/resolver/impl/KeyDescriptorAttributeExtractor.cpp \ - attribute/resolver/impl/MetadataAttributeExtractor.cpp \ - attribute/resolver/impl/XMLAttributeExtractor.cpp \ - binding/impl/ArtifactResolver.cpp \ - binding/impl/SOAPClient.cpp \ - impl/TransactionLog.cpp \ - impl/XMLSecurityPolicyProvider.cpp \ - metadata/DynamicMetadataProvider.cpp \ - metadata/MetadataExtImpl.cpp \ - metadata/MetadataExtSchemaValidators.cpp \ - metadata/MetadataProviderCriteria.cpp \ - security/PKIXTrustEngine.cpp \ - security/SecurityPolicy.cpp - -# this is different from the project version -# http://sources.redhat.com/autobook/autobook/autobook_91.html -libshibsp_la_LDFLAGS = -version-info 6:5:0 -libshibsp_la_LIBADD = $(XMLSEC_LIBS) -libshibsp_lite_la_LDFLAGS = -version-info 6:5:0 -libshibsp_lite_la_LIBADD = $(LITE_LIBS) -libshibsp_lite_la_CPPFLAGS = -DSHIBSP_LITE - -pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@ -pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@ -logdir = ${localstatedir}/log -rundir = $(localstatedir)/run -cachedir = $(localstatedir)/cache -xmldir = $(datadir)/xml - -paths.h: ${srcdir}/paths.h.in Makefile ${top_builddir}/config.status - rm -f $@.tmp - sed < ${srcdir}/$@.in > $@.tmp \ - -e 's:@-PREFIX-@:${prefix}:g' \ - -e 's:@-LIBDIR-@:${libdir}:g' \ - -e 's:@-SYSCONFDIR-@:${sysconfdir}:g' \ - -e 's:@-LOGDIR-@:${logdir}:g' \ - -e 's:@-RUNDIR-@:${rundir}:g' \ - -e 's:@-CACHEDIR-@:${cachedir}:g' \ - -e 's:@-XMLDIR-@:${xmldir}:g' \ - -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:g' \ - -e 's:@-PKGXMLDIR-@:${pkgxmldir}:g' \ - -e 's:@-XMLTOOLINGXMLDIR-@:${XMLTOOLINGXMLDIR}:g' \ - -e 's:@-OPENSAMLXMLDIR-@:${OPENSAMLXMLDIR}:g' - cmp -s $@ $@.tmp || mv $@.tmp $@ - rm -f $@.tmp - -install-exec-hook: - for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done - -EXTRA_DIST = \ - shibsp.vcxproj \ - shibsp-lite.vcxproj \ - shibsp.vcxproj.filters \ - shibsp-lite.vcxproj.filters \ - config_pub.h.in \ - config_pub_win32.h\ - paths.h.in \ - resource.h \ - shibsp.rc -BUILT_SOURCES = paths.h +AUTOMAKE_OPTIONS = foreign + +lib_LTLIBRARIES = libshibsp.la libshibsp-lite.la + +libshibspincludedir = $(includedir)/shibsp + +attrincludedir = $(includedir)/shibsp/attribute + +attrresincludedir = $(includedir)/shibsp/attribute/resolver + +attrfiltincludedir = $(includedir)/shibsp/attribute/filtering + +bindincludedir = $(includedir)/shibsp/binding + +handincludedir = $(includedir)/shibsp/handler + +liteincludedir = $(includedir)/shibsp/lite + +mdincludedir = $(includedir)/shibsp/metadata + +remincludedir = $(includedir)/shibsp/remoting + +secincludedir = $(includedir)/shibsp/security + +utilincludedir = $(includedir)/shibsp/util + +libshibspinclude_HEADERS = \ + AbstractSPRequest.h \ + AccessControl.h \ + Application.h \ + base.h \ + config_pub.h \ + exceptions.h \ + paths.h \ + GSSRequest.h \ + RequestMapper.h \ + ServiceProvider.h \ + SessionCache.h \ + SessionCacheEx.h \ + SPConfig.h \ + SPRequest.h \ + TransactionLog.h \ + version.h + +attrinclude_HEADERS = \ + attribute/Attribute.h \ + attribute/AttributeDecoder.h \ + attribute/BinaryAttribute.h \ + attribute/ExtensibleAttribute.h \ + attribute/NameIDAttribute.h \ + attribute/ScopedAttribute.h \ + attribute/SimpleAttribute.h \ + attribute/XMLAttribute.h + +attrfiltinclude_HEADERS = \ + attribute/filtering/AttributeFilter.h \ + attribute/filtering/BasicFilteringContext.h \ + attribute/filtering/FilteringContext.h \ + attribute/filtering/FilterPolicyContext.h \ + attribute/filtering/MatchFunctor.h + +attrresinclude_HEADERS = \ + attribute/resolver/AttributeExtractor.h \ + attribute/resolver/AttributeResolver.h \ + attribute/resolver/ResolutionContext.h + +bindinclude_HEADERS = \ + binding/ArtifactResolver.h \ + binding/ProtocolProvider.h \ + binding/SOAPClient.h + +handinclude_HEADERS = \ + handler/AbstractHandler.h \ + handler/AssertionConsumerService.h \ + handler/Handler.h \ + handler/LogoutHandler.h \ + handler/LogoutInitiator.h \ + handler/RemotedHandler.h \ + handler/SecuredHandler.h \ + handler/SessionInitiator.h + +liteinclude_HEADERS = \ + lite/CommonDomainCookie.h \ + lite/SAMLConstants.h + +mdinclude_HEADERS = \ + metadata/MetadataExt.h \ + metadata/MetadataProviderCriteria.h + +reminclude_HEADERS = \ + remoting/ddf.h \ + remoting/ListenerService.h + +secinclude_HEADERS = \ + security/PKIXTrustEngine.h \ + security/SecurityPolicy.h \ + security/SecurityPolicyProvider.h + +utilinclude_HEADERS = \ + util/CGIParser.h \ + util/DOMPropertySet.h \ + util/IPRange.h \ + util/PropertySet.h \ + util/SPConstants.h \ + util/TemplateParameters.h + +noinst_HEADERS = \ + internal.h \ + remoting/impl/SocketListener.h + +common_sources = \ + AbstractSPRequest.cpp \ + Application.cpp \ + ServiceProvider.cpp \ + SPConfig.cpp \ + version.cpp \ + attribute/Attribute.cpp \ + attribute/BinaryAttribute.cpp \ + attribute/ExtensibleAttribute.cpp \ + attribute/NameIDAttribute.cpp \ + attribute/SimpleAttribute.cpp \ + attribute/ScopedAttribute.cpp \ + attribute/XMLAttribute.cpp \ + binding/impl/XMLProtocolProvider.cpp \ + handler/impl/AbstractHandler.cpp \ + handler/impl/AssertionConsumerService.cpp \ + handler/impl/AssertionLookup.cpp \ + handler/impl/AttributeCheckerHandler.cpp \ + handler/impl/ChainingLogoutInitiator.cpp \ + handler/impl/ChainingSessionInitiator.cpp \ + handler/impl/CookieSessionInitiator.cpp \ + handler/impl/DiscoveryFeed.cpp \ + handler/impl/ExternalAuthHandler.cpp \ + handler/impl/FormSessionInitiator.cpp \ + handler/impl/LocalLogoutInitiator.cpp \ + handler/impl/LogoutHandler.cpp \ + handler/impl/LogoutInitiator.cpp \ + handler/impl/MetadataGenerator.cpp \ + handler/impl/RemotedHandler.cpp \ + handler/impl/SAML1Consumer.cpp \ + handler/impl/SAML2Consumer.cpp \ + handler/impl/SAML2ArtifactResolution.cpp \ + handler/impl/SAML2Logout.cpp \ + handler/impl/SAML2LogoutInitiator.cpp \ + handler/impl/SAML2NameIDMgmt.cpp \ + handler/impl/SAML2SessionInitiator.cpp \ + handler/impl/SAMLDSSessionInitiator.cpp \ + handler/impl/SecuredHandler.cpp \ + handler/impl/SessionHandler.cpp \ + handler/impl/SessionInitiator.cpp \ + handler/impl/Shib1SessionInitiator.cpp \ + handler/impl/StatusHandler.cpp \ + handler/impl/TransformSessionInitiator.cpp \ + handler/impl/WAYFSessionInitiator.cpp \ + impl/ChainingAccessControl.cpp \ + impl/StorageServiceSessionCache.cpp \ + impl/XMLAccessControl.cpp \ + impl/XMLRequestMapper.cpp \ + impl/XMLServiceProvider.cpp \ + remoting/impl/ddf.cpp \ + remoting/impl/ListenerService.cpp \ + remoting/impl/SocketListener.cpp \ + remoting/impl/TCPListener.cpp \ + remoting/impl/UnixListener.cpp \ + util/CGIParser.cpp \ + util/DOMPropertySet.cpp \ + util/IPRange.cpp \ + util/SPConstants.cpp \ + util/TemplateParameters.cpp + +libshibsp_lite_la_SOURCES = \ + ${common_sources} \ + lite/CommonDomainCookie.cpp \ + lite/SAMLConstants.cpp + +libshibsp_la_SOURCES = \ + ${common_sources} \ + attribute/Base64AttributeDecoder.cpp \ + attribute/DOMAttributeDecoder.cpp \ + attribute/KeyInfoAttributeDecoder.cpp \ + attribute/NameIDAttributeDecoder.cpp \ + attribute/NameIDFromScopedAttributeDecoder.cpp \ + attribute/ScopedAttributeDecoder.cpp \ + attribute/StringAttributeDecoder.cpp \ + attribute/XMLAttributeDecoder.cpp \ + attribute/filtering/impl/AttributeFilter.cpp \ + attribute/filtering/impl/ChainingAttributeFilter.cpp \ + attribute/filtering/impl/DummyAttributeFilter.cpp \ + attribute/filtering/impl/XMLAttributeFilter.cpp \ + attribute/filtering/impl/BasicFilteringContext.cpp \ + attribute/filtering/impl/MatchFunctor.cpp \ + attribute/filtering/impl/AndMatchFunctor.cpp \ + attribute/filtering/impl/AnyMatchFunctor.cpp \ + attribute/filtering/impl/NotMatchFunctor.cpp \ + attribute/filtering/impl/OrMatchFunctor.cpp \ + attribute/filtering/impl/AttributeIssuerStringFunctor.cpp \ + attribute/filtering/impl/AttributeRequesterStringFunctor.cpp \ + attribute/filtering/impl/AttributeScopeStringFunctor.cpp \ + attribute/filtering/impl/AttributeValueStringFunctor.cpp \ + attribute/filtering/impl/AuthenticationMethodStringFunctor.cpp \ + attribute/filtering/impl/AttributeIssuerRegexFunctor.cpp \ + attribute/filtering/impl/AttributeRequesterRegexFunctor.cpp \ + attribute/filtering/impl/AttributeScopeRegexFunctor.cpp \ + attribute/filtering/impl/AttributeValueRegexFunctor.cpp \ + attribute/filtering/impl/AuthenticationMethodRegexFunctor.cpp \ + attribute/filtering/impl/NameIDQualifierStringFunctor.cpp \ + attribute/filtering/impl/NumberOfAttributeValuesFunctor.cpp \ + attribute/filtering/impl/AttributeIssuerInEntityGroupFunctor.cpp \ + attribute/filtering/impl/AttributeRequesterInEntityGroupFunctor.cpp \ + attribute/filtering/impl/AttributeIssuerEntityAttributeFunctor.cpp \ + attribute/filtering/impl/AttributeRequesterEntityAttributeFunctor.cpp \ + attribute/filtering/impl/AttributeIssuerEntityMatcherFunctor.cpp \ + attribute/filtering/impl/AttributeRequesterEntityMatcherFunctor.cpp \ + attribute/filtering/impl/AttributeScopeMatchesShibMDScopeFunctor.cpp \ + attribute/resolver/impl/ChainingAttributeResolver.cpp \ + attribute/resolver/impl/QueryAttributeResolver.cpp \ + attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp \ + attribute/resolver/impl/AssertionAttributeExtractor.cpp \ + attribute/resolver/impl/ChainingAttributeExtractor.cpp \ + attribute/resolver/impl/DelegationAttributeExtractor.cpp \ + attribute/resolver/impl/KeyDescriptorAttributeExtractor.cpp \ + attribute/resolver/impl/MetadataAttributeExtractor.cpp \ + attribute/resolver/impl/XMLAttributeExtractor.cpp \ + binding/impl/ArtifactResolver.cpp \ + binding/impl/SOAPClient.cpp \ + impl/TransactionLog.cpp \ + impl/XMLSecurityPolicyProvider.cpp \ + metadata/DynamicMetadataProvider.cpp \ + metadata/MetadataExtImpl.cpp \ + metadata/MetadataExtSchemaValidators.cpp \ + metadata/MetadataProviderCriteria.cpp \ + security/PKIXTrustEngine.cpp \ + security/SecurityPolicy.cpp + +# this is different from the project version +# http://sources.redhat.com/autobook/autobook/autobook_91.html +libshibsp_la_LDFLAGS = -version-info 6:6:0 +libshibsp_la_LIBADD = $(XMLSEC_LIBS) +libshibsp_lite_la_LDFLAGS = -version-info 6:6:0 +libshibsp_lite_la_LIBADD = $(LITE_LIBS) +libshibsp_lite_la_CPPFLAGS = -DSHIBSP_LITE + +pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@ +pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@ +logdir = ${localstatedir}/log +rundir = $(localstatedir)/run +cachedir = $(localstatedir)/cache +xmldir = $(datadir)/xml + +paths.h: ${srcdir}/paths.h.in Makefile ${top_builddir}/config.status + rm -f $@.tmp + sed < ${srcdir}/$@.in > $@.tmp \ + -e 's:@-PREFIX-@:${prefix}:g' \ + -e 's:@-LIBDIR-@:${libdir}:g' \ + -e 's:@-SYSCONFDIR-@:${sysconfdir}:g' \ + -e 's:@-LOGDIR-@:${logdir}:g' \ + -e 's:@-RUNDIR-@:${rundir}:g' \ + -e 's:@-CACHEDIR-@:${cachedir}:g' \ + -e 's:@-XMLDIR-@:${xmldir}:g' \ + -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:g' \ + -e 's:@-PKGXMLDIR-@:${pkgxmldir}:g' \ + -e 's:@-XMLTOOLINGXMLDIR-@:${XMLTOOLINGXMLDIR}:g' \ + -e 's:@-OPENSAMLXMLDIR-@:${OPENSAMLXMLDIR}:g' + cmp -s $@ $@.tmp || mv $@.tmp $@ + rm -f $@.tmp + +install-exec-hook: + for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done + +EXTRA_DIST = \ + shibsp.vcxproj \ + shibsp-lite.vcxproj \ + shibsp.vcxproj.filters \ + shibsp-lite.vcxproj.filters \ + config_pub.h.in \ + config_pub_win32.h\ + paths.h.in \ + resource.h \ + shibsp.rc +BUILT_SOURCES = paths.h diff --git a/shibsp/shibsp.rc b/shibsp/shibsp.rc index 709a35e..e6cb963 100644 --- a/shibsp/shibsp.rc +++ b/shibsp/shibsp.rc @@ -1,137 +1,137 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,5,5,0 - PRODUCTVERSION 2,5,5,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "\0" - VALUE "CompanyName", "Shibboleth Consortium\0" -#ifdef SHIBSP_LITE - VALUE "FileDescription", "Shibboleth SP Lite Library\0" -#else - VALUE "FileDescription", "Shibboleth SP Library\0" -#endif - VALUE "FileVersion", "1, 5, 5, 0\0" -#ifdef SHIBSP_LITE -#ifdef _DEBUG - VALUE "InternalName", "shibsp-lite1_5D\0" -#else - VALUE "InternalName", "shibsp-lite1_5\0" -#endif -#else -#ifdef _DEBUG - VALUE "InternalName", "shibsp1_5D\0" -#else - VALUE "InternalName", "shibsp1_5\0" -#endif -#endif - VALUE "LegalCopyright", "Copyright © 2015 UCAID\0" - VALUE "LegalTrademarks", "\0" -#ifdef SHIBSP_LITE -#ifdef _DEBUG - VALUE "OriginalFilename", "shibsp-lite1_5D.dll\0" -#else - VALUE "OriginalFilename", "shibsp-lite1_5.dll\0" -#endif -#else -#ifdef _DEBUG - VALUE "OriginalFilename", "shibsp1_5D.dll\0" -#else - VALUE "OriginalFilename", "shibsp1_5.dll\0" -#endif -#endif - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Shibboleth 2.5.5\0" - VALUE "ProductVersion", "2, 5, 5, 0\0" - VALUE "SpecialBuild", "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,5,6,0 + PRODUCTVERSION 2,5,6,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "\0" + VALUE "CompanyName", "Shibboleth Consortium\0" +#ifdef SHIBSP_LITE + VALUE "FileDescription", "Shibboleth SP Lite Library\0" +#else + VALUE "FileDescription", "Shibboleth SP Library\0" +#endif + VALUE "FileVersion", "1, 5, 6, 0\0" +#ifdef SHIBSP_LITE +#ifdef _DEBUG + VALUE "InternalName", "shibsp-lite1_5D\0" +#else + VALUE "InternalName", "shibsp-lite1_5\0" +#endif +#else +#ifdef _DEBUG + VALUE "InternalName", "shibsp1_5D\0" +#else + VALUE "InternalName", "shibsp1_5\0" +#endif +#endif + VALUE "LegalCopyright", "Copyright © 2016 UCAID\0" + VALUE "LegalTrademarks", "\0" +#ifdef SHIBSP_LITE +#ifdef _DEBUG + VALUE "OriginalFilename", "shibsp-lite1_5D.dll\0" +#else + VALUE "OriginalFilename", "shibsp-lite1_5.dll\0" +#endif +#else +#ifdef _DEBUG + VALUE "OriginalFilename", "shibsp1_5D.dll\0" +#else + VALUE "OriginalFilename", "shibsp1_5.dll\0" +#endif +#endif + VALUE "PrivateBuild", "\0" + VALUE "ProductName", "Shibboleth 2.5.6\0" + VALUE "ProductVersion", "2, 5, 6, 0\0" + VALUE "SpecialBuild", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/shibsp/version.h b/shibsp/version.h index bfc50c5..949e5cc 100644 --- a/shibsp/version.h +++ b/shibsp/version.h @@ -1,80 +1,80 @@ -/** - * Licensed to the University Corporation for Advanced Internet - * Development, Inc. (UCAID) under one or more contributor license - * agreements. See the NOTICE file distributed with this work for - * additional information regarding copyright ownership. - * - * UCAID licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the - * License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific - * language governing permissions and limitations under the License. - */ - -/** - * version.h - * - * Library version macros and constants. - */ - -#ifndef __shibsp_version_h__ -#define __shibsp_version_h__ - -// This is all based on Xerces, on the theory it might be useful to -// support this kind of stuff in the future. If they ever yank some -// of this stuff, it can be copied into here. - -#include -#include - -// --------------------------------------------------------------------------- -// V E R S I O N S P E C I F I C A T I O N - -/** - * MODIFY THESE NUMERIC VALUES TO COINCIDE WITH SHIBSP LIBRARY VERSION - * AND DO NOT MODIFY ANYTHING ELSE IN THIS VERSION HEADER FILE - */ - -#define SHIBSP_VERSION_MAJOR 1 -#define SHIBSP_VERSION_MINOR 5 -#define SHIBSP_VERSION_REVISION 5 - -/** DO NOT MODIFY BELOW THIS LINE */ - -/** - * MAGIC THAT AUTOMATICALLY GENERATES THE FOLLOWING: - * - * gShibSPVersionStr, gShibSPFullVersionStr, gShibSPMajVersion, gShibSPMinVersion, gShibSPRevision - */ - -// --------------------------------------------------------------------------- -// V E R S I O N I N F O R M A T I O N - -// ShibSP version strings; these particular macros cannot be used for -// conditional compilation as they are not numeric constants - -#define SHIBSP_FULLVERSIONSTR INVK_CAT3_SEP_UNDERSCORE(SHIBSP_VERSION_MAJOR,SHIBSP_VERSION_MINOR,SHIBSP_VERSION_REVISION) -#define SHIBSP_FULLVERSIONDOT INVK_CAT3_SEP_PERIOD(SHIBSP_VERSION_MAJOR,SHIBSP_VERSION_MINOR,SHIBSP_VERSION_REVISION) -#define SHIBSP_FULLVERSIONNUM INVK_CAT3_SEP_NIL(SHIBSP_VERSION_MAJOR,SHIBSP_VERSION_MINOR,SHIBSP_VERSION_REVISION) -#define SHIBSP_VERSIONSTR INVK_CAT2_SEP_UNDERSCORE(SHIBSP_VERSION_MAJOR,SHIBSP_VERSION_MINOR) - -extern SHIBSP_API const char* const gShibSPVersionStr; -extern SHIBSP_API const char* const gShibSPFullVersionStr; -extern SHIBSP_API const char* const gShibSPDotVersionStr; -extern SHIBSP_API const unsigned int gShibSPMajVersion; -extern SHIBSP_API const unsigned int gShibSPMinVersion; -extern SHIBSP_API const unsigned int gShibSPRevision; - -// ShibSP version numeric constants that can be used for conditional -// compilation purposes. - -#define _SHIBSP_VERSION CALC_EXPANDED_FORM (SHIBSP_VERSION_MAJOR,SHIBSP_VERSION_MINOR,SHIBSP_VERSION_REVISION) - -#endif /* __shibsp_version_h__ */ +/** + * Licensed to the University Corporation for Advanced Internet + * Development, Inc. (UCAID) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + * + * UCAID licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the + * License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific + * language governing permissions and limitations under the License. + */ + +/** + * version.h + * + * Library version macros and constants. + */ + +#ifndef __shibsp_version_h__ +#define __shibsp_version_h__ + +// This is all based on Xerces, on the theory it might be useful to +// support this kind of stuff in the future. If they ever yank some +// of this stuff, it can be copied into here. + +#include +#include + +// --------------------------------------------------------------------------- +// V E R S I O N S P E C I F I C A T I O N + +/** + * MODIFY THESE NUMERIC VALUES TO COINCIDE WITH SHIBSP LIBRARY VERSION + * AND DO NOT MODIFY ANYTHING ELSE IN THIS VERSION HEADER FILE + */ + +#define SHIBSP_VERSION_MAJOR 1 +#define SHIBSP_VERSION_MINOR 5 +#define SHIBSP_VERSION_REVISION 6 + +/** DO NOT MODIFY BELOW THIS LINE */ + +/** + * MAGIC THAT AUTOMATICALLY GENERATES THE FOLLOWING: + * + * gShibSPVersionStr, gShibSPFullVersionStr, gShibSPMajVersion, gShibSPMinVersion, gShibSPRevision + */ + +// --------------------------------------------------------------------------- +// V E R S I O N I N F O R M A T I O N + +// ShibSP version strings; these particular macros cannot be used for +// conditional compilation as they are not numeric constants + +#define SHIBSP_FULLVERSIONSTR INVK_CAT3_SEP_UNDERSCORE(SHIBSP_VERSION_MAJOR,SHIBSP_VERSION_MINOR,SHIBSP_VERSION_REVISION) +#define SHIBSP_FULLVERSIONDOT INVK_CAT3_SEP_PERIOD(SHIBSP_VERSION_MAJOR,SHIBSP_VERSION_MINOR,SHIBSP_VERSION_REVISION) +#define SHIBSP_FULLVERSIONNUM INVK_CAT3_SEP_NIL(SHIBSP_VERSION_MAJOR,SHIBSP_VERSION_MINOR,SHIBSP_VERSION_REVISION) +#define SHIBSP_VERSIONSTR INVK_CAT2_SEP_UNDERSCORE(SHIBSP_VERSION_MAJOR,SHIBSP_VERSION_MINOR) + +extern SHIBSP_API const char* const gShibSPVersionStr; +extern SHIBSP_API const char* const gShibSPFullVersionStr; +extern SHIBSP_API const char* const gShibSPDotVersionStr; +extern SHIBSP_API const unsigned int gShibSPMajVersion; +extern SHIBSP_API const unsigned int gShibSPMinVersion; +extern SHIBSP_API const unsigned int gShibSPRevision; + +// ShibSP version numeric constants that can be used for conditional +// compilation purposes. + +#define _SHIBSP_VERSION CALC_EXPANDED_FORM (SHIBSP_VERSION_MAJOR,SHIBSP_VERSION_MINOR,SHIBSP_VERSION_REVISION) + +#endif /* __shibsp_version_h__ */ diff --git a/util/mdquery.rc b/util/mdquery.rc index ccc6d41..38c1a2a 100644 --- a/util/mdquery.rc +++ b/util/mdquery.rc @@ -1,109 +1,109 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,5,5,0 - PRODUCTVERSION 2,5,5,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "\0" - VALUE "CompanyName", "Shibboleth Consortium\0" - VALUE "FileDescription", "Metadata Query Utility\0" - VALUE "FileVersion", "2, 5, 5, 0\0" - VALUE "InternalName", "mdquery\0" - VALUE "LegalCopyright", "Copyright © 2015 UCAID\0" - VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename", "mdquery.exe\0" - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Shibboleth 2.5.5\0" - VALUE "ProductVersion", "2, 5, 5, 0\0" - VALUE "SpecialBuild", "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 2,5,6,0 + PRODUCTVERSION 2,5,6,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "\0" + VALUE "CompanyName", "Shibboleth Consortium\0" + VALUE "FileDescription", "Metadata Query Utility\0" + VALUE "FileVersion", "2, 5, 6, 0\0" + VALUE "InternalName", "mdquery\0" + VALUE "LegalCopyright", "Copyright © 2016 UCAID\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "mdquery.exe\0" + VALUE "PrivateBuild", "\0" + VALUE "ProductName", "Shibboleth 2.5.6\0" + VALUE "ProductVersion", "2, 5, 6, 0\0" + VALUE "SpecialBuild", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/util/resolvertest.rc b/util/resolvertest.rc index c627f49..0eb6a70 100644 --- a/util/resolvertest.rc +++ b/util/resolvertest.rc @@ -1,109 +1,109 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,5,5,0 - PRODUCTVERSION 2,5,5,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "\0" - VALUE "CompanyName", "Shibboleth Consortium\0" - VALUE "FileDescription", "Attribute Resolver Utility\0" - VALUE "FileVersion", "2, 5, 5, 0\0" - VALUE "InternalName", "resolvertest\0" - VALUE "LegalCopyright", "Copyright © 2015 UCAID\0" - VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename", "resolvertest.exe\0" - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Shibboleth 2.5.5\0" - VALUE "ProductVersion", "2, 5, 5, 0\0" - VALUE "SpecialBuild", "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 2,5,6,0 + PRODUCTVERSION 2,5,6,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "\0" + VALUE "CompanyName", "Shibboleth Consortium\0" + VALUE "FileDescription", "Attribute Resolver Utility\0" + VALUE "FileVersion", "2, 5, 6, 0\0" + VALUE "InternalName", "resolvertest\0" + VALUE "LegalCopyright", "Copyright © 2016 UCAID\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "resolvertest.exe\0" + VALUE "PrivateBuild", "\0" + VALUE "ProductName", "Shibboleth 2.5.6\0" + VALUE "ProductVersion", "2, 5, 6, 0\0" + VALUE "SpecialBuild", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED +