Commit Graph

62 Commits

Author SHA1 Message Date
foobar
272913f3d4 - Fixed bug: #18560, the macro was not defined always. 2002-07-25 18:37:16 +00:00
Sascha Schumann
808f05c205 the variable interpolation was already subject to IFS treatment,
which resulted in the execution of the foremost directory.

we capture the output before setting IFS now
2002-07-11 13:33:22 +00:00
Sascha Schumann
ee619493b3 Use a simple IFS; set step to interprete the httpd -v output 2002-07-11 08:44:42 +00:00
foobar
2ca9ae687d - Fix the version check again. 2002-07-07 15:43:45 +00:00
Rasmus Lerdorf
03b76b278e Oops, extra pipe snuck in 2002-06-29 00:12:46 +00:00
Rasmus Lerdorf
02022179c9 Fix for bug #18055 2002-06-28 23:57:15 +00:00
Cliff Woolley
8283979afc Allow the version checks for --with-apxs= and --with-apxs2= to work
with development version of Apache, whose version strings end in "-dev",
eg "Apache/2.0.37-dev".

PR: 17233
Submitted by: Dale Ghent <daleg@elemental.org>
2002-05-17 08:07:14 +00:00
Sascha Schumann
12ba44827a be a bit more verbose about what is wrong 2002-04-26 21:26:47 +00:00
foobar
492efe963f - Fix for bug: #16791. (more reliable test) 2002-04-26 03:07:16 +00:00
foobar
eb18c5c38c Part 3 of static apache build fixes:
- Use the PHP_CFLAGS when compiling the php4 module in apache tree.
- Use the apache include dir only when compiling sapi/apache
  o Fixes the fnmatch.h issue Wez complained about :)
2002-04-23 02:58:54 +00:00
foobar
0fa1516483 - Prevent users from trying to make a static build with Apache2 using
--with-apache

# I have working --with-apache2 stuff also..need to test it a bit more
# before committing it..
2002-04-13 05:58:29 +00:00
foobar
f81166f34e - Added checks to prevent building the DSO with wrong configure option. 2002-04-12 22:59:07 +00:00
Marko Karppinen
676afb33b8 Enable --with-apxs build on Mac OS X. We build an MH_BUNDLE instead of
an MH_DYLIB. As all PPC code is relocatable, we don't use the libtool
based shared build but go a static route. Goodbye libtool!
# I'm committing this to enable widespear testing.
# Anyone have any ideas on how to easily backport this to 4.2.0?
2002-03-30 03:17:25 +00:00
Marko Karppinen
60663c1f64 Prepare for MH_BUNDLE build on Mac OS X / Darwin 2002-03-29 19:25:55 +00:00
Sascha Schumann
9d9d39a0de Please welcome the new build system.
If you encounter any problems, please make sure to email sas@php.net
directly.

An introduction can be found on

http://schumann.cx/buildv5.txt
2002-03-07 14:20:02 +00:00
Derick Rethans
a6738260af - Fix for bug #15572 (Patch by Ralf Nyrén <ralf.nyren@educ.umu.se>) 2002-03-04 17:46:19 +00:00
jim winstead
63669c6a64 make it more clear that --with-apache and --with-apxs only work with apache 1.x. 2002-02-25 18:27:13 +00:00
foobar
f43b57190c Added missing cvs ids and unified configure messages. 2001-11-30 19:01:32 +00:00
foobar
41b21156cc Fixed bugs: #14034, #11647 (can not find any others) 2001-11-19 00:51:06 +00:00
Stig Bakken
99687096ca * fix default path in configure help text 2001-10-10 16:14:25 +00:00
Sascha Schumann
e843e8c5f0 Move PHP_TARGET_RDYNAMIC check to global acinclude.m4 and use it
in thttpd's config.m4.
2001-06-15 12:53:20 +00:00
Sascha Schumann
1ad2a710ab Use EXTRA_LDFLAGS at this point.
I've confirmed that one can build a working Apache DSO module now
(AIX 4.2 with gcc 2.95.2 and Apache 1.3.12).
2001-05-23 21:23:16 +00:00
Sascha Schumann
40245019cc s/^I/ / and some re-indenting. Also align the APXS checking code
with the standard scheme.
2001-05-19 17:13:09 +00:00
Sascha Schumann
e29a1b2230 First try at using Apache's export list when building a DSO. 2001-05-18 20:53:53 +00:00
Sascha Schumann
afdaee9e47 Nuke more quotes 2001-05-12 11:09:05 +00:00
Wilfredo Sanchez
0df6e8dd88 Add INSTALL_ROOT variable to specify install location. 2001-04-03 20:59:50 +00:00
foobar
8a26918ed1 Renamed the AC_ prefixed macros defined in acinclude.m4 to PHP_* prefixes.
# Heads up people! I tested this before committing but you never know..
2001-03-27 20:35:04 +00:00
Sascha Schumann
dedec6614e Automatically carry over macro definitions from Apache.
We don't take everything, because apxs' CFLAGS also includes
optimization, debugging, et cetera flags.

PR: #7211
2000-12-04 16:05:00 +00:00
Sascha Schumann
04f180b08a More verbose error message for non-working apxs case 2000-11-13 12:43:44 +00:00
foobar
9559b88894 Fixed bug #6356. 2000-09-11 13:01:07 +00:00
Hartmut Holzgraefe
5d6516be86 look for apxs in /usr/sbin (that's where SUSE puts it)
if no path is given and apxs is not found in $PATH
2000-06-17 06:22:40 +00:00
Sascha Schumann
111d36a3c8 Due to creating the Makefiles later, generating libphp4.module failed,
because sapi/apache had not been created. This applies to VPATH builds
only.
2000-06-13 18:02:28 +00:00
Sascha Schumann
b98d2a8261 The ! command is not portable. 2000-06-09 17:19:26 +00:00
Sascha Schumann
e49ad341bd Wipe out acconfig.h.in and rewrite some checks to use PHP_ARG_ENABLE. 2000-06-08 06:14:58 +00:00
Sascha Schumann
f1941064de Fix wording (not "to apxs", but "of apxs"). 2000-05-15 16:43:44 +00:00
Sascha Schumann
13e9da59ff Complain loudly and stop configuration, if we cannot run apxs. 2000-05-15 16:37:32 +00:00
Sascha Schumann
b4db46606e Some white-space changes 2000-03-26 19:47:28 +00:00
Sascha Schumann
3bd34bf386 @- Fixed -DEAPI inheritance from APXS. (Sascha) 2000-02-24 13:48:44 +00:00
Sascha Schumann
59d1066525 Improve APXS_CFLAGS checks 2000-02-24 13:43:28 +00:00
Sascha Schumann
d64c1652e2 Define EAPI, if Apache uses EAPI 2000-02-24 13:38:03 +00:00
Sascha Schumann
fca41d2752 Remove XML_INCLUDE, we use the embedded expat always 2000-02-24 13:35:07 +00:00
Sascha Schumann
bfe09e8305 Never use Apache regex stuff 2000-02-12 14:48:09 +00:00
Zeev Suraski
6d0ab6166c SAPIfication, Episode VI: Return of the SAPI
Remove mostly all references to APACHE and CGI_BINARY from the code.

- Apache include files are no longer included by any PHP code, except for the Apache SAPI module.
- No server specific code is in any of the base PHP code.

Still left to be done:
- Eliminate any references to APACHE from the few remaining modules.
- Move request_info.c's logic to SAPI
- Modify the regex function names, and globals, so that we can always
  include them, without having to fear any interference with Apache;
  Always use the bundled regex library
2000-02-10 19:41:21 +00:00
Andrei Zmievski
f0f00daa92 Moved ext/apache into sapi/apache. 2000-02-02 06:09:00 +00:00
Sascha Schumann
f2f8d38efa Integration of -ng changes. Changes:
- added support for externally built modules,
- improved support for in-tree shared modules,
- fixed diversion bugs,
- configure displays some informative messages,
- faster static build
  (libtool isn't used anymore for compiling non-PIC objects),
- dependencies comparable to automake's without requiring GNU make or GCC,
- working make clean for non-GNU makes.
1999-12-30 02:59:53 +00:00
Sascha Schumann
6bf3529919 Macro syntax has changed 1999-12-30 02:21:21 +00:00
Ryan Bloom
28ef78e4cb Beginning work to get PHP 4 to work with Apache 2.0. This change detects
Apache 2.0 properly.
# This is extremely experimental because neither project is release
# quality yet.  I expect this to drive bugs out of Apache 2.0's configure
# process as well as provide a useful version of PHP for Apache 2.0, so it
# may take some time for this to become stable.  I will commit changes to
# PHP as needed although more modifications will be on the Apache side.
1999-12-27 23:42:46 +00:00
Sascha Schumann
fc6c531ec2 Add -rdynamic, if supported by gcc and static Apache build is used 1999-12-24 15:56:40 +00:00
Sascha Schumann
7365698268 Moving APXS-specific checks into respective config.m4. The placement of
`%APXS -q..` caused error messages, if APXS was not used.
1999-12-11 17:48:41 +00:00
Sascha Schumann
111cedbbea Moving apMakefile.{libdir,tmpl} to sapi/apache directory. 1999-11-18 14:21:50 +00:00