Commit Graph

226 Commits

Author SHA1 Message Date
Sterling Hughes
eab8227e7c beginnings of php5/bundle support 2003-05-02 03:14:00 +00:00
Jan Lehnardt
09790f8f53 - allow libtool to be a symlink. Discussed with Sascha 2003-04-16 11:59:49 +00:00
Stig Bakken
0e6fca4f22 * email address change 2003-03-18 12:06:09 +00:00
foobar
fdba676769 - Fixed some weird crashes causd by the new default behaviour
of libtool 1.4.3
- Require libtool 1.4.3 or newer from now on.
2003-02-11 21:11:42 +00:00
foobar
20c43285f7 - Fixed bug: #13561 (--without-pear prevents install of phpize, php-config) 2003-01-28 10:59:12 +00:00
Sascha Schumann
726eb90bd5 which is not portable. use our bundled shtool instead. 2003-01-13 10:27:50 +00:00
Marcus Boerger
d6ae71fb11 -update to version 1.6.2
-added path command as requested by jani
2002-11-08 08:46:14 +00:00
Sascha Schumann
26215e8937 Remove overzealous bison check
1. bison is not invoked during buildconf, so why the heck was the check
embedded here.

2. bison 1.35 works fine for ze1. if there is a problem with ze2, the
check should be limited to that ze version. don't inconvenience people
who are using a perfectly fine combination.
2002-10-30 11:42:22 +00:00
foobar
a7e87d2485 We have to require bison version <= 1.30 >= 1.75 since any versions between are broken.. 2002-10-27 19:47:34 +00:00
Hartmut Holzgraefe
3e99daca39 workaround for the "autoconf-cache-bug" workaround
-> don't remove config.nice
2002-10-21 15:11:19 +00:00
Sascha Schumann
2247d61e17 Move autoconf-2.13 check into buildcheck.sh where we already have
version parsing code and (more importantly) proper error checking
for missing autoconf.
2002-07-21 13:09:07 +00:00
Sascha Schumann
71e7b5cc99 One should not ignore
AC_PROG_CPP was called before AC_PROG_CC

because this error caused the Solaris issue
2002-07-21 12:54:06 +00:00
foobar
0dbd55581c .libs/ directories are created when building shared extensions. 2002-07-12 04:41:26 +00:00
foobar
049042851a silence the warning when glibtool is not found.. 2002-06-26 18:42:50 +00:00
Sascha Schumann
6039cd5a01 Prefer glibtool over libtool for Mac OS X compatibility
Submitted by: various people, including blakers@mac.com
2002-06-26 08:39:55 +00:00
James Cox
bca90b0796 changing this to mv ZendEngine2 Zend instead of shell logic that isn't portable. 2002-06-23 15:47:40 +00:00
James Cox
3b58ead0be oops.. 2002-06-20 08:42:08 +00:00
James Cox
265f2d653a make "make snapshot" work again..
# is this actually used?
2002-06-20 08:36:48 +00:00
James Cox
337e158d40 fixing to permit builds with ZE2 2002-06-20 08:21:20 +00:00
Sascha Schumann
22815419f8 Gone they are.. files related to the old build-system 2002-04-12 17:28:41 +00:00
Sascha Schumann
f93e3ab954 de-overquotation 2002-03-22 10:22:41 +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
Sascha Schumann
c8e453c060 Remove note, suppress warning 2002-03-04 08:28:57 +00:00
Zak Greant
6f4df4e16c Added message regarding expected error messages for ./buildconf 2002-03-03 23:03:34 +00:00
Yasuo Ohgaki
7ff5e156c2 Use php.ini-dist as default config file for testing. 2002-03-02 09:29:45 +00:00
Stig Bakken
d9f47fafea * use cli sapi to run tests 2002-03-01 08:57:07 +00:00
Sebastian Bergmann
90613d2282 Maintain headers. 2002-02-28 08:29:35 +00:00
Marko Karppinen
99d36a7557 Latest libtools output a multiline version info. Deal with that 2002-01-24 23:31:45 +00:00
Sebastian Bergmann
38933514e1 Update headers. 2001-12-11 15:32:16 +00:00
Sascha Schumann
91985677a6 add missing dependency 2001-09-19 08:56:58 +00:00
Sascha Schumann
f037e5b2da Similar to autoconf-2.5x, say who is doing what. 2001-09-11 07:50:53 +00:00
Sascha Schumann
a7d71f9708 Ignore "AC_PROG_LEX invoked multiple times" 2001-09-11 07:47:31 +00:00
Sascha Schumann
2547f86060 Use $(LINK) for libraries, but $(LINK_CLEAN) for creating programs.
Also pass only $(CFLAGS_CLEAN) into thttpd's Makefile.
2001-09-10 17:15:03 +00:00
Stig Bakken
43c2025ac2 * output brief usage when called without params 2001-08-28 12:15:01 +00:00
Sascha Schumann
d0095ba3c5 Workaround which avoids passing pic-related flags in link mode 2001-08-09 04:27:40 +00:00
David Croft
fce6f4c5cb libtool 1.3 -> 1.4 in first check 2001-06-20 18:21:03 +00:00
Sascha Schumann
9a7c1f2ad6 Add some backwards-compatible macros to accomodate the renaming of
AC_ADD_* macros.
2001-06-10 13:51:18 +00:00
Sascha Schumann
2cb13b0cf3 Display the correct automake version 2001-05-24 12:36:09 +00:00
Sascha Schumann
75e0154b6c automake 1.4-p1 was released. Remove the -p\d+ suffix as this caused
an error message on FreeBSD.
2001-05-23 19:13:24 +00:00
Sascha Schumann
19a285419a $libtool already contains the full path to libtool. 2001-05-23 19:10:06 +00:00
Sascha Schumann
cdc30c6826 Fix path to alternate mkdir 2001-05-20 22:04:23 +00:00
Thies C. Arntzen
e80abfa40c revert parts of last commit - stupid me! 2001-05-18 14:40:02 +00:00
Thies C. Arntzen
2db3431f00 --enable-memory-usage-info id deprecated. use --enable-memory-limit instead! 2001-05-18 14:32:05 +00:00
Sascha Schumann
e5176fe60a First step towards full libtool 1.4 portability 2001-05-12 12:22:34 +00:00
Sascha Schumann
cf8d1563c2 Remove ltconfig which is not used anymore by libtool 1.4 2001-05-12 11:19:46 +00:00
Sascha Schumann
7566cf7f27 Fix special treatment of zlib by introducing the Apache concept
of config.m4 hierarchies.
2001-05-11 20:09:31 +00:00
Sascha Schumann
0d29419769 Up prerequisites to libtool 1.4 2001-05-06 18:51:21 +00:00
Sascha Schumann
e1ddd48bd4 Fix libtool check
Submitted by: brisse@ping.dk
2001-05-05 15:33:49 +00:00
foobar
d805c9740f Fix bug #10589 2001-05-03 03:41:42 +00:00
Zeev Suraski
532dcda528 Remove unnecessary tab (was killing Tru64 make) 2001-04-23 23:50:56 +00:00
Stig Bakken
0edbf4242f * using CGI -C option, you no longer have to specify "full" path to tests 2001-04-16 23:28:58 +00:00
Jason Greene
6e2a6e07db This is a temporary fix to the previous patch that breaks the build.
This keeps the functionality of searching for glibtool or libtool,
but have you checked the rest of the build process to see if this is
compatible? Regardless, 'which' returns a value on some os's when nothing is
found which breaks the previous patches test. Also the unary negation after
an if is not compatible with true bourne.

-Jason
2001-04-04 04:41:01 +00:00
Wilfredo Sanchez
5c30ce1436 Undo oopsie 2001-04-03 21:16:07 +00:00
Wilfredo Sanchez
0df6e8dd88 Add INSTALL_ROOT variable to specify install location. 2001-04-03 20:59:50 +00:00
Wilfredo Sanchez
a0a471e7a3 Find libtool if it's called glibtool. 2001-04-03 19:07:32 +00:00
Sascha Schumann
8d5af8cb46 Replace the incomprehensible newline escaping with @NEWLINE@
Fixes the build on Darwin 1.2
2001-03-30 14:02:20 +00:00
Andrei Zmievski
6626f902a8 Remove config.h instead of php_config.h 2001-03-13 17:54:38 +00:00
Sascha Schumann
34cb5dff68 Replace AM_PROG_LEX with a separated call to AC_PROG_LEX and AC_DECL_YYTEXT.
The latter is only called, if lex was found, so that PHP configures now
on setups without (f)lex.
2001-03-06 16:51:53 +00:00
Sascha Schumann
28052724e7 Suppress the other nasty warning 2001-02-08 00:49:24 +00:00
Andrei Zmievski
b7b7ffbabd Add cvsclean target for standalone extensions. 2001-02-01 14:11:44 +00:00
Sascha Schumann
971e3a6473 Run run-tests.php in srcdir and add top_builddir/pear to the include
path (does not seem to work though yet.  The include path does not
seem to get changed at all).
2000-12-24 16:03:16 +00:00
Sascha Schumann
14c195a6d8 Fix "make test" in VPATH environments 2000-12-24 14:24:04 +00:00
Sascha Schumann
7f96af83b2 Stop automatically passing vars to AC_SUBST through PHP_SUBST.
There are some variables which are needed for Makefiles and files
created by AC_OUTPUT; we use PHP_SUBST_OLD for those now.

genif.sh was moved to an appropiate place.
2000-12-20 17:21:37 +00:00
Sascha Schumann
060e647e5e Speed up the genif.sh script a little bit. Whereas it took three seconds
previously, it takes now about 100ms on a P233.
2000-12-20 16:29:07 +00:00
Stig Bakken
672a300022 * PEAR: don't require "make install" before "make test" 2000-12-13 14:01:39 +00:00
Stig Bakken
52d3777f50 * make it possible to override the start directory for "make test" 2000-12-07 08:06:41 +00:00
Hartmut Holzgraefe
5f683e7d78 changed run-tests.php to use 'php -q' instead of 'php -f' 2000-12-03 10:45:53 +00:00
Sascha Schumann
84f8310e9a Always add top_srcdir to the header file search path. 2000-11-28 01:20:21 +00:00
Sascha Schumann
0644641616 Move build-defs.h(.in) and php_config.h to main 2000-11-27 13:27:51 +00:00
Sascha Schumann
a2f126c351 Build compat bridge for makes which support only the BSD .include command.
This is only required for BSD/OS, because BSDI did not merge in changes
from 4.4BSD Lite 1.
2000-09-26 11:19:38 +00:00
Stig Bakken
fad9bab629 * Added "test" make target so you can do "make test" in any directory.
* Added copyright header to run-test.php
2000-08-29 09:12:44 +00:00
Sascha Schumann
483c99ad73 mkdep.perl was replaced by mkdep.awk 2000-08-26 14:08:03 +00:00
Sascha Schumann
e0818297f1 Add autoconf check for awk and use proper macro $(AWK) 2000-08-25 08:15:10 +00:00
Sascha Schumann
f1ec9035fc Add new depend rule to rules_pear.mk and install mkdep.awk. 2000-08-25 07:22:05 +00:00
Sascha Schumann
693180c1a2 Small speedup 2000-08-24 11:56:54 +00:00
Sascha Schumann
a8be2cf641 Speed it up by moving the two sub's into the main loop.
Also print out dependencies immediately instead of buffering them.
2000-08-24 11:28:41 +00:00
Sascha Schumann
ba4ddf32b4 Create dependencies using an awk script. Works much nicer in vpath
environments.
2000-08-24 11:02:03 +00:00
Sascha Schumann
42eeda50d4 Remove -DHAVE_CONFIG_H. It ain't used anywhere. 2000-08-20 08:58:19 +00:00
Sascha Schumann
e325e06693 Add/update license 2000-08-20 05:39:37 +00:00
Sascha Schumann
97c698a178 Relicense build-related files under the PHP License
Move common make rules to rules_common.mk. This gets rid of the duplicated
stuff in rules.mk/rules_pear.mk.
2000-08-20 05:36:07 +00:00
Sascha Schumann
81b8e08b13 Change the C++ extension to .cpp 2000-08-15 23:16:47 +00:00
Sascha Schumann
dad6ac414e Make the cxx suffix easily adjustable 2000-07-10 08:45:07 +00:00
Sascha Schumann
e51571595c Add support for building C++ sources.
In your extension's config.m4, you need to use the m4 macro

    PHP_REQUIRE_CXX

This shall be called only, if your extension is enabled.

C++ source files shall not be put into the LTLIBRARY_SOURCES macro.
Instead, the filename of the object shall be put into
LTLIBRARY_OBJECTS_X. I.e. if your extension foo consists of foo.cxx, use

    LTLIBRARY_OBJECTS_X = foo.lo
2000-07-09 20:39:18 +00:00
Rasmus Lerdorf
fee1263ca3 Fix overlooked core->main change 2000-06-11 19:53:19 +00:00
Sascha Schumann
6df3a21309 Prepare move of the top-level source files to the core directory. 2000-06-11 18:16:37 +00:00
Sascha Schumann
438e9bdc93 Remove unnecessary second cat invocation 2000-06-11 10:33:39 +00:00
David Hedbor
45ba649c8e PRE_INCLUDE hack reverted 2000-06-06 00:01:29 +00:00
David Hedbor
ff8a716efe Added a new user-definable include variable, PRE_INCLUDES. It works
like EXTRA_INCLUDES but is added before the global INCLUDES variable.
#
# This was needed for the roxen SAPI module, which requires the PHP4
# include dirs to be after the Pike include dirs. I can't make the
# Pike include dir global though, since Pike includes then conflict
# with PHP4 includes in the rest of the compile.
2000-06-05 21:05:07 +00:00
Sascha Schumann
cecfdbe71e Accept CVS version of libtool (1.3c) 2000-05-25 13:39:50 +00:00
Sascha Schumann
1596e646fc Cosmetic change 2000-05-18 11:41:41 +00:00
Sascha Schumann
8ab33a4d13 Use "mkdir -p" instead of "test -d || mkdir" where possible 2000-05-15 16:02:43 +00:00
Sascha Schumann
23dfe91b60 Remove directory test when creating directories using mkdir -p 2000-05-12 07:37:42 +00:00
Sascha Schumann
f3ac213120 Upgrade shtool to 1.4.9 and fix "mkdir -p" behaviour. Patch has been
sent to the author of shtool.
2000-05-12 07:33:55 +00:00
Sascha Schumann
24abc76a93 `.deps' are sourced only by Makefiles created by fastgen.sh, so it makes
sense to create empty .deps there.
2000-05-04 17:50:32 +00:00
Sascha Schumann
dc91d47014 Remove trailing slash(es) from pathnames 2000-05-04 16:08:10 +00:00
Sascha Schumann
5989ae5dc1 Fix building external extensions. 2000-05-02 20:10:46 +00:00
Sascha Schumann
733d94909f Move install-modules target into top-level Makefile template 2000-05-02 20:08:54 +00:00
Sascha Schumann
fca9539d63 Preset extension_dir to the installation directory of PHP modules.
This effectively means that dl() will work without having an installed
configuration file.
2000-05-02 14:46:20 +00:00
Sascha Schumann
e2905f1b5c Get rid of old cruft. Broke build on Irix. 2000-05-01 02:57:24 +00:00
Sascha Schumann
a481fddfb3 Improved in-tree shared libraries build system
The following new/revived shared modules are available now:

  ... MySQL (*)
  ... PCRE (*)
  ... Session
  ... SWF

  (*) capable of using bundled library or external library

All changes:

  The m4 macro PHP_EXTENSION was revamped. Uses LIB_BUILD now.
  This effectively means that all extensions have to use dynlib.

  ext/mysql/config.m4 was revamped.
  Uses LIB_BUILD for building bundled library.

  ext/pcre/config.m4 was revamped.
  Uses LIB_BUILD for building bundled library.

  ext/ext_skel was changed to reflect that more modules should be
  compileable as shared module.

  ext/Makefile.in has been simplified enormously.

  Dependencies are now stored in the build tree.

  Empty dependencies are not generated by buildconf anymore. They
  are now dynamically created during the build process.

  Implicit rules for .S were removed.

  The NO_RECURSION feature was removed.

  "libs.mk" has been added to all cvsignore files in ext.
2000-05-01 02:42:55 +00:00
Sascha Schumann
8d19edc495 Overall UNIX build system improvements:
* Makefile header is now completely dynamic
* Absolute paths in (top_)?(src|build)dir and VPATH
  (fixes Tru64 support)
* VPATH does not contain variables anymore
  (fixes UnixWare support)
2000-04-30 03:10:34 +00:00
Rasmus Lerdorf
e404a471e7 Oops, wrong path 2000-04-29 16:16:31 +00:00
Rasmus Lerdorf
e3dd0a28ce An empty .deps was not getting generated here 2000-04-29 16:14:17 +00:00
Sascha Schumann
7dfcbd13c2 Remove trailing slash 2000-03-30 23:50:15 +00:00
Stig Bakken
d23e5d837a @- Implemented default_charset and default_mimetype config directives (Stig)
Implemented default_charset and default_mimetype configuration directives.
Started implementing ticks in PHP.
2000-02-25 21:27:03 +00:00
Sascha Schumann
ac22cb771b WTF? 2000-02-24 03:05:28 +00:00
Stig Bakken
c475b6112a shut up cross compiling warnings 2000-02-23 19:26:31 +00:00
Andrei Zmievski
838bab821c Use 'cp' instead of 'install'. 2000-02-22 14:23:45 +00:00
Zeev Suraski
75b1316e70 @- Updated the browscap module to work with PHP 4.0 (Zeev) 2000-02-16 17:46:14 +00:00
Sascha Schumann
1ed56d5d08 Add test to avoid recursion, if the build environment is not
correctly set up.
2000-02-16 16:06:12 +00:00
Sascha Schumann
d0cb4d09aa Allow shared libraries to be built everywhere 2000-01-26 21:58:46 +00:00
Sascha Schumann
4d83b0a315 Full gear backwards. We still need acconfig.h.in for additional acconfig.h
files (from TSRM/Zend).
2000-01-12 19:09:59 +00:00
Sascha Schumann
03505c7226 acconfig.h.in became superflicious when we removed the config.h.stubs.
Let's get rid of it.
2000-01-12 19:02:23 +00:00
Sascha Schumann
0dab12ec9f Make cvsclean work on AIX 2000-01-12 16:52:57 +00:00
Sascha Schumann
cd2b3616bb FreeBSD 2.x/3.x fix. 2000-01-03 12:39:44 +00:00
Sascha Schumann
6bdbd306b1 Y2K updates 2000-01-01 20:48:42 +00:00
Sascha Schumann
a4e1579afa Synchronize with rules.mk 1999-12-31 00:18:08 +00:00
Sascha Schumann
6bbe440f6d Perform manual interpolation for EXTRA_INCLUDES and EXTRA_CFLAGS 1999-12-31 00:15:27 +00:00
Sascha Schumann
5a5ef06c57 Fix for Solaris incapability 1999-12-30 15:05:04 +00:00
Sascha Schumann
2a7fb51466 Remove second {}, that shouldn't be there 1999-12-30 14:47:32 +00:00
Sascha Schumann
b92aadb6ee Proper protection for GNU make's parallel build 1999-12-30 07:15:43 +00:00
Sascha Schumann
6e1884a352 Rebuild config.h.in whenever configure changes 1999-12-30 06:07:56 +00:00
Sascha Schumann
531b5ecbfc Add distclean target 1999-12-30 05:53:27 +00:00
Sascha Schumann
2c99bef442 Get rid of config.h.stub. Note that you should embed a comment about
what the respective define does into the AC_DEFINE macro. I.e.

AC_DEFINE(HAVE_FOO, 1, [Whether you have FOO])
1999-12-30 04:07:46 +00:00
Sascha Schumann
e3af8ed321 We build in regex as well, create empty .deps 1999-12-30 03:23:05 +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