dougm 2002/11/26 09:09:03
Modified: . Changes STATUS
xs/APR/APR APR.xs Makefile.PL
Log:
temporarily disable APR.pm attempt to link against -lapr and -lapr-util
Revision Changes Path
1.65 +2 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- Changes 26 Nov 2002 03:48:42 -0000 1.64
+++ Changes 26 Nov 2002 17:09:03 -0000 1.65
@@ -10,6 +10,8 @@
=item 1.99_08-dev
+temporarily disable APR.pm attempt to link against -lapr and -lapr-util
+
define IoTYPE_RDONLY/IoTYPE_WRONLY for perl-5.6.0 so the project
compiles again under 5.6.0 [Stas Bekman]
1.19 +5 -1 modperl-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/modperl-2.0/STATUS,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- STATUS 22 Oct 2002 03:59:45 -0000 1.18
+++ STATUS 26 Nov 2002 17:09:03 -0000 1.19
@@ -62,6 +62,10 @@
- Apache::CmdParms::{GETC,getline} needs compat mapping, similar to
what Apache::Directive->as_string does, but one char or line at a time
+
+* xs/APR/APR/Makefile.PL
+ - linking against -lapr and -lapr-util to support new goofy apr version
+ scheme and the old one and windows
Open Issues or Core Enhancements:
---------------------------------
1.5 +8 -11 modperl-2.0/xs/APR/APR/APR.xs
Index: APR.xs
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/APR/APR/APR.xs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- APR.xs 1 Feb 2002 20:00:53 -0000 1.4
+++ APR.xs 26 Nov 2002 17:09:03 -0000 1.5
@@ -1,14 +1,11 @@
#include "mod_perl.h"
-#ifdef WIN32
-/* XXX:
- * these dont resolve even though we link against
- * libapr.lib and libaprutil.lib
- * will figure out why later, no rush since
- * this module is only needed for use APR functions outside of httpd
- */
-# define apr_initialize()
-# define apr_terminate()
+#ifdef MP_HAVE_APR_LIBS
+# define APR_initialize apr_initialize
+# define APR_terminate apr_terminate
+#else
+# define APR_initialize()
+# define APR_terminate()
#endif
MODULE = APR PACKAGE = APR
@@ -17,10 +14,10 @@
BOOT:
file = file; /* -Wall */
- apr_initialize();
+ APR_initialize();
void
END()
CODE:
- apr_terminate();
+ APR_terminate();
1.5 +5 -1 modperl-2.0/xs/APR/APR/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/APR/APR/Makefile.PL,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.PL 6 Apr 2002 04:42:00 -0000 1.4
+++ Makefile.PL 26 Nov 2002 17:09:03 -0000 1.5
@@ -11,5 +11,9 @@
ModPerl::MM::WriteMakefile(
'NAME' => 'APR',
'VERSION_FROM' => 'APR.pm',
- 'LIBS' => ["-L$libdir @libs"],
+#XXX: no longer works with apr's goofy versioning scheme
+#low priority to fix as nobody is using Perl APR bindings
+#outside of httpd
+# 'LIBS' => ["-L$libdir @libs"],
+# 'DEFINE' => '-DMP_HAVE_APR_LIBS', #only if @libs are found
);
