From: cantor Date: Sun, 20 May 2007 20:20:57 +0000 (+0000) Subject: Start to clean up Unix build. X-Git-Tag: 2.4~935 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fsp.git;a=commitdiff_plain;h=ab615f1b0bdce02fd4a4f15fdbd11e16b0a7233b Start to clean up Unix build. git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2252 cb58f699-b61c-0410-a6fe-9272a202ed29 --- diff --git a/Makefile.am b/Makefile.am index be61416..0c64f62 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,21 +3,18 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I . EXTRA_DIST = \ - schemas doc isapi_shib isapi_shib_gui \ - Shibboleth.sln libtool.m4 acx_pthread.m4 acx_rpctest.m4 depcomp \ + isapi_shib isapi_shib_gui \ + Shibboleth.sln libtool.m4 acx_pthread.m4 depcomp \ config_win32.h shibboleth.spec.in shibboleth.spec pkginfo.in pkginfo checkinstall dist-hook: - rm -rf `find $(distdir)/schemas -name Makefile` rm -rf `find $(distdir)/configs -name Makefile` - rm -rf `find $(distdir)/doc -name Makefile` WANT_SUBDIRS = @WANT_SUBDIRS@ SUBDIRS = $(WANT_SUBDIRS) -DIST_SUBDIRS = doc schemas configs shibsp shibd util \ - apache siterefresh odbc-store nsapi_shib selinux +DIST_SUBDIRS = doc schemas configs shibsp shibd util apache odbc-store nsapi_shib selinux all-local: shibboleth.spec pkginfo diff --git a/Shibboleth.sln b/Shibboleth.sln index ce1151c..f904e1d 100644 --- a/Shibboleth.sln +++ b/Shibboleth.sln @@ -42,12 +42,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nsapi_shib", "nsapi_shib\ns {81F0F7A6-DC36-46EF-957F-F9E81D4403F7} = {81F0F7A6-DC36-46EF-957F-F9E81D4403F7} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "siterefresh", "siterefresh\siterefresh.vcproj", "{4D02F36E-D2CD-4FD1-AC50-2941E27BB3FB}" - ProjectSection(WebsiteProperties) = preProject - Debug.AspNetCompiler.Debug = "True" - Release.AspNetCompiler.Debug = "False" - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_shib22", "apache\mod_shib22.vcproj", "{B44C0852-83B8-4FB2-A86E-097C9C8256D0}" ProjectSection(WebsiteProperties) = preProject Debug.AspNetCompiler.Debug = "True" @@ -111,6 +105,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shibsp-lite", "shibsp\shibs Release.AspNetCompiler.Debug = "False" EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "siterefresh", "util\siterefresh.vcproj", "{4D02F36E-D2CD-4FD1-AC50-2941E27BB3FB}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -137,10 +137,6 @@ Global {1396D80A-8672-4224-9B02-95F3F4207CDB}.Debug|Win32.Build.0 = Debug|Win32 {1396D80A-8672-4224-9B02-95F3F4207CDB}.Release|Win32.ActiveCfg = Release|Win32 {1396D80A-8672-4224-9B02-95F3F4207CDB}.Release|Win32.Build.0 = Release|Win32 - {4D02F36E-D2CD-4FD1-AC50-2941E27BB3FB}.Debug|Win32.ActiveCfg = Debug|Win32 - {4D02F36E-D2CD-4FD1-AC50-2941E27BB3FB}.Debug|Win32.Build.0 = Debug|Win32 - {4D02F36E-D2CD-4FD1-AC50-2941E27BB3FB}.Release|Win32.ActiveCfg = Release|Win32 - {4D02F36E-D2CD-4FD1-AC50-2941E27BB3FB}.Release|Win32.Build.0 = Release|Win32 {B44C0852-83B8-4FB2-A86E-097C9C8256D0}.Debug|Win32.ActiveCfg = Debug|Win32 {B44C0852-83B8-4FB2-A86E-097C9C8256D0}.Debug|Win32.Build.0 = Debug|Win32 {B44C0852-83B8-4FB2-A86E-097C9C8256D0}.Release|Win32.ActiveCfg = Release|Win32 @@ -165,6 +161,10 @@ Global {81F0F7A6-DC36-46EF-957F-F9E81D4403F7}.Debug|Win32.Build.0 = Debug|Win32 {81F0F7A6-DC36-46EF-957F-F9E81D4403F7}.Release|Win32.ActiveCfg = Release|Win32 {81F0F7A6-DC36-46EF-957F-F9E81D4403F7}.Release|Win32.Build.0 = Release|Win32 + {4D02F36E-D2CD-4FD1-AC50-2941E27BB3FB}.Debug|Win32.ActiveCfg = Debug|Win32 + {4D02F36E-D2CD-4FD1-AC50-2941E27BB3FB}.Debug|Win32.Build.0 = Debug|Win32 + {4D02F36E-D2CD-4FD1-AC50-2941E27BB3FB}.Release|Win32.ActiveCfg = Release|Win32 + {4D02F36E-D2CD-4FD1-AC50-2941E27BB3FB}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -177,7 +177,7 @@ Global {87C25D4E-8D19-4513-B0BA-BC668BC2DEE3} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050} {D341DCD8-7DCD-43A2-8559-C07DAB838711} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C} {666A63A7-983F-4C19-8411-207F24305197} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C} - {4D02F36E-D2CD-4FD1-AC50-2941E27BB3FB} = {FED80230-119E-4B2F-9F53-D2660A5F022B} {F13141B6-6C87-40BB-8D4E-5CC56EBB4C59} = {FED80230-119E-4B2F-9F53-D2660A5F022B} + {4D02F36E-D2CD-4FD1-AC50-2941E27BB3FB} = {FED80230-119E-4B2F-9F53-D2660A5F022B} EndGlobalSection EndGlobal diff --git a/apache/mod_apache.cpp b/apache/mod_apache.cpp index aac8ac4..4b2b9c8 100644 --- a/apache/mod_apache.cpp +++ b/apache/mod_apache.cpp @@ -22,6 +22,8 @@ * $Id$ */ +#define SHIBSP_LITE + #ifdef SOLARIS2 #undef _XOPEN_SOURCE // causes gethostname conflict in unistd.h #endif diff --git a/apache/mod_shib13.vcproj b/apache/mod_shib13.vcproj index 9eb86d2..4e6dc74 100644 --- a/apache/mod_shib13.vcproj +++ b/apache/mod_shib13.vcproj @@ -49,7 +49,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..;\Apache\include;"..\..\cpp-xmltooling"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;EAPI;SHIBSP_LITE" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;EAPI" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -145,7 +145,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..;\Apache\include;"..\..\cpp-xmltooling"" - PreprocessorDefinitions="_WINDOWS;EAPI;WIN32;_DEBUG;SHIBSP_LITE" + PreprocessorDefinitions="_WINDOWS;EAPI;WIN32;_DEBUG" BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="true" diff --git a/apache/mod_shib20.vcproj b/apache/mod_shib20.vcproj index fbcba3c..662a4a1 100644 --- a/apache/mod_shib20.vcproj +++ b/apache/mod_shib20.vcproj @@ -49,7 +49,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..;\Apache2\include;"..\..\cpp-xmltooling"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;SHIBSP_LITE" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -145,7 +145,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..;\Apache2\include;"..\..\cpp-xmltooling"" - PreprocessorDefinitions="_WINDOWS;WIN32;_DEBUG;SHIBSP_LITE" + PreprocessorDefinitions="_WINDOWS;WIN32;_DEBUG" BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="true" diff --git a/apache/mod_shib22.vcproj b/apache/mod_shib22.vcproj index 77bba35..80e8921 100644 --- a/apache/mod_shib22.vcproj +++ b/apache/mod_shib22.vcproj @@ -49,7 +49,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..;\Apache22\include;"..\..\cpp-xmltooling"" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;SHIBSP_LITE" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -146,7 +146,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..;\Apache22D\include;"..\..\cpp-xmltooling"" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;SHIBSP_LITE" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" diff --git a/configure.ac b/configure.ac index 94a006c..dd0c0da 100644 --- a/configure.ac +++ b/configure.ac @@ -11,30 +11,40 @@ AC_ARG_ENABLE(debug, enable_debug=$enableval, enable_debug=no) if test "$enable_debug" = "yes" ; then - GCC_CFLAGS="$CFLAGS -Wall -g -D_DEBUG" - GCC_CXXFLAGS="$CXXFLAGS -Wall -g -D_DEBUG" + GCC_CFLAGS="$CFLAGS -g -D_DEBUG" + GCC_CXXFLAGS="$CXXFLAGS -g -D_DEBUG" else - GCC_CFLAGS="$CFLAGS -Wall -O2 -DNDEBUG" - GCC_CXXFLAGS="$CXXFLAGS -Wall -O2 -DNDEBUG" + GCC_CFLAGS="$CFLAGS -O2 -DNDEBUG" + GCC_CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG" fi AC_PROG_CC([gcc gcc3 cc]) AC_PROG_CXX([g++ g++3 c++ CC]) if test "$GCC" = "yes" ; then - CFLAGS="$GCC_CFLAGS" - CXXFLAGS="$GCC_CXXFLAGS" +# 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" +else +# Fix for Sun Workshop compiler in debug mode, may be Sun case #6360993 + case "${host_cpu}-${host_os}" in + *solaris*) + if test "$CXX" = "CC" ; then + CXXFLAGS="$CXXFLAGS -Qoption ccfe -stabs=no%dfltlit+no%dflthlp" + fi + ;; + esac fi AC_DISABLE_STATIC AC_PROG_LIBTOOL -AC_LANG(C++) - -# C++ requirements -AC_CXX_REQUIRE_STL -AC_CXX_NAMESPACES - AC_LANG(C) # Checks for typedefs, structures, and compiler characteristics. @@ -47,12 +57,6 @@ AC_FUNC_STRFTIME AC_FUNC_STRERROR_R AC_CHECK_FUNCS([strchr strdup strstr gmtime_r ctime_r strtok_r strcasecmp]) -# old_LIBS="$LIBS" -# AC_SEARCH_LIBS(xdr_uint64_t,nsl,, -# [CFLAGS="$CFLAGS -DNEED_XDR_LONGLONG" -# CXXFLAGS="$CXXFLAGS -DNEED_XDR_LONGLONG"]) -# LIBS="$old_LIBS" - # checks for pthreads ACX_PTHREAD([enable_threads="pthread"],[enable_threads="no"]) if test $enable_threads != "pthread"; then @@ -66,6 +70,10 @@ fi AC_LANG(C++) +# C++ requirements +AC_CXX_REQUIRE_STL +AC_CXX_NAMESPACES + # log4cpp settings AC_PATH_PROG(LOG4CPP_CONFIG,log4cpp-config) AC_ARG_WITH(log4cpp, @@ -121,33 +129,46 @@ if test x_$with_xmlsec != x_/usr; then LDFLAGS="-L${with_xmlsec}/lib $LDFLAGS" CPPFLAGS="-I${with_xmlsec}/include $CPPFLAGS" fi -LIBS="-lxml-security-c $LIBS" +XMLSEC_LIBS="-lxml-security-c" + +# 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 header files])) AC_MSG_CHECKING([XML-Security version]) AC_PREPROC_IFELSE( [AC_LANG_PROGRAM([#include ], - [#if XSEC_VERSION_MAJOR > 1 || XSEC_VERSION_MEDIUM >2 + [#if XSEC_VERSION_MAJOR > 1 || (XSEC_VERSION_MAJOR == 1 && XSEC_VERSION_MEDIUM > 3) || (XSEC_VERSION_MAJOR == 1 && XSEC_VERSION_MEDIUM == 3 && XSEC_VERSION_MINOR > 0) int i = 0; #else -#error need version 1.3 or later +#error need version 1.3.1 or later #endif])], [AC_MSG_RESULT(OK)], - [AC_MSG_FAILURE([XML-Security version 1.3 or greater is required.])]) + [AC_MSG_FAILURE([XML-Security version 1.3.1 or greater is required.])]) AC_TRY_LINK( [#include ], [XSECPlatformUtils::Initialise()],, [AC_MSG_ERROR([unable to link with XML-Sec])]) +# restore master libs +LIBS="$save_LIBS" + # OpenSAML settings AC_ARG_WITH(saml, - AC_HELP_STRING([--with-saml=PATH], [where saml is installed]), - [if test x_$with_saml != x_/usr; then - LDFLAGS="-L${with_saml}/lib $LDFLAGS" - CPPFLAGS="-I${with_saml}/include $CPPFLAGS" - fi]) + AC_HELP_STRING([--with-saml=PATH], [where saml is installed]), + [if test x_$with_saml != x_/usr; then + LDFLAGS="-L${with_saml}/lib $LDFLAGS" + CPPFLAGS="-I${with_saml}/include $CPPFLAGS" + fi]) +XMLSEC_LIBS="-lsaml $XMLSEC_LIBS" + +# save and append master libs +save_LIBS="$LIBS" +LIBS="$XMLSEC_LIBS $LIBS" + AC_CHECK_HEADER([saml/saml.h],, AC_MSG_ERROR([unable to find saml header files])) -LIBS="-lsaml $LIBS" AC_TRY_LINK( [#include #include ], @@ -159,12 +180,16 @@ opensaml::SAMLConfig::getConfig(); [AC_DEFINE(HAVE_SAML,1,[Define if saml library was found])], [AC_MSG_ERROR([unable to link with OpenSAML, or version was too old])]) +# restore master libs +LIBS="$save_LIBS" + +AC_SUBST(XMLSEC_LIBS) + # output the underlying makefiles -WANT_SUBDIRS="doc schemas configs shibsp shibd siterefresh test" +WANT_SUBDIRS="doc schemas configs shibsp shibd siterefresh util" AC_CONFIG_FILES([Makefile doc/Makefile schemas/Makefile \ - configs/Makefile shibsp/Makefile shibd/Makefile siterefresh/Makefile \ - util/Makefile selinux/Makefile]) - + configs/Makefile shibsp/Makefile shibd/Makefile siterefresh/Makefile \ + util/Makefile selinux/Makefile]) # # Build NSAPI module? @@ -525,100 +550,100 @@ fi # 3) If the user specifically requested no-odbc, don't build it. # -AC_CONFIG_FILES([odbc_ccache/Makefile]) +#AC_CONFIG_FILES([odbc_ccache/Makefile]) # determine whether we should enable the odbc ccache -AC_ARG_ENABLE([odbc], - AC_HELP_STRING([--disable-odbc], [disable the ODBC Credential Cache]), - [odbc_enabled=$enableval], [odbc_enabled=default]) +#AC_ARG_ENABLE([odbc], +# AC_HELP_STRING([--disable-odbc], [disable the ODBC Credential Cache]), +# [odbc_enabled=$enableval], [odbc_enabled=default]) -if test "x$odbc_enabled" = "x" ; then - odbc_enabled=yes -fi +#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 ccache) -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 +#AC_MSG_CHECKING(whether to build the ODBC ccache) +#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, - AC_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" - fi ]) +#if test "$build_odbc" = "yes" ; then +# odbc_dir="" +# AC_ARG_WITH(odbc, +# AC_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" +# fi ]) # Try to find the mysql_config program - AC_PATH_PROG(ODBC_CONFIG, odbc_config, no, $odbc_dir $PATH ) - - if test "$ODBC_CONFIG" = no ; then - if test "$odbc_enabled" = "yes" ; then - AC_MSG_ERROR(Cannot find odbc_config) - else - AC_MSG_WARN(ODBC not found, skipping.) - fi - fi -fi - -if test "$build_odbc" = yes ; then - ODBC_CFLAGS=`$ODBC_CONFIG --cflags` - ODBC_CFLAGS=`eval echo $ODBC_CFLAGS` - ODBC_LIBS=`$ODBC_CONFIG --libs` - ODBC_LIBS=`eval echo $ODBC_LIBS` - - 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_TRY_LINK( - [#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 +# AC_PATH_PROG(ODBC_CONFIG, odbc_config, no, $odbc_dir $PATH ) + +# if test "$ODBC_CONFIG" = no ; then +# if test "$odbc_enabled" = "yes" ; then +# AC_MSG_ERROR(Cannot find odbc_config) +# else +# AC_MSG_WARN(ODBC not found, skipping.) +# fi +# fi +#fi + +#if test "$build_odbc" = yes ; then +# ODBC_CFLAGS=`$ODBC_CONFIG --cflags` +# ODBC_CFLAGS=`eval echo $ODBC_CFLAGS` +# ODBC_LIBS=`$ODBC_CONFIG --libs` +# ODBC_LIBS=`eval echo $ODBC_LIBS` + +# 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_TRY_LINK( +# [#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_ccache" - AC_SUBST(ODBC_CFLAGS) - AC_SUBST(ODBC_LIBS) -fi +#if test "$have_odbc_libs" = yes ; then +# # this AC_MSG_RESULT is from above! +# AC_MSG_RESULT(yes) +# WANT_SUBDIRS="$WANT_SUBDIRS odbc_ccache" +# AC_SUBST(ODBC_CFLAGS) +# AC_SUBST(ODBC_LIBS) +#fi AC_SUBST(WANT_SUBDIRS) @@ -637,7 +662,7 @@ fi if test -n "$APXS2_CC" && test "$APXS2_CC" != "$CC" ; then echo "==================================================================" - echo "WARNING: You have chosen to compile Apache-2 modules with a different" + 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" @@ -647,6 +672,18 @@ if test -n "$APXS2_CC" && test "$APXS2_CC" != "$CC" ; then 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 + LIBTOOL="$LIBTOOL --silent" AC_OUTPUT diff --git a/doc/Makefile.am b/doc/Makefile.am index a1428af..d94c2c4 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,7 +1,8 @@ AUTOMAKE_OPTIONS = foreign pkgdocdir = $(prefix)/doc/@PACKAGE@ -pkgdoc_DATA = \ + +docfiles = \ CREDITS.txt \ INSTALL.txt \ INSTALL-WIN32.txt \ @@ -13,4 +14,9 @@ pkgdoc_DATA = \ LOG4CPP.LICENSE \ mysql-4.0.12.diff \ main.css \ - logo.jpg \ No newline at end of file + logo.jpg + +pkgdoc_DATA = $(docfiles) + +EXTRA_DIST = $(docfiles) + diff --git a/isapi_shib/isapi_shib.cpp b/isapi_shib/isapi_shib.cpp index 55ab971..9bc2e45 100644 --- a/isapi_shib/isapi_shib.cpp +++ b/isapi_shib/isapi_shib.cpp @@ -20,6 +20,7 @@ * Shibboleth ISAPI filter */ +#define SHIBSP_LITE #include "config_win32.h" #define _CRT_NONSTDC_NO_DEPRECATE 1 diff --git a/isapi_shib/isapi_shib.vcproj b/isapi_shib/isapi_shib.vcproj index c482b38..2a786ef 100644 --- a/isapi_shib/isapi_shib.vcproj +++ b/isapi_shib/isapi_shib.vcproj @@ -49,7 +49,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories=".;..;"..\..\cpp-xmltooling"" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;SHIBSP_LITE;WIN32_LEAN_AND_MEAN" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -147,7 +147,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..;"..\..\cpp-xmltooling"" - PreprocessorDefinitions="_WINDOWS;WIN32;_DEBUG;SHIBSP_LITE;WIN32_LEAN_AND_MEAN" + PreprocessorDefinitions="_WINDOWS;WIN32;_DEBUG;WIN32_LEAN_AND_MEAN" BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="true" diff --git a/nsapi_shib/nsapi_shib.cpp b/nsapi_shib/nsapi_shib.cpp index 4ed4191..55a53da 100644 --- a/nsapi_shib/nsapi_shib.cpp +++ b/nsapi_shib/nsapi_shib.cpp @@ -20,6 +20,8 @@ * Shibboleth NSAPI filter */ +#define SHIBSP_LITE + #if defined (_MSC_VER) || defined(__BORLANDC__) # include "config_win32.h" #else diff --git a/nsapi_shib/nsapi_shib.vcproj b/nsapi_shib/nsapi_shib.vcproj index c51d4ef..0267d9f 100644 --- a/nsapi_shib/nsapi_shib.vcproj +++ b/nsapi_shib/nsapi_shib.vcproj @@ -49,7 +49,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories=".;..;"..\..\cpp-xmltooling"" - PreprocessorDefinitions="NDEBUG;_WINDOWS;WIN32;SHIBSP_LITE" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WIN32" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -145,7 +145,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..;"..\..\cpp-xmltooling"" - PreprocessorDefinitions="_WINDOWS;WIN32;_DEBUG;SHIBSP_LITE" + PreprocessorDefinitions="_WINDOWS;WIN32;_DEBUG" BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="true" diff --git a/schemas/Makefile.am b/schemas/Makefile.am index 7edc155..5827db9 100644 --- a/schemas/Makefile.am +++ b/schemas/Makefile.am @@ -4,8 +4,7 @@ AUTOMAKE_OPTIONS = foreign pkgxmldir = $(datadir)/xml/@PACKAGE@ -pkgxml_DATA = \ - catalog.xml \ +schemafiles = \ shibboleth.xsd \ shibboleth-metadata-1.0.xsd \ shibboleth-2.0-native-sp-config-2.0.xsd \ @@ -18,6 +17,10 @@ pkgxml_DATA = \ metadata_v13_to_v12.xsl \ trust_v13_to_v12.xsl +pkgxml_DATA = \ + catalog.xml \ + $(schemafiles) + # # Some of these need building # @@ -33,4 +36,5 @@ catalog.xml: ${srcdir}/catalog.xml.in Makefile ${top_builddir}/config.status CLEANFILES = catalog.xml -EXTRA_DIST = catalog.xml.in +EXTRA_DIST = catalog.xml.in \ + $(schemafiles) diff --git a/shibd/shibd.vcproj b/shibd/shibd.vcproj index 9786387..edef39e 100644 --- a/shibd/shibd.vcproj +++ b/shibd/shibd.vcproj @@ -67,7 +67,7 @@ />