From b830a7dc85139d478e13aac241ab3ed0c0a27354 Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Tue, 13 Dec 2011 15:59:49 -0500 Subject: [PATCH] autoreconf --- Makefile.in | 16 +++++----------- config.h.in | 12 ++++++++++++ configs/Makefile.in | 7 +++---- configure | 41 ++++++++++++++++++++--------------------- doc/Makefile.in | 50 ++++++++++++++++++++++++++++++++++++-------------- shibsp/Makefile.in | 12 +++++++++++- 6 files changed, 87 insertions(+), 51 deletions(-) diff --git a/Makefile.in b/Makefile.in index 7406d91..2008d21 100644 --- a/Makefile.in +++ b/Makefile.in @@ -64,9 +64,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/Portfile.in \ - $(srcdir)/config.h.in $(srcdir)/doxygen.am \ - $(srcdir)/pkginfo.in $(srcdir)/shibboleth.spec.in \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(srcdir)/doxygen.am $(srcdir)/shibboleth.spec.in \ $(top_srcdir)/configure build-aux/config.guess \ build-aux/config.sub build-aux/depcomp build-aux/install-sh \ build-aux/ltmain.sh build-aux/missing @@ -83,7 +82,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h $(top_builddir)/shibsp/config_pub.h -CONFIG_CLEAN_FILES = shibboleth.spec pkginfo Portfile +CONFIG_CLEAN_FILES = shibboleth.spec CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = @@ -359,14 +358,13 @@ DIST_SUBDIRS = \ memcache-store \ selinux -GENFILES = @PACKAGE_NAME@.spec pkginfo Portfile +GENFILES = @PACKAGE_NAME@.spec EXTRA_DIST = $(DX_CONFIG) \ isapi_shib \ Shibboleth.sln \ config_win32.h \ $(GENFILES) \ - $(GENFILES:%=%.in) \ - postinstall + $(GENFILES:%=%.in) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -425,10 +423,6 @@ distclean-hdr: -rm -f config.h stamp-h1 shibboleth.spec: $(top_builddir)/config.status $(srcdir)/shibboleth.spec.in cd $(top_builddir) && $(SHELL) ./config.status $@ -pkginfo: $(top_builddir)/config.status $(srcdir)/pkginfo.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -Portfile: $(top_builddir)/config.status $(srcdir)/Portfile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -rm -f *.lo diff --git a/config.h.in b/config.h.in index f7534ad..c4d0a33 100644 --- a/config.h.in +++ b/config.h.in @@ -13,9 +13,18 @@ /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H +/* Define to 1 if you have the `getgrnam' function. */ +#undef HAVE_GETGRNAM + +/* Define to 1 if you have the `getpwnam' function. */ +#undef HAVE_GETPWNAM + /* Define to 1 if you have the `gmtime_r' function. */ #undef HAVE_GMTIME_R +/* Define to 1 if you have the header file. */ +#undef HAVE_GRP_H + /* Define to 1 if GSS-API composite name import is available. */ #undef HAVE_GSSAPI_COMPOSITE_NAME @@ -47,6 +56,9 @@ /* Define if you have POSIX threads libraries and header files. */ #undef HAVE_PTHREAD +/* Define to 1 if you have the header file. */ +#undef HAVE_PWD_H + /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H diff --git a/configs/Makefile.in b/configs/Makefile.in index 4386bfe..171a64d 100644 --- a/configs/Makefile.in +++ b/configs/Makefile.in @@ -255,9 +255,9 @@ top_srcdir = @top_srcdir@ xs = @xs@ AUTOMAKE_OPTIONS = foreign pkglogdir = ${localstatedir}/log/@PACKAGE@ -pkgdocdir = ${datadir}/doc/@PACKAGE@ shirelogdir = ${localstatedir}/log/apache2 pkgxmldir = $(datadir)/xml/@PACKAGE@ +pkgwebdir = $(datadir)/@PACKAGE@ pkgrundir = $(localstatedir)/run/@PACKAGE@ pkgsysconfdir = $(sysconfdir)/@PACKAGE@ pkgsysconf_DATA = \ @@ -299,7 +299,7 @@ CONFIGFILES = \ metadataError.html \ bindingTemplate.html \ discoveryTemplate.html \ - postTemplate.html \ + postTemplate.html \ localLogout.html \ globalLogout.html \ partialLogout.html \ @@ -554,8 +554,8 @@ do-build-file: -e 's:@-PREFIX-@:${prefix}:g' \ -e 's:@-PKGLIBDIR-@:${pkglibdir}:g' \ -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:g' \ - -e 's:@-PKGDOCDIR-@:${pkgdocdir}:g' \ -e 's:@-PKGXMLDIR-@:${pkgxmldir}:g' \ + -e 's:@-PKGWEBDIR-@:${pkgwebdir}:g' \ -e 's:@-PKGLOGDIR-@:${pkglogdir}:g' \ -e 's:@-SHIRELOGDIR-@:${shirelogdir}:g' \ -e 's:@-PKGRUNDIR-@:${pkgrundir}:g' @@ -593,7 +593,6 @@ all-data-local: $(BUILTCONFIGFILES) install-data-local: all-data-local $(mkinstalldirs) $(DESTDIR)$(pkglogdir) - $(mkinstalldirs) $(DESTDIR)$(pkgdocdir) $(mkinstalldirs) $(DESTDIR)$(shirelogdir) $(mkinstalldirs) $(DESTDIR)$(pkgrundir) $(mkinstalldirs) $(DESTDIR)$(pkgxmldir) diff --git a/configure b/configure index 21fb8e8..7ea4018 100755 --- a/configure +++ b/configure @@ -2,7 +2,7 @@ # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.67 for shibboleth 2.5. # -# Report bugs to . +# Report bugs to . # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -239,7 +239,7 @@ fi $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: https://bugs.internet2.edu/ about your system, +$0: https://issues.shibboleth.net/ about your system, $0: including any error possibly output before this $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." @@ -564,7 +564,7 @@ PACKAGE_NAME='shibboleth' PACKAGE_TARNAME='shibboleth' PACKAGE_VERSION='2.5' PACKAGE_STRING='shibboleth 2.5' -PACKAGE_BUGREPORT='https://bugs.internet2.edu/' +PACKAGE_BUGREPORT='https://issues.shibboleth.net/' PACKAGE_URL='' ac_unique_file="shibsp" @@ -1573,7 +1573,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to . +Report bugs to . _ACEOF ac_status=$? fi @@ -2202,9 +2202,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ------------------------------------------ ## -## Report this to https://bugs.internet2.edu/ ## -## ------------------------------------------ ##" +( $as_echo "## --------------------------------------------- ## +## Report this to https://issues.shibboleth.net/ ## +## --------------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -2293,9 +2293,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ------------------------------------------ ## -## Report this to https://bugs.internet2.edu/ ## -## ------------------------------------------ ##" +( $as_echo "## --------------------------------------------- ## +## Report this to https://issues.shibboleth.net/ ## +## --------------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -13660,7 +13660,7 @@ fi ac_config_headers="$ac_config_headers config.h shibsp/config_pub.h" -ac_config_files="$ac_config_files shibboleth.spec pkginfo Portfile" +ac_config_files="$ac_config_files shibboleth.spec" ac_ext=c @@ -18032,19 +18032,20 @@ $as_echo "#define STRERROR_R_CHAR_P 1" >>confdefs.h fi -for ac_header in sys/utsname.h +for ac_header in sys/utsname.h grp.h pwd.h do : - ac_fn_c_check_header_mongrel "$LINENO" "sys/utsname.h" "ac_cv_header_sys_utsname_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_utsname_h" = x""yes; then : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_UTSNAME_H 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi done -for ac_func in strchr strdup strstr timegm gmtime_r strtok_r strcasecmp +for ac_func in strchr strdup strstr timegm gmtime_r strtok_r strcasecmp getpwnam getgrnam do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -19092,7 +19093,7 @@ main () #if _XMLTOOLING_VERSION >= 10500 xmltooling::XMLToolingConfig::getConfig(); #else -#error Need XMLTooling version 1.4 or higher +#error Need XMLTooling version 1.5 or higher #endif ; return 0; @@ -19162,7 +19163,7 @@ main () #if _OPENSAML_VERSION >= 20500 opensaml::SAMLConfig::getConfig(); #else -#error Need OpenSAML version 2.4 or higher +#error Need OpenSAML version 2.5 or higher #endif ; return 0; @@ -21481,7 +21482,7 @@ $config_headers Configuration commands: $config_commands -Report bugs to ." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -21998,8 +21999,6 @@ do "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "shibsp/config_pub.h") CONFIG_HEADERS="$CONFIG_HEADERS shibsp/config_pub.h" ;; "shibboleth.spec") CONFIG_FILES="$CONFIG_FILES shibboleth.spec" ;; - "pkginfo") CONFIG_FILES="$CONFIG_FILES pkginfo" ;; - "Portfile") CONFIG_FILES="$CONFIG_FILES Portfile" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "schemas/Makefile") CONFIG_FILES="$CONFIG_FILES schemas/Makefile" ;; diff --git a/doc/Makefile.in b/doc/Makefile.in index f0aeada..65cf918 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -72,8 +72,8 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdocdir)" -DATA = $(pkgdoc_DATA) +am__installdirs = "$(DESTDIR)$(pkgdocdir)" "$(DESTDIR)$(pkgwebdir)" +DATA = $(pkgdoc_DATA) $(pkgweb_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -255,6 +255,7 @@ top_srcdir = @top_srcdir@ xs = @xs@ AUTOMAKE_OPTIONS = foreign pkgdocdir = $(datadir)/doc/@PACKAGE@-@PACKAGE_VERSION@ +pkgwebdir = $(datadir)/@PACKAGE@ docfiles = \ CREDITS.txt \ LICENSE.txt \ @@ -263,12 +264,12 @@ docfiles = \ RELEASE.txt \ FASTCGI.LICENSE \ OPENSSL.LICENSE \ - LOG4CPP.LICENSE \ - main.css \ - logo.jpg + LOG4CPP.LICENSE +webfiles = main.css logo.jpg pkgdoc_DATA = $(docfiles) -EXTRA_DIST = $(docfiles) api +pkgweb_DATA = $(webfiles) +EXTRA_DIST = $(docfiles) $(webfiles) api all: all-am .SUFFIXES: @@ -328,6 +329,26 @@ uninstall-pkgdocDATA: test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(pkgdocdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(pkgdocdir)" && rm -f $$files +install-pkgwebDATA: $(pkgweb_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgwebdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgwebdir)" + @list='$(pkgweb_DATA)'; test -n "$(pkgwebdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgwebdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgwebdir)" || exit $$?; \ + done + +uninstall-pkgwebDATA: + @$(NORMAL_UNINSTALL) + @list='$(pkgweb_DATA)'; test -n "$(pkgwebdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgwebdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgwebdir)" && rm -f $$files tags: TAGS TAGS: @@ -369,7 +390,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdocdir)"; do \ + for dir in "$(DESTDIR)$(pkgdocdir)" "$(DESTDIR)$(pkgwebdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -417,7 +438,7 @@ info: info-am info-am: -install-data-am: install-pkgdocDATA +install-data-am: install-pkgdocDATA install-pkgwebDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-am @@ -462,7 +483,7 @@ ps: ps-am ps-am: -uninstall-am: uninstall-pkgdocDATA +uninstall-am: uninstall-pkgdocDATA uninstall-pkgwebDATA .MAKE: install-am install-data-am install-strip @@ -472,11 +493,12 @@ uninstall-am: uninstall-pkgdocDATA install-data install-data-am install-data-hook install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkgdocDATA install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-pkgdocDATA + install-pdf install-pdf-am install-pkgdocDATA \ + install-pkgwebDATA install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-pkgdocDATA uninstall-pkgwebDATA install-data-hook: diff --git a/shibsp/Makefile.in b/shibsp/Makefile.in index 1e12630..55bef2f 100644 --- a/shibsp/Makefile.in +++ b/shibsp/Makefile.in @@ -191,7 +191,8 @@ am_libshibsp_la_OBJECTS = $(am__objects_2) Base64AttributeDecoder.lo \ AttributeScopeMatchesShibMDScopeFunctor.lo \ ChainingAttributeResolver.lo QueryAttributeResolver.lo \ SimpleAggregationAttributeResolver.lo \ - ChainingAttributeExtractor.lo DelegationAttributeExtractor.lo \ + AssertionAttributeExtractor.lo ChainingAttributeExtractor.lo \ + DelegationAttributeExtractor.lo \ KeyDescriptorAttributeExtractor.lo XMLAttributeExtractor.lo \ ArtifactResolver.lo SOAPClient.lo XMLSecurityPolicyProvider.lo \ DynamicMetadataProvider.lo MetadataExtImpl.lo \ @@ -597,6 +598,7 @@ libshibsp_la_SOURCES = \ 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 \ @@ -736,6 +738,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AnyMatchFunctor.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Application.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ArtifactResolver.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AssertionAttributeExtractor.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AssertionConsumerService.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AssertionLookup.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Attribute.Plo@am__quote@ @@ -1898,6 +1901,13 @@ SimpleAggregationAttributeResolver.lo: attribute/resolver/impl/SimpleAggregation @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SimpleAggregationAttributeResolver.lo `test -f 'attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp' || echo '$(srcdir)/'`attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp +AssertionAttributeExtractor.lo: attribute/resolver/impl/AssertionAttributeExtractor.cpp +@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT AssertionAttributeExtractor.lo -MD -MP -MF $(DEPDIR)/AssertionAttributeExtractor.Tpo -c -o AssertionAttributeExtractor.lo `test -f 'attribute/resolver/impl/AssertionAttributeExtractor.cpp' || echo '$(srcdir)/'`attribute/resolver/impl/AssertionAttributeExtractor.cpp +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/AssertionAttributeExtractor.Tpo $(DEPDIR)/AssertionAttributeExtractor.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='attribute/resolver/impl/AssertionAttributeExtractor.cpp' object='AssertionAttributeExtractor.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o AssertionAttributeExtractor.lo `test -f 'attribute/resolver/impl/AssertionAttributeExtractor.cpp' || echo '$(srcdir)/'`attribute/resolver/impl/AssertionAttributeExtractor.cpp + ChainingAttributeExtractor.lo: attribute/resolver/impl/ChainingAttributeExtractor.cpp @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ChainingAttributeExtractor.lo -MD -MP -MF $(DEPDIR)/ChainingAttributeExtractor.Tpo -c -o ChainingAttributeExtractor.lo `test -f 'attribute/resolver/impl/ChainingAttributeExtractor.cpp' || echo '$(srcdir)/'`attribute/resolver/impl/ChainingAttributeExtractor.cpp @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/ChainingAttributeExtractor.Tpo $(DEPDIR)/ChainingAttributeExtractor.Plo -- 2.1.4