[cpp-sp] branch main updated: Strip GSS and Apache < 2.4 from build.
Scott Cantor
cantor.2 at osu.edu
Tue Oct 29 16:05:39 UTC 2024
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository cpp-sp.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=8abef853d0a56c23a7108ff65ea2b806826bbd05
The following commit(s) were added to refs/heads/main by this push:
new 8abef853 Strip GSS and Apache < 2.4 from build.
8abef853 is described below
commit 8abef853d0a56c23a7108ff65ea2b806826bbd05
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Oct 29 12:05:35 2024 -0400
Strip GSS and Apache < 2.4 from build.
---
apache/Makefile.am | 73 +-------
apache/mod_shib_13.cpp | 44 -----
apache/mod_shib_13.rc | 101 ----------
apache/mod_shib_20.cpp | 69 -------
apache/mod_shib_20.rc | 101 ----------
apache/mod_shib_22.cpp | 71 --------
apache/mod_shib_22.rc | 101 ----------
configure.ac | 486 ++++---------------------------------------------
8 files changed, 40 insertions(+), 1006 deletions(-)
diff --git a/apache/Makefile.am b/apache/Makefile.am
index bfafbb08..49bc37d6 100644
--- a/apache/Makefile.am
+++ b/apache/Makefile.am
@@ -1,74 +1,5 @@
AUTOMAKE_OPTIONS = foreign
-if BUILD_AP13
-modshib13dir = $(libdir)/@PACKAGE_NAME@
-modshib13_LTLIBRARIES = mod_shib_13.la
-mod_shib_13_la_SOURCES = mod_shib_13.cpp
-mod_shib_13_la_LDFLAGS = \
- -module -avoid-version \
- $(APXS_LDFLAGS)
-mod_shib_13_la_CXXFLAGS = \
- $(AM_CXXFLAGS) \
- $(APXS_CFLAGS) $(APXS_INCLUDE) \
- $(BOOST_CPPFLAGS) \
- $(PTHREAD_CFLAGS) \
- $(xerces_CFLAGS) \
- $(xmltooling_lite_CFLAGS)
-mod_shib_13_la_LIBADD = \
- $(top_builddir)/shibsp/libshibsp-lite.la \
- $(PTHREAD_LIBS) \
- $(xerces_LIBS) \
- $(xmltooling_lite_LIBS)
-endif
-
-if BUILD_AP20
-modshib20dir = $(libdir)/@PACKAGE_NAME@
-modshib20_LTLIBRARIES = mod_shib_20.la
-mod_shib_20_la_SOURCES = mod_shib_20.cpp
-mod_shib_20_la_LDFLAGS = \
- -module -avoid-version \
- $(APXS2_LDFLAGS)
-mod_shib_20_la_CXXFLAGS = \
- $(AM_CXXFLAGS) \
- $(APXS2_CFLAGS) $(APXS2_INCLUDE) \
- $(BOOST_CPPFLAGS) \
- $(PTHREAD_CFLAGS) \
- $(gss_CFLAGS) $(gnu_gss_CFLAGS) \
- $(xerces_CFLAGS) \
- $(xmltooling_lite_CFLAGS)
-mod_shib_20_la_LIBADD = \
- $(APXS2_LIBS) \
- $(top_builddir)/shibsp/libshibsp-lite.la \
- $(PTHREAD_LIBS) \
- $(gss_LIBS) $(gnu_gss_LIBS) \
- $(xerces_LIBS) \
- $(xmltooling_lite_LIBS)
-endif
-
-if BUILD_AP22
-modshib22dir = $(libdir)/@PACKAGE_NAME@
-modshib22_LTLIBRARIES = mod_shib_22.la
-mod_shib_22_la_SOURCES = mod_shib_22.cpp
-mod_shib_22_la_LDFLAGS = \
- -module -avoid-version \
- $(APXS22_LDFLAGS)
-mod_shib_22_la_CXXFLAGS = \
- $(AM_CXXFLAGS) \
- $(APXS22_CFLAGS) $(APXS22_INCLUDE) \
- $(BOOST_CPPFLAGS) \
- $(PTHREAD_CFLAGS) \
- $(gss_CFLAGS) $(gnu_gss_CFLAGS) \
- $(xerces_CFLAGS) \
- $(xmltooling_lite_CFLAGS)
-mod_shib_22_la_LIBADD = \
- $(APXS22_LIBS) \
- $(top_builddir)/shibsp/libshibsp-lite.la \
- $(PTHREAD_LIBS) \
- $(gss_LIBS) $(gnu_gss_LIBS) \
- $(xerces_LIBS) \
- $(xmltooling_lite_LIBS)
-endif
-
if BUILD_AP24
modshib24dir = $(libdir)/@PACKAGE_NAME@
modshib24_LTLIBRARIES = mod_shib_24.la
@@ -93,6 +24,4 @@ mod_shib_24_la_LIBADD = \
$(xmltooling_lite_LIBS)
endif
-EXTRA_DIST = mod_shib.cpp \
- mod_shib_13.cpp mod_shib_20.cpp mod_shib_22.cpp mod_shib_24.cpp \
- resource.h mod_shib_13.rc mod_shib_20.rc mod_shib_22.rc mod_shib_24.rc
+EXTRA_DIST = mod_shib.cpp mod_shib_24.cpp resource.h mod_shib_24.rc
diff --git a/apache/mod_shib_13.cpp b/apache/mod_shib_13.cpp
deleted file mode 100644
index d5aa542d..00000000
--- a/apache/mod_shib_13.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * 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.
- */
-
-/* mod_shib_13.cpp -- a wrapper around the apache module code to
- * build for Apache 1.3
- *
- * Created by: Derek Atkins <derek at ihtfp.com>
- *
- */
-
-#define SHIB_APACHE_13 1
-
-#define SH_AP_POOL pool
-#define SH_AP_TABLE table
-#define SH_AP_CONFIGFILE configfile_t
-#define SH_AP_R(r) r
-#define SH_AP_USER(r) r->connection->user
-#define SH_AP_AUTH_TYPE(r) r->connection->ap_auth_type
-
-#ifdef WIN32
-# define _USE_32BIT_TIME_T
-#endif
-
-#define apr_pool_userdata_setn(n,k,d,p)
-#define apr_pool_cleanup_register(p1,p2,f,d)
-
-#include "mod_shib.cpp"
diff --git a/apache/mod_shib_13.rc b/apache/mod_shib_13.rc
deleted file mode 100644
index 6cf50cea..00000000
--- a/apache/mod_shib_13.rc
+++ /dev/null
@@ -1,101 +0,0 @@
-//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 RC_FILE_VERSION ,0
- PRODUCTVERSION RC_PRODUCT_VERSION ,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
-#include "..\util\resourceCommon.rci"
- VALUE "FileDescription", "Shibboleth Apache 1.3 Module\0"
- VALUE "InternalName", "mod_shib_13\0"
- VALUE "OriginalFilename", "mod_shib_13.so\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.cpp b/apache/mod_shib_20.cpp
deleted file mode 100644
index 9f25e7ab..00000000
--- a/apache/mod_shib_20.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * 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.
- */
-
-/* mod_shib_20.cpp -- a wrapper around the apache module code to
- * build for Apache 2.0
- *
- * Created by: Derek Atkins <derek at ihtfp.com>
- *
- */
-
-#define SHIB_APACHE_20 1
-
-#define MODULE_VAR_EXPORT AP_MODULE_DECLARE_DATA
-#define SH_AP_POOL apr_pool_t
-#define SH_AP_TABLE apr_table_t
-#define SH_AP_CONFIGFILE ap_configfile_t
-#define array_header apr_array_header_t
-#define table_entry apr_table_entry_t
-
-#define SH_AP_R(r) 0,r
-#define SH_AP_USER(r) r->user
-#define SH_AP_AUTH_TYPE(r) r->ap_auth_type
-
-#define SERVER_ERROR HTTP_INTERNAL_SERVER_ERROR
-#define REDIRECT HTTP_MOVED_TEMPORARILY
-#define ap_pcalloc apr_pcalloc
-#define ap_pstrdup apr_pstrdup
-#define ap_pstrcat apr_pstrcat
-#define ap_psprintf apr_psprintf
-#define ap_table_get apr_table_get
-#define ap_table_add apr_table_add
-#define ap_table_addn apr_table_addn
-#define ap_table_setn apr_table_setn
-#define ap_table_unset apr_table_unset
-#define ap_table_set apr_table_set
-#define ap_table_do apr_table_do
-#define ap_clear_pool apr_pool_clear
-#define ap_destroy_pool apr_pool_destroy
-#define ap_make_table apr_table_make
-#define ap_copy_table apr_table_copy
-#define ap_overlay_tables apr_table_overlay
-#define ap_overlap_tables apr_table_overlap
-#define ap_table_elts apr_table_elts
-#define ap_is_empty_table apr_is_empty_table
-#define AP_OVERLAP_TABLES_SET APR_OVERLAP_TABLES_SET
-
-#define ap_send_http_header(r)
-#define ap_hard_timeout(str,r)
-#define ap_reset_timeout(r)
-#define ap_kill_timeout(r)
-
-#include "mod_shib.cpp"
diff --git a/apache/mod_shib_20.rc b/apache/mod_shib_20.rc
deleted file mode 100644
index a2a5777a..00000000
--- a/apache/mod_shib_20.rc
+++ /dev/null
@@ -1,101 +0,0 @@
-//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 RC_FILE_VERSION ,0
- PRODUCTVERSION RC_PRODUCT_VERSION ,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
-#include "..\util\resourceCommon.rci"
- VALUE "FileDescription", "Shibboleth Apache 2.0 Module\0"
- VALUE "InternalName", "mod_shib_20\0"
- VALUE "OriginalFilename", "mod_shib_20.so\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.cpp b/apache/mod_shib_22.cpp
deleted file mode 100644
index 7e7ea23b..00000000
--- a/apache/mod_shib_22.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * 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.
- */
-
-/* mod_shib_22.cpp -- a wrapper around the apache module code to
- * build for Apache 2.2
- *
- * Created by: Scott Cantor
- *
- */
-
-#define SHIB_APACHE_22 1
-
-#define MODULE_VAR_EXPORT AP_MODULE_DECLARE_DATA
-#define SH_AP_POOL apr_pool_t
-#define SH_AP_TABLE apr_table_t
-#define SH_AP_CONFIGFILE ap_configfile_t
-#define array_header apr_array_header_t
-#define table_entry apr_table_entry_t
-
-#define SH_AP_R(r) 0,r
-#define SH_AP_USER(r) r->user
-#define SH_AP_AUTH_TYPE(r) r->ap_auth_type
-
-#define SERVER_ERROR HTTP_INTERNAL_SERVER_ERROR
-#define REDIRECT HTTP_MOVED_TEMPORARILY
-#define ap_pcalloc apr_pcalloc
-#define ap_pstrdup apr_pstrdup
-#define ap_pstrcat apr_pstrcat
-#define ap_psprintf apr_psprintf
-#define ap_table_get apr_table_get
-#define ap_table_add apr_table_add
-#define ap_table_addn apr_table_addn
-#define ap_table_setn apr_table_setn
-#define ap_table_unset apr_table_unset
-#define ap_table_set apr_table_set
-#define ap_table_do apr_table_do
-#define ap_copy_table apr_table_copy
-#define ap_overlay_tables apr_table_overlay
-#define ap_overlap_tables apr_table_overlap
-#define ap_table_elts apr_table_elts
-#define ap_is_empty_table apr_is_empty_table
-#define ap_clear_pool apr_pool_clear
-#define ap_destroy_pool apr_pool_destroy
-#define ap_make_table apr_table_make
-#define AP_OVERLAP_TABLES_SET APR_OVERLAP_TABLES_SET
-
-#define ap_send_http_header(r)
-#define ap_hard_timeout(str,r)
-#define ap_reset_timeout(r)
-#define ap_kill_timeout(r)
-
-#define ap_http_method ap_http_scheme
-
-#include "mod_shib.cpp"
diff --git a/apache/mod_shib_22.rc b/apache/mod_shib_22.rc
deleted file mode 100644
index 8981d03b..00000000
--- a/apache/mod_shib_22.rc
+++ /dev/null
@@ -1,101 +0,0 @@
-//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 RC_FILE_VERSION ,0
- PRODUCTVERSION RC_PRODUCT_VERSION ,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
-#include "..\util\resourceCommon.rci"
- VALUE "FileDescription", "Shibboleth Apache 2.2 Module\0"
- VALUE "InternalName", "mod_shib_22\0"
- VALUE "OriginalFilename", "mod_shib_22.so\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/configure.ac b/configure.ac
index b99ccb29..facc8158 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,17 +132,6 @@ WANT_SUBDIRS="doc schemas configs shibsp"
AC_CONFIG_FILES([Makefile doc/Makefile schemas/Makefile \
configs/Makefile shibsp/Makefile])
-## 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)]),
- [AS_IF([test "x$enableval" != xno],
- [PKG_CHECK_MODULES([SYSTEMD],[libsystemd],,[PKG_CHECK_MODULES([SYSTEMD],[libsystemd-daemon])])
- # because in systemd 209 the libraries were merged into a single libsystemd.
- # sd_notify() is always present, no need to check for it:
- AC_DEFINE([HAVE_SD_NOTIFY],[1],[Define to 1 if you have the sd_notify function.])])])
-
#
# Build FastCGI support?
#
@@ -200,22 +189,16 @@ 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],, [/usr/local/apache2/bin:/usr/local/apache/bin:/usr/sbin:$PATH])
- AS_IF([test "x$xs" = "x"], [AC_MSG_ERROR([No apxs, no Apache found. Try --with-apxs, --with-apxs2, etc.])])
+ AS_IF([test "x$xs" = "x"], [AC_MSG_ERROR([No apxs, no Apache found. Try --with-apxs24, etc.])])
fi
# ask the daemon for the version and set parameters
AC_MSG_CHECKING(default apache version)
@@ -223,274 +206,80 @@ if test "$need_default" = "yes"; then
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.])
+ *) AC_MSG_ERROR([unusable Apache versions: $v. Try setting --with=apxs24, etc.])
esac
else
- AC_MSG_RESULT([cannot determine Apache version. Try setting --with-apxs, --with-apxs2, etc.])
+ AC_MSG_RESULT([cannot determine Apache version. Try setting --with-apxs24, 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 /opt/local/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="-I`$APXS -q INCLUDEDIR`"
- APXS_LDFLAGS="`$APXS -q LDFLAGS`"
-fi
-
-AC_SUBST(APXS_CFLAGS)
-AC_SUBST(APXS_INCLUDE)
-AC_SUBST(APXS_LDFLAGS)
-
-# 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 /opt/local/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 /opt/local/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_INCLUDE="`${APR_CONFIG} --includes`"
- APR_CFLAGS="`${APR_CONFIG} --cflags` `${APR_CONFIG} --cppflags`"
- APR_LDFLAGS="`${APR_CONFIG} --ldflags`"
- APR_LIBS="`${APR_CONFIG} --link-libtool --libs`"
- 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_INCLUDE="`${APU_CONFIG} --includes`"
- APU_LDFLAGS="`${APU_CONFIG} --ldflags`"
- APU_LIBS="`${APU_CONFIG} --link-libtool --libs`"
- 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"
- APXS2_INCLUDE="-I`$APXS2 -q INCLUDEDIR` $APR_INCLUDE $APU_INCLUDE"
- APXS2_LDFLAGS="`$APXS2 -q LDFLAGS` $APR_LDFLAGS $APU_LDFLAGS"
- APXS2_LIBS="`$APXS2 -q LIBS` $APR_LIBS $APU_LIBS"
-fi
-
-AC_SUBST(APXS2_CFLAGS)
-AC_SUBST(APXS2_INCLUDE)
-AC_SUBST(APXS2_LDFLAGS)
-AC_SUBST(APXS2_LIBS)
-
-
-# Apache 2.2 (mod_shib_22)
-# --enable-apache-22
-# --with-apxs22 (DSO build, the normal way, uses apxs to derive build flags)
+# 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-22,
- AS_HELP_STRING([--enable-apache-22],[enable the Apache 2.2 module]),
+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_22=yes
+ WANT_APACHE_24=yes
else
- WANT_APACHE_22="$enableval"
+ WANT_APACHE_24="$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
+ ],[ 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_22)
+AC_MSG_RESULT($WANT_APACHE_24)
-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.]),
+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.2 apxs name/location)
+ AC_MSG_CHECKING(for user-specified Apache 2.4 apxs name/location)
if test "$withval" != "no" ; then
if test "$withval" != "yes"; then
- APXS22=$withval
+ APXS24=$withval
AC_MSG_RESULT("$withval")
fi
fi
],
[
- AC_PATH_PROG(APXS22, apxs2, no)
- if test "$APXS22" = "no" ; then
- AC_PATH_PROG(APXS22, apxs, no)
+ AC_PATH_PROG(APXS24, apxs2, no)
+ if test "$APXS24" = "no" ; then
+ AC_PATH_PROG(APXS24, apxs, no)
fi
- if test "$APXS22" = "no" ; then
+ if test "$APXS24" = "no" ; then
for i in /usr/sbin /usr/local/apache2/bin /usr/local/apache/bin /opt/local/bin ; do
- if test "$APXS22" = "no" && test -f "$i/apxs2" ; then
- APXS22="$i/apxs2"
+ if test "$APXS24" = "no" && test -f "$i/apxs2" ; then
+ APXS24="$i/apxs2"
fi
done
- if test "$APXS22" = "no" ; then
+ if test "$APXS24" = "no" ; then
for i in /usr/sbin /usr/local/apache2/bin /usr/local/apache/bin /opt/local/bin ; do
- if test "$APXS22" = "no" && test -f "$i/apxs" ; then
- APXS22="$i/apxs"
+ if test "$APXS24" = "no" && test -f "$i/apxs" ; then
+ APXS24="$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_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.2 apxs script. An Apache development package may be missing from your server, or you may need to use the --with-apxs22 option.])
+ 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($APXS22)
- AC_SUBST(APXS22)
+ AC_MSG_RESULT($APXS24)
+ AC_SUBST(APXS24)
# APR1 settings
- AC_ARG_WITH(apr1,
+ 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)
@@ -502,7 +291,7 @@ if test "$WANT_APACHE_22" = "yes" ; then
fi
],
[
- AC_PATH_PROG(APR1_CONFIG, apr-1-config,,[`$APXS22 -q SBINDIR`]:[$PATH])
+ AC_PATH_PROG(APR1_CONFIG, apr-1-config,,[`$APXS24 -q SBINDIR`]:[$PATH])
])
if test -f "${APR1_CONFIG}"; then
APR1_INCLUDE="`${APR1_CONFIG} --includes`"
@@ -514,7 +303,7 @@ if test "$WANT_APACHE_22" = "yes" ; then
fi
# APU1 settings
- AC_ARG_WITH(apu1,
+ 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)
@@ -526,7 +315,7 @@ if test "$WANT_APACHE_22" = "yes" ; then
fi
],
[
- AC_PATH_PROG(APU1_CONFIG, apu-1-config,,[`$APXS22 -q SBINDIR`]:[$PATH])
+ AC_PATH_PROG(APU1_CONFIG, apu-1-config,,[`$APXS24 -q SBINDIR`]:[$PATH])
])
if test -f "${APU1_CONFIG}"; then
APU1_INCLUDE="`${APU1_CONFIG} --includes`"
@@ -535,130 +324,6 @@ if test "$WANT_APACHE_22" = "yes" ; then
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"
- APXS22_INCLUDE="-I`$APXS22 -q INCLUDEDIR` $APR1_INCLUDE $APU1_INCLUDE"
- APXS22_LDFLAGS="`$APXS22 -q LDFLAGS` $APR1_LDFLAGS $APU1_LDFLAGS"
- APXS22_LIBS="`$APXS22 -q LIBS` $APR1_LIBS $APU1_LIBS"
-fi
-
-AC_SUBST(APXS22_CFLAGS)
-AC_SUBST(APXS22_INCLUDE)
-AC_SUBST(APXS22_LDFLAGS)
-AC_SUBST(APXS22_LIBS)
-
-# 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 /opt/local/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 /opt/local/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_INCLUDE="`${APR1_CONFIG} --includes`"
- APR1_CFLAGS="`${APR1_CONFIG} --cflags` `${APR1_CONFIG} --cppflags`"
- APR1_LDFLAGS="`${APR1_CONFIG} --ldflags`"
- APR1_LIBS="`${APR1_CONFIG} --link-libtool --libs`"
- 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_INCLUDE="`${APU1_CONFIG} --includes`"
- APU1_LDFLAGS="`${APU1_CONFIG} --ldflags`"
- APU1_LIBS="`${APU1_CONFIG} --link-libtool --libs`"
- 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`"
@@ -675,50 +340,13 @@ AC_SUBST(APXS24_LIBS)
# 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
+if test "$WANT_APACHE_24" = "yes" ; then
WANT_SUBDIRS="$WANT_SUBDIRS apache"
fi
-
-AC_ARG_WITH([gssapi],
- [AS_HELP_STRING([--with-gssapi],[include GSSAPI support])],,[with_gssapi=check])
-AS_IF([test "x$with_gssapi" != xno],
- [AX_PKG_CHECK_MODULES([gss],,[krb5-gssapi],
- [PKG_CHECK_VAR([GSS_VENDOR],[krb5-gssapi],[vendor])
- AS_CASE(["$GSS_VENDOR"],
- [Heimdal],[AC_DEFINE([SHIBSP_HAVE_GSSHEIMDAL],[1],[if you have the Heimdal gssapi libraries])],
- [MIT],[AC_DEFINE([SHIBSP_HAVE_GSSMIT],[1],[if you have the MIT gssapi libraries])])],
- [AX_PKG_CHECK_MODULES([gnu_gss],,[gss],
- [AC_DEFINE([SHIBSP_HAVE_GSSGNU],[1],[if you have the GNU gssapi libraries])],
- [with_gssapi=no],
- [SHIBSP_LITE_REQUIRES],[SHIBSP_LITE_REQUIRES_PRIVATE])],
- [SHIBSP_LITE_REQUIRES],[SHIBSP_LITE_REQUIRES_PRIVATE])
- AS_IF([test "x$with_gssapi" != xno],
- [AC_DEFINE([SHIBSP_HAVE_GSSAPI],[1],[if you have the gssapi libraries])
- AX_SAVE_FLAGS
- CXXFLAGS="$gss_CFLAGS $gnu_gss_CFLAGS $CXXFLAGS"
- LIBS="$gss_LIBS $gnu_gss_LIBS $LIBS"
- AC_CHECK_DECLS([gss_get_name_attribute,GSS_C_NT_EXPORT_NAME_COMPOSITE],,,[[
-#ifdef SHIBSP_HAVE_GSSGNU
-# include <gss.h>
-#elif defined SHIBSP_HAVE_GSSMIT
-# include <gssapi/gssapi.h>
-# include <gssapi/gssapi_ext.h>
-#else
-# include <gssapi.h>
-#endif
-]])
- AX_RESTORE_FLAGS
- ])
- ])
-AM_CONDITIONAL([GSSAPI_NAMINGEXTS],[test "x$ac_cv_have_decl_gss_get_name_attribute" = xyes])
-
# Check for unit test support
AC_CONFIG_FILES([unittests/Makefile])
AC_ARG_VAR([CXXTEST], [override the cxxtestgen executable and options])
@@ -729,42 +357,6 @@ WANT_SUBDIRS="$WANT_SUBDIRS unittests"
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"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list