rse 99/04/28 01:01:47
Modified: src CHANGES
. configure INSTALL Makefile.tmpl
src/helpers install.sh
Log:
1. Add APACI --without-execstrip option which can be used to disable the
stripping of executables on installation. This is very important for
DSO and debugging situations.
2. Add support for OS/2 (case insenstive filesystem, .exe suffix, etc)
to APACI files and related scripts.
Submitted by: ?? <[EMAIL PROTECTED]> and Ralf S. Engelschall
Reviewed by: Ralf S. Engelschall
PR: 4269
Revision Changes Path
1.1328 +9 -1 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1327
retrieving revision 1.1328
diff -u -r1.1327 -r1.1328
--- CHANGES 1999/04/27 20:36:26 1.1327
+++ CHANGES 1999/04/28 08:01:37 1.1328
@@ -1,5 +1,13 @@
Changes with Apache 1.3.7
-
+
+ *) Add APACI --without-execstrip option which can be used to disable the
+ stripping of executables on installation. This is very important for
DSO
+ and debugging situations. [Ralf S. Engelschall]
+
+ *) Add support for OS/2 (case insenstive filesystem, .exe suffix, etc)
+ to APACI files and related scripts.
+ [?? <[EMAIL PROTECTED]>, Ralf S. Engelschall] PR#4269
+
*) Add support for standalone mode in TPF
[Joe Moenich <[EMAIL PROTECTED]>]
1.87 +27 -0 apache-1.3/configure
Index: configure
===================================================================
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- configure 1999/04/22 09:09:19 1.86
+++ configure 1999/04/28 08:01:41 1.87
@@ -103,6 +103,11 @@
esac
##
+## determine platform id
+##
+PLATFORM="`$aux/GuessOS`"
+
+##
## display version information
##
if [ "x$quiet" = "xno" ]; then
@@ -220,6 +225,19 @@
suexec_gidmin=100
suexec_safepath="/usr/local/bin:/usr/bin:/bin"
+# the installation flags
+iflags_program="-m 755 -s"
+iflags_core="-m 755"
+iflags_dso="-m 755"
+iflags_script="-m 755"
+iflags_data="-m 644"
+case $PLATFORM in
+ *OS/2* )
+ iflags_program="$iflags_program -e .exe"
+ iflags_core="$iflags_core -e .exe"
+ ;;
+esac
+
# various other flags
support=1
confadjust=1
@@ -374,6 +392,7 @@
echo " --with-perl=FILE path to the optional Perl
interpreter"
echo " --without-support disable the build and installation
of support tools"
echo " --without-confadjust disable the user/situation
adjustments in config"
+ echo " --without-execstrip disable the stripping of
executables on installation"
echo ""
echo "suEXEC options:"
echo " --enable-suexec enable the suEXEC feature"
@@ -862,6 +881,9 @@
--without-confadjust)
confadjust=0
;;
+ --without-execstrip)
+ iflags_program=`echo "$iflags_program" | sed -e 's/-s//'`
+ ;;
--suexec-caller=*)
suexec_caller="$apc_optarg"
suexec_ok=1
@@ -1130,6 +1152,11 @@
-e "[EMAIL PROTECTED]@%$mkf%g" \
-e "[EMAIL PROTECTED]@%$aux%g" \
-e "[EMAIL PROTECTED]@%$thetarget%g" \
+-e "[EMAIL PROTECTED]@%$iflags_program%g" \
+-e "[EMAIL PROTECTED]@%$iflags_core%g" \
+-e "[EMAIL PROTECTED]@%$iflags_dso%g" \
+-e "[EMAIL PROTECTED]@%$iflags_script%g" \
+-e "[EMAIL PROTECTED]@%$iflags_data%g" \
-e "[EMAIL PROTECTED]@%$prefix%g" \
-e "[EMAIL PROTECTED]@%$exec_prefix%g" \
-e "[EMAIL PROTECTED]@%$bindir%g" \
1.55 +6 -0 apache-1.3/INSTALL
Index: INSTALL
===================================================================
RCS file: /home/cvs/apache-1.3/INSTALL,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- INSTALL 1999/03/10 11:52:59 1.54
+++ INSTALL 1999/04/28 08:01:41 1.55
@@ -159,6 +159,7 @@
[--with-perl=FILE] [--suexec-uidmin=UID]
[--without-support] [--suexec-gidmin=GID]
[--without-confadjust]
[--suexec-safepath=PATH]
+ [--without-execstrip]
Use the CC, OPTIM, CFLAGS, INCLUDES, LDFLAGS, LIBS, CFLAGS_SHLIB,
LD_SHLIB, LDFLAGS_SHLIB, LDFLAGS_SHLIB_EXPORT, RANLIB, DEPS and TARGET
@@ -370,6 +371,11 @@
user/situation dependent adjustments to the config files (Group, Port,
ServerAdmin, ServerName, etc.). This is usually only interesting for
vendor package maintainers who wants to force the keeping of defaults.
+
+ Use the --without-execstrip option to disable the stripping of
+ executables on installation. This can be important on some platforms in
+ combination with --enable-rule=SHARED_CORE or when Apache was built with
+ debugging symbols which shouldn't be lost.
Use the --enable-suexec option to enable the suEXEC feature by building
and installing the "suexec" support program. Use --suexec-caller=UID to
1.76 +11 -7 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- Makefile.tmpl 1999/04/22 09:11:15 1.75
+++ Makefile.tmpl 1999/04/28 08:01:41 1.76
@@ -81,11 +81,11 @@
RM = rm -f
MKDIR = $(TOP)/$(AUX)/mkdir.sh
INSTALL = $(TOP)/$(AUX)/install.sh -c
-IFLAGS_PROGRAM = -m 755 -s
-IFLAGS_CORE = -m 755
-IFLAGS_DSO = -m 755
-IFLAGS_SCRIPT = -m 755
-IFLAGS_DATA = -m 644
+IFLAGS_PROGRAM = @IFLAGS_PROGRAM@
+IFLAGS_CORE = @IFLAGS_CORE@
+IFLAGS_DSO = @IFLAGS_DSO@
+IFLAGS_SCRIPT = @IFLAGS_SCRIPT@
+IFLAGS_DATA = @IFLAGS_DATA@
INSTALL_PROGRAM = $(INSTALL) $(IFLAGS_PROGRAM)
INSTALL_CORE = $(INSTALL) $(IFLAGS_CORE)
INSTALL_DSO = $(INSTALL) $(IFLAGS_DSO)
@@ -198,10 +198,14 @@
## Installation Targets
## ------------------------------------------------------------------
+# indirection step to avoid conflict with INSTALL document
+# on case-insenstive filesystems, for instance on OS/2
+install: install-all
+
# the install target for installing the complete Apache
# package. This is implemented by running subtargets for the
# separate parts of the installation process.
-install:
+install-all:
@if [ ! -f $(TOP)/$(SRC)/.apaci.build.ok ]; then \
$(MAKE) -f $(TOP)/$(MKF) $(MFLAGS) $(MFWD) build; \
else \
@@ -373,7 +377,7 @@
install-include:
@echo "===> [include: Installing Apache C header files]"
$(CP) $(TOP)/$(SRC)/include/*.h $(root)$(includedir)/
- @osdir=`grep '^OSDIR=' $(TOP)/$(SRC)/Makefile.config | sed -e
's:^OSDIR=.*/os:os:'`; \
+ @osdir=`grep '^OSDIR=' $(TOP)/$(SRC)/Makefile.config | sed -e
's:^OSDIR=.*/os/:os/:'`; \
echo "$(CP) $(TOP)/$(SRC)/$${osdir}/os.h
$(root)$(includedir)/"; \
$(CP) $(TOP)/$(SRC)/$${osdir}/os.h $(root)$(includedir)/; \
echo "$(CP) $(TOP)/$(SRC)/$${osdir}/os-inline.c
$(root)$(includedir)/"; \
1.7 +8 -0 apache-1.3/src/helpers/install.sh
Index: install.sh
===================================================================
RCS file: /home/cvs/apache-1.3/src/helpers/install.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- install.sh 1999/02/10 12:09:38 1.6
+++ install.sh 1999/04/28 08:01:45 1.7
@@ -34,6 +34,7 @@
stripcmd=""
rmcmd="$rmprog -f"
mvcmd="$mvprog"
+ext=""
src=""
dst=""
while [ "x$1" != "x" ]; do
@@ -56,6 +57,9 @@
-S) stripcmd="$stripprog $2"
shift; shift; continue
;;
+ -e) ext="$2"
+ shift; shift; continue
+ ;;
*) if [ "x$src" = "x" ]; then
src=$1
else
@@ -82,6 +86,10 @@
if [ -d $dst ]; then
dst="$dst/`basename $src`"
fi
+
+# Add a possible extension (such as ".exe") to src and dst
+src="$src$ext"
+dst="$dst$ext"
# Make a temp file name in the proper directory.
dstdir=`dirname $dst`
