1
0
mirror of https://github.com/php/php-src.git synced 2026-04-28 10:43:30 +02:00
Commit Graph

55 Commits

Author SHA1 Message Date
Peter Kokot 1c850bfcca Sync leading and final newlines in source code files
This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines.

According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.

C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."

Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.

[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
2018-10-14 12:55:24 +02:00
Peter Kokot f2e4de8b56 Fix AC_RUN_IFELSE calls when cross-compiling
AC_RUN_IFELSE program can't be run when cross-compiling. This fix removes
warnings given by autotools scripts.
2018-07-30 06:38:59 +02:00
Peter Kokot 4371945b8b Replace obsolete AC_TRY_FOO with AC_FOO_IFELSE
Autoconf 2.50 released in 2001 made several macros obsolete including
the AC_TRY_RUN, AC_TRY_COMPILE and AC_TRY_LINK:
http://git.savannah.gnu.org/cgit/autoconf.git/tree/ChangeLog.2

These macros should be replaced with the current AC_FOO_IFELSE instead:
- AC_TRY_RUN with AC_RUN_IFELSE and AC_LANG_SOURCE
- AC_TRY_LINK with AC_LINK_IFELSE and AC_LANG_PROGRAM
- AC_TRY_COMPILE with AC_COMPILE_IFELSE and AC_LANG_PROGRAM

PHP 5.4 to 7.1 require Autoconf 2.59+ version, PHP 7.2 and above require
2.64+ version, and the PHP 7.2 phpize script requires 2.59+ version which
are all greater than above mentioned 2.50 version therefore systems
should be well supported by now.

This patch was created with the help of autoupdate script:
autoupdate <file>

Reference docs:
- https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Obsolete-Macros.html
- https://www.gnu.org/software/autoconf/manual/autoconf-2.59/autoconf.pdf
2018-07-30 02:36:38 +02:00
Peter Kokot 03b717d4cc Remove unused PHP_PROG_LEX macro
Since PHP 5.3 flex lexer has been replaced with re2c. Commit
0f9e2b1753 made PHP_PROG_LEX macro still
available for BC.

In commit df6bd506d4 it was updated. Since
this macro is entirely not used in PHP source code anymore from PHP 5.3
and up, this patch removes it together with some old traces of warnings
suppression and comments.
2018-07-29 10:53:21 +02:00
Peter Kokot 8d3f8ca12a Remove unused Git attributes ident
The $Id$ keywords were used in Subversion where they can be substituted
with filename, last revision number change, last changed date, and last
user who changed it.

In Git this functionality is different and can be done with Git attribute
ident. These need to be defined manually for each file in the
.gitattributes file and are afterwards replaced with 40-character
hexadecimal blob object name which is based only on the particular file
contents.

This patch simplifies handling of $Id$ keywords by removing them since
they are not used anymore.
2018-07-25 00:53:25 +02:00
Xinchen Hui a6519d0514 year++ 2018-01-02 12:57:58 +08:00
Brian Evans 2fe9208ee3 Use modern autotools name of configure.ac instead of configure.in
configure.ac was introduced in 2001 with automake-1.15 and autoconf-2.50
to replace the file named configure.in.
Autotools is preparing to remove configure.in in Automake 2.0.
All new software should be using configure.ac.
This also fixes Bug #69770 where extensions are creating configure.in

Signed-off-by: Brian Evans <grknight@gentoo.org>
2017-01-27 06:07:40 +00:00
Sammy Kaye Powers 9e29f841ce Update copyright headers to 2017 2017-01-02 09:30:12 -06:00
Julien Pauli 736b91c650 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Happy new year (Update copyright to 2016)

Conflicts:
	ext/json/php_json_encoder.h
	sapi/continuity/capi.c
2016-01-04 18:13:38 +01:00
Lior Kaplan 53fb2f1e5c Happy new year (Update copyright to 2016) 2016-01-03 01:44:37 +02:00
Michael Wallner afcaa52c73 Merge branch 'PHP-5.6'
* PHP-5.6:
  make buildconf work as expected; autoconf really needs some help with all those external m4s

Conflicts:
	build/build2.mk
2015-02-04 09:50:14 +01:00
Michael Wallner 4c3b4dc74a make buildconf work as expected;
autoconf really needs some help with all those external m4s
2015-02-04 09:39:02 +01:00
Michael Wallner fa453d5abd make buildconf actually work 2015-01-30 17:58:49 +01:00
Johannes Schlüter d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Rasmus Lerdorf cc8ecca0b3 Get rid of autoconf warnings 2011-05-16 00:14:47 +00:00
Ilia Alshanetsky 2df7386475 Update copyright year
# The rest of the files were already updated by Sebastian
2007-01-01 19:32:10 +00:00
foobar 5bd93221a8 bump year and license version 2006-01-01 12:51:34 +00:00
foobar 128119b9ab MFH 2005-11-29 22:39:19 +00:00
foobar 23e671a51e - Bumber up year 2005-08-03 14:08:58 +00:00
Jon Parise 3ac5ec3b7e Adding the ability to override the autotools executables used by the
buildconf script via the PHP_AUTOCONF and PHP_AUTOHEADER environmental
variables.
2005-04-04 07:16:01 +00:00
foobar 996c9d85d7 - Fix buildconf with BSD make 2005-02-03 17:42:42 +00:00
foobar 480a3b08d5 - Changed phpize not to require automake and libtool.
- Fixed build system to always use bundled libtool files.
2005-01-20 01:41:20 +00:00
foobar 52e00b8f03 Added --debug option to buildconf 2005-01-19 23:03:29 +00:00
foobar ed25ab62f5 Revert the multiple autoconf versions patch 2005-01-19 22:27:39 +00:00
foobar bc3f6c94d4 Fix buildconf when multiple autoconf versions installed 2004-12-20 20:23:57 +00:00
foobar ccfc46b0aa - Happy new year and PHP 5 for rest of the files too..
# Should the LICENSE and Zend/LICENSE dates be updated too?
2004-01-08 17:33:29 +00:00
Sascha Schumann e715fb00f8 Eliminate need for automake/aclocal 2003-06-27 00:19:43 +00:00
James Cox f68c7ff249 updating license information in the headers. 2003-06-10 20:04:29 +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
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
Sebastian Bergmann 90613d2282 Maintain headers. 2002-02-28 08:29:35 +00:00
Sebastian Bergmann 38933514e1 Update headers. 2001-12-11 15:32:16 +00:00
Sascha Schumann a7d71f9708 Ignore "AC_PROG_LEX invoked multiple times" 2001-09-11 07:47:31 +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 cf8d1563c2 Remove ltconfig which is not used anymore by libtool 1.4 2001-05-12 11:19:46 +00:00
Zeev Suraski 532dcda528 Remove unnecessary tab (was killing Tru64 make) 2001-04-23 23:50:56 +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
Sascha Schumann 0644641616 Move build-defs.h(.in) and php_config.h to main 2000-11-27 13:27:51 +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 1596e646fc Cosmetic change 2000-05-18 11:41:41 +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
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
Stig Bakken c475b6112a shut up cross compiling warnings 2000-02-23 19:26:31 +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 6bdbd306b1 Y2K updates 2000-01-01 20:48:42 +00:00
Sascha Schumann 5a5ef06c57 Fix for Solaris incapability 1999-12-30 15:05:04 +00:00