From: Scott Cantor Date: Thu, 30 Nov 2006 21:08:21 +0000 (+0000) Subject: Pull in Apache 2.2 module. X-Git-Tag: 2.0-alpha1~208 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=commitdiff_plain;h=4ff91a55906e69b48eedd8a7f72a85f63108c6bd Pull in Apache 2.2 module. --- 4ff91a55906e69b48eedd8a7f72a85f63108c6bd diff --cc apache/Makefile.am index 0e19c30,7aa65a6..7187e54 --- a/apache/Makefile.am +++ b/apache/Makefile.am @@@ -32,5 -32,21 +32,21 @@@ install-exec-hook endif - EXTRA_DIST = mod_apache.cpp mod_shib_13.cpp mod_shib_20.cpp mod_shib13.vcproj mod_shib20.vcproj \ - resource.h mod_shib_13.rc mod_shib_20.rc + if BUILD_AP22 + modshib22dir = $(libexecdir) + modshib22_LTLIBRARIES = mod_shib_22.la + mod_shib_22_la_SOURCES = mod_shib_22.cpp + mod_shib_22_la_CXXFLAGS = $(APXS22_CFLAGS) -I$(APXS22_INCLUDE) + mod_shib_22_la_LDFLAGS = -module -avoid-version + mod_shib_22_la_LIBADD = \ + $(top_builddir)/shib/libshib.la \ + $(top_builddir)/shib-target/libshib-target.la + + install-exec-hook: + for la in $(modshib22_LTLIBRARIES) ; do rm -f $(DESTDIR)$(modshib22dir)/$$la ; done + + endif + + EXTRA_DIST = mod_apache.cpp mod_shib_13.cpp mod_shib_20.cpp mod_shib_22.cpp \ - mod_shib13.dsp mod_shib20.dsp mod_shib22.dsp \ ++ mod_shib13.vcproj mod_shib20.vcproj mod_shib22.vcproj \ + resource.h mod_shib_13.rc mod_shib_20.rc mod_shib_22.rc diff --cc apache/mod_shib13.vcproj index 8ee0e42,0000000..15b13c3 mode 100644,000000..100644 --- a/apache/mod_shib13.vcproj +++ b/apache/mod_shib13.vcproj @@@ -1,273 -1,0 +1,273 @@@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --cc apache/mod_shib20.vcproj index 7edb485,0000000..faad9dc mode 100644,000000..100644 --- a/apache/mod_shib20.vcproj +++ b/apache/mod_shib20.vcproj @@@ -1,253 -1,0 +1,253 @@@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --cc apache/mod_shib22.vcproj index 0000000,0000000..a00d3e8 new file mode 100644 --- /dev/null +++ b/apache/mod_shib22.vcproj @@@ -1,0 -1,0 +1,267 @@@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++