[shibboleth-sp2] 55/119: Integrate FastCGI support.

[Ferenc Wágner]

This is an automated email from the git hooks/post-receive script.

wferi-guest pushed a commit to annotated tag 1.3.1
in repository shibboleth-sp2.

commit beb32dfd0598ef28a4c167965c82b14eb09bcbfe
Author: Scott Cantor <cantor.2 at osu.edu>
Date:   Fri Sep 14 20:20:07 2007 +0000

    Integrate FastCGI support.
---
 Makefile.am         |  2 +-
 configure.ac        | 31 +++++++++++++++++++++++++++++++
 fastcgi/Makefile.am | 21 +++++++++++++++++++++
 shibboleth.spec.in  |  3 +--
 4 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e605772..057da2a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@ WANT_SUBDIRS = @WANT_SUBDIRS@
 SUBDIRS = $(WANT_SUBDIRS)
 
 DIST_SUBDIRS = adfs doc oncrpc shib schemas configs shib-target shar test \
-	apache siterefresh shib-mysql-ccache xmlproviders nsapi_shib selinux
+	apache fastcgi siterefresh shib-mysql-ccache xmlproviders nsapi_shib selinux
 
 all-local: shibboleth.spec pkginfo
 
diff --git a/configure.ac b/configure.ac
index 12c063f..ac5fea3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -326,6 +326,37 @@ fi
 
 
 #
+# Build FastCGI support?
+#
+AC_MSG_CHECKING(for FastCGI support)
+AC_ARG_WITH(fastcgi,
+    AC_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
+    AC_MSG_CHECKING(for FastCGI include files)
+    if test x_$WANT_FASTCGI != x_/usr; then
+        FASTCGI_INCLUDE="-I$WANT_FASTCGI/include"
+        FASTCGI_LDFLAGS="-L$WANT_FASTCGI/lib"
+    fi
+    FASTCGI_LIBS="-lfcgi -lfcgi++"
+    AC_CHECK_HEADER([fcgio.h])
+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
+
+
+#
 # If no --enable-apache-xx specified 
 # find a default and fake the specific parameters
 #
diff --git a/fastcgi/Makefile.am b/fastcgi/Makefile.am
new file mode 100644
index 0000000..c3306de
--- /dev/null
+++ b/fastcgi/Makefile.am
@@ -0,0 +1,21 @@
+AUTOMAKE_OPTIONS = foreign
+
+if BUILD_FASTCGI
+
+libexec_PROGRAMS = shibauthorizer shibresponder
+
+shibauthorizer_SOURCES = shibauthorizer.cpp
+shibauthorizer_CXXFLAGS = -I$(FASTCGI_INCLUDE)
+shibauthorizer_LDFLAGS = $(FASTCGI_LDFLAGS) $(FASTCGI_LIBS)
+shibauthorizer_LIBADD = \
+  $(top_builddir)/shib-target/libshib-target.la
+
+shibresponder_SOURCES = shibresponder.cpp
+shibresponder_CXXFLAGS = -I$(FASTCGI_INCLUDE)
+shibresponder_LDFLAGS = $(FASTCGI_LDFLAGS) $(FASTCGI_LIBS)
+shibresponder_LIBADD = \
+  $(top_builddir)/shib-target/libshib-target.la
+
+endif
+
+EXTRA_DIST = shibauthorizer.cpp shibresponder.cpp shibauthorizer.dsp shibresponder.dsp
diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index 737b0bc..c16081b 100644
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -57,7 +57,6 @@ applications that use the shibboleth library.
 %build
 %configure %{?shib_options}
 make
-#make -C selinux
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -72,7 +71,7 @@ mv $RPM_BUILD_ROOT/usr/doc/shibboleth _docs
 		$RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/native.logger
 %endif
 
-find $RPM_BUILD_ROOT/%{_libexecdir} -type f -or -type l | grep \.so |
+find $RPM_BUILD_ROOT/%{_libexecdir} -type f -or -type l |
   sed -e "s|$RPM_BUILD_ROOT||" | sort > rpm.filelist
 
 %check || :

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git