This is an automated email from the ASF dual-hosted git repository.
rainerjung pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git
The following commit(s) were added to refs/heads/main by this push:
new 228d9045b Integrate only remaining (small) support m4 into
configure.ac.
228d9045b is described below
commit 228d9045b5e5fb92c069fdb004541d946a389a43
Author: Rainer Jung <[email protected]>
AuthorDate: Wed Jun 24 17:33:10 2026 +0200
Integrate only remaining (small) support m4 into configure.ac.
---
native/configure.ac | 30 ++++++++++++++++++++++++++++--
support/os_apache.m4 | 44 --------------------------------------------
2 files changed, 28 insertions(+), 46 deletions(-)
diff --git a/native/configure.ac b/native/configure.ac
index ecfa76ef5..fcf4ea02b 100644
--- a/native/configure.ac
+++ b/native/configure.ac
@@ -449,8 +449,34 @@ int main()
JK_CHECK_ATOMICS
dnl Apache-2.0 needs the os subdirectory to include os.h
-dnl this include is copy from os/config.m4
-sinclude(../support/os_apache.m4)
+dnl This part copied from httpd-2.0/os/config.m4
+dnl OS changed to OS_APACHE and OS_DIR to OS_APACHE_DIR
+
+AC_MSG_CHECKING(for target platform)
+
+#PLATFORM=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`
+PLATFORM=$host
+
+case "$PLATFORM" in
+*beos*)
+ OS_APACHE="beos"
+ OS_APACHE_DIR=$OS_APACHE
+ ;;
+*pc-os2_emx*)
+ OS_APACHE="os2"
+ OS_APACHE_DIR=$OS_APACHE
+ ;;
+bs2000*)
+ OS_APACHE="unix"
+ OS_APACHE_DIR=bs2000 # only the OS_APACHE_DIR is platform specific.
+ ;;
+*)
+ OS_APACHE="unix"
+ OS_APACHE_DIR=$OS_APACHE;;
+esac
+
+AC_MSG_RESULT($OS_APACHE)
+
dnl it is copied from the configure of JServ ;=)
dnl and adapted.
diff --git a/support/os_apache.m4 b/support/os_apache.m4
deleted file mode 100644
index 8b4e8ab72..000000000
--- a/support/os_apache.m4
+++ /dev/null
@@ -1,44 +0,0 @@
-dnl
-dnl Licensed to the Apache Software Foundation (ASF) under one or more
-dnl contributor license agreements. See the NOTICE file distributed with
-dnl this work for additional information regarding copyright ownership.
-dnl The ASF licenses this file to You under the Apache License, Version 2.0
-dnl (the "License"); you may not use this file except in compliance with
-dnl the License. You may obtain a copy of the License at
-dnl
-dnl http://www.apache.org/licenses/LICENSE-2.0
-dnl
-dnl Unless required by applicable law or agreed to in writing, software
-dnl distributed under the License is distributed on an "AS IS" BASIS,
-dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-dnl See the License for the specific language governing permissions and
-dnl limitations under the License.
-dnl
-
-dnl copied from httpd-2.0/os/config.m4
-dnl OS changed to OS_APACHE and OS_DIR to OS_APACHE_DIR
-
-AC_MSG_CHECKING(for target platform)
-
-#PLATFORM=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`
-PLATFORM=$host
-
-case "$PLATFORM" in
-*beos*)
- OS_APACHE="beos"
- OS_APACHE_DIR=$OS_APACHE
- ;;
-*pc-os2_emx*)
- OS_APACHE="os2"
- OS_APACHE_DIR=$OS_APACHE
- ;;
-bs2000*)
- OS_APACHE="unix"
- OS_APACHE_DIR=bs2000 # only the OS_APACHE_DIR is platform specific.
- ;;
-*)
- OS_APACHE="unix"
- OS_APACHE_DIR=$OS_APACHE;;
-esac
-
-AC_MSG_RESULT($OS_APACHE)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
