You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by do...@hyperreal.org on 1999/08/04 02:31:27 UTC
cvs commit: modperl/apaci mod_perl.exp Makefile.tmpl configure mod_perl.config.sh
dougm 99/08/03 17:31:27
Modified: . Changes MANIFEST ToDo
apaci Makefile.tmpl configure mod_perl.config.sh
Added: apaci mod_perl.exp
Log:
apxs/aix port
Revision Changes Path
1.331 +2 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -r1.330 -r1.331
--- Changes 1999/08/04 00:04:00 1.330
+++ Changes 1999/08/04 00:31:24 1.331
@@ -8,6 +8,8 @@
=item 1.21_01-dev
+apxs/aix port [Paul J. Reder <re...@raleigh.ibm.com>]
+
preload Apache::Contstants::OPT_EXECCGI() for Apache::{Registry,PerlRun}
thanks to Chris Remshaw for spotting this w/ Apache::DProf
1.55 +1 -0 modperl/MANIFEST
Index: MANIFEST
===================================================================
RCS file: /home/cvs/modperl/MANIFEST,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- MANIFEST 1999/06/11 02:22:28 1.54
+++ MANIFEST 1999/08/04 00:31:24 1.55
@@ -225,6 +225,7 @@
apaci/mod_perl.config.sh
apaci/load_modules.pl.PL
apaci/find_source.PL
+apaci/mod_perl.exp
.gdbinit
INSTALL.simple
INSTALL.simple.ssl
1.194 +0 -2 modperl/ToDo
Index: ToDo
===================================================================
RCS file: /home/cvs/modperl/ToDo,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- ToDo 1999/08/04 00:04:00 1.193
+++ ToDo 1999/08/04 00:31:25 1.194
@@ -31,8 +31,6 @@
- ldopts() spits out ccdlflags when linker is ld
-- Paul J. Reder's aix/dso port
-
- Apache::Include->virtual should return run() value, not status()
- win32 socket bug (WSAStartup() needed for each thread?)
1.8 +1 -1 modperl/apaci/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /home/cvs/modperl/apaci/Makefile.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.tmpl 1998/11/05 03:12:54 1.7
+++ Makefile.tmpl 1999/08/04 00:31:26 1.8
@@ -13,7 +13,7 @@
# Reassemble mod_perl parameters
# from Perl and Apache parameters
MP_CC=$(PERL_CC)
-MP_CFLAGS=$(PERL_OPTIMIZE) $(PERL_CCFLAGS) $(PERL_INC) \
+MP_CFLAGS=$(PERL_OPTIMIZE) $(PERL_CCFLAGS) -I$(PERL_INC) \
$(PERL_DEFS) $(INCLUDES) $(CFLAGS)
MP_CFLAGS_SHLIB=$(PERL_CCCDLFLAGS) $(MP_CFLAGS)
MP_LD=$(PERL_LD)
1.8 +3 -0 modperl/apaci/configure
Index: configure
===================================================================
RCS file: /home/cvs/modperl/apaci/configure,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- configure 1998/08/10 20:09:55 1.7
+++ configure 1999/08/04 00:31:26 1.8
@@ -70,6 +70,7 @@
echo "$0:Error: no 'apxs' program found, please provide it's path via --with-apxs" 1>&2
exit 1
fi
+my_apxs_sourcedir="`$my_apxs -q PREFIX`"
my_apxs_cflags="`$my_apxs -q CFLAGS`"
my_apxs_includes="-I`$my_apxs -q INCLUDEDIR`"
@@ -93,6 +94,8 @@
echo "INCLUDES=$my_apxs_includes" >>$my_makefileconf
echo "RANLIB=ranlib" >>$my_makefileconf
echo "LIBEXT=so" >>$my_makefileconf
+echo "APACHEEXT=$my_apxs_sourcedir/src" >>$my_makefileconf
+echo "BASEEXT=mod_perl" >>$my_makefileconf
echo "APXS=$my_apxs" >>$my_makefileconf
echo "# own special stuff" >>$my_makefileconf
echo "ADD_DISTCLEAN_FILES=$my_sourcefiles typemap" >>$my_makefileconf
1.14 +8 -2 modperl/apaci/mod_perl.config.sh
Index: mod_perl.config.sh
===================================================================
RCS file: /home/cvs/modperl/apaci/mod_perl.config.sh,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mod_perl.config.sh 1999/04/07 19:13:16 1.13
+++ mod_perl.config.sh 1999/08/04 00:31:26 1.14
@@ -106,13 +106,19 @@
#
# determine build tools and flags
#
+
+case "$os_version" in
+ aix*) os_flags="-bI:\$(APACHEEXT)/support/httpd.exp" ;;
+ * ) os_flags='' ;;
+esac
+
perl_cc="`$perl_interp -MConfig -e 'print $Config{cc}'`"
perl_ccflags="`$perl_interp -MConfig -e 'print $Config{ccflags}'`"
perl_optimize="`$perl_interp -MConfig -e 'print $Config{optimize}'`"
perl_cccdlflags="`$perl_interp -MConfig -e 'print $Config{cccdlflags}'`"
perl_ld="`$perl_interp -MConfig -e 'print $Config{ld}'`"
perl_ldflags="`$perl_interp -MConfig -e 'print $Config{ldflags}'`"
-perl_lddlflags="`$perl_interp -MConfig -e 'print $Config{lddlflags}'`"
+perl_lddlflags="`$perl_interp -MConfig -e 'print $Config{lddlflags}'` $os_flags"
cat >$tmpfile2 <<'EOT'
use Config;
my $ldopts = `$^X -MExtUtils::Embed -e ldopts -- -std @ARGV`;
@@ -136,7 +142,7 @@
print $ldopts;
EOT
perl_libs="`$perl_interp $tmpfile2 $perl_libperl`"
-perl_inc="`$perl_interp -MExtUtils::Embed -e perl_inc`"
+perl_inc="`$perl_interp -MConfig -e 'print "$Config{archlibexp}/CORE"'`"
perl_privlibexp="`$perl_interp -MConfig -e 'print $Config{privlibexp}'`"
perl_archlibexp="`$perl_interp -MConfig -e 'print $Config{archlibexp}'`"
perl_xsinit="$perl_interp -MExtUtils::Embed -e xsinit"
1.1 modperl/apaci/mod_perl.exp
Index: mod_perl.exp
===================================================================
perl_module