From 3ee5b0d07f01fcf1d5df87ae60d5191d619202bc Mon Sep 17 00:00:00 2001 From: Jakub Zelenka Date: Fri, 10 Oct 2025 19:49:54 +0200 Subject: [PATCH] Initial removal of PEAR and PECL --- .circleci/config.yml | 1 - .github/actions/configure-alpine/action.yml | 1 - .github/actions/configure-gentoo/action.yml | 1 - .github/actions/configure-macos/action.yml | 1 - .github/actions/configure-x32/action.yml | 1 - .github/actions/configure-x64/action.yml | 1 - .github/actions/freebsd/action.yml | 1 - .gitignore | 1 - CODING_STANDARDS.md | 5 +- CONTRIBUTING.md | 31 ++------- README.md | 3 +- configure.ac | 42 +----------- docs-old/self-contained-extensions.md | 16 ----- docs/release-process.md | 3 - ext/standard/credits.c | 2 +- pear/Makefile.frag | 34 ---------- pear/fetch.php | 74 --------------------- pear/install-pear.txt | 12 ---- php.ini-development | 4 +- php.ini-production | 4 +- sapi/cli/config.m4 | 2 +- scripts/dev/makedist | 14 ---- win32/build/Makefile.phpize | 12 +--- win32/build/config.w32.h.in | 3 +- 24 files changed, 19 insertions(+), 250 deletions(-) delete mode 100644 pear/Makefile.frag delete mode 100644 pear/fetch.php delete mode 100644 pear/install-pear.txt diff --git a/.circleci/config.yml b/.circleci/config.yml index f5dddad093158..bbd35331a7fea 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -96,7 +96,6 @@ jobs: --with-pdo-pgsql \ --with-pdo-sqlite \ --enable-intl \ - --without-pear \ --enable-gd \ --with-jpeg \ --with-webp \ diff --git a/.github/actions/configure-alpine/action.yml b/.github/actions/configure-alpine/action.yml index fe02dacfcdaf6..69d524def2eea 100644 --- a/.github/actions/configure-alpine/action.yml +++ b/.github/actions/configure-alpine/action.yml @@ -24,7 +24,6 @@ runs: ${{ inputs.skipSlow == 'false' && '--with-pdo-pgsql' || '' }} \ ${{ inputs.skipSlow == 'false' && '--with-pdo-sqlite' || '' }} \ --enable-intl \ - --without-pear \ --enable-gd \ --with-jpeg \ --with-webp \ diff --git a/.github/actions/configure-gentoo/action.yml b/.github/actions/configure-gentoo/action.yml index e1ae914681fb0..eca6d606ba84c 100644 --- a/.github/actions/configure-gentoo/action.yml +++ b/.github/actions/configure-gentoo/action.yml @@ -25,7 +25,6 @@ runs: ${{ inputs.skipSlow == 'false' && '--with-pdo-pgsql' || '' }} \ ${{ inputs.skipSlow == 'false' && '--with-pdo-sqlite' || '' }} \ --enable-intl \ - --without-pear \ --enable-gd \ --with-jpeg \ --with-webp \ diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index f0af959d21026..e8c2e2fff62ae 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -29,7 +29,6 @@ runs: --with-pgsql="$BREW_OPT"/libpq \ --with-pdo-pgsql="$BREW_OPT"/libpq \ --with-pdo-sqlite \ - --without-pear \ --enable-gd \ --with-jpeg \ --with-webp \ diff --git a/.github/actions/configure-x32/action.yml b/.github/actions/configure-x32/action.yml index a5c5df4f7971d..4cd46db7fa1db 100644 --- a/.github/actions/configure-x32/action.yml +++ b/.github/actions/configure-x32/action.yml @@ -28,7 +28,6 @@ runs: --with-pdo-pgsql \ --with-pdo-sqlite \ --with-pdo-firebird \ - --without-pear \ --enable-gd \ --with-jpeg \ --with-webp \ diff --git a/.github/actions/configure-x64/action.yml b/.github/actions/configure-x64/action.yml index ff746791fb950..715314284eefd 100644 --- a/.github/actions/configure-x64/action.yml +++ b/.github/actions/configure-x64/action.yml @@ -27,7 +27,6 @@ runs: ${{ inputs.skipSlow == 'false' && '--with-pdo-pgsql' || '' }} \ ${{ inputs.skipSlow == 'false' && '--with-pdo-sqlite' || '' }} \ --enable-intl \ - --without-pear \ --enable-gd \ --with-jpeg \ --with-webp \ diff --git a/.github/actions/freebsd/action.yml b/.github/actions/freebsd/action.yml index 456d88dd1f877..a4e6f4bb22e67 100644 --- a/.github/actions/freebsd/action.yml +++ b/.github/actions/freebsd/action.yml @@ -59,7 +59,6 @@ runs: `#--with-pdo-sqlite` \ --without-sqlite3 \ --without-pdo-sqlite \ - --without-pear \ --with-bz2 \ --with-avif \ --with-jpeg \ diff --git a/.gitignore b/.gitignore index b76b5a787caa0..f8b133f53149f 100644 --- a/.gitignore +++ b/.gitignore @@ -127,7 +127,6 @@ config.h.in # ------------------------------------------------------------------------------ /ext/phar/phar.phar /ext/phar/phar.php -/pear/install-pear-nozlib.phar /sapi/cgi/php-cgi /sapi/fpm/php-fpm /sapi/phpdbg/phpdbg diff --git a/CODING_STANDARDS.md b/CODING_STANDARDS.md index c599194ed50e3..adc9a8a876f22 100644 --- a/CODING_STANDARDS.md +++ b/CODING_STANDARDS.md @@ -298,8 +298,9 @@ The file labelled `EXPERIMENTAL` should include the following information: * Any authoring information (known bugs, future directions of the module). * Ongoing status notes which may not be appropriate for Git comments. -In general, new features should go to PECL or experimental branches until there -are specific reasons for directly adding them to the core distribution. +In general, new features should go to PIE extension or experimental branches +until there are specific reasons for directly adding them to the core +distribution. ## Aliases & legacy documentation diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index caaca316575e7..e5177d6baedff 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,7 +6,7 @@ websites is a never-ending one. With every release or release candidate comes a wave of work, which takes a lot of organization and co-ordination. You don't need any special access to download, build, debug and begin submitting -PHP or PECL code, tests or documentation. Once you've followed this guide and +PHP or extension code, tests or documentation. Once you've followed this guide and had several contributions accepted, commit privileges are often quickly granted. ## Index @@ -20,7 +20,7 @@ had several contributions accepted, commit privileges are often quickly granted. * [Getting help](#getting-help) * [PHP source code directory structure](#php-source-code-directory-structure) * [PHP internals](#php-internals) -* [PECL extensions](#pecl-extensions) +* [Extensions](#extensions) * [Checklist for submitting contribution](#checklist-for-submitting-contribution) * [What happens after submitting contribution?](#what-happens-after-submitting-contribution) * [What happens when your contribution is applied?](#what-happens-when-your-contribution-is-applied) @@ -149,11 +149,6 @@ about what you're working on, you can contact us via the [documentation mailing list](mailto:phpdoc@lists.php.net) for documentation issues. -Although not a formal channel, you can also find a number of core developers on -the #php.pecl channel on [EFnet](http://www.efnet.org/). Similarly, many -documentation writers can be found on #php.doc. Windows development IRC channel -is available at #winphp-dev on FreeNode. - ## PHP source code directory structure PHP source code also includes several files generated during development and @@ -237,7 +232,6 @@ locations. ├─ streams/ # Streams layer subsystem ├─ php_version.h # Generated by release managers using `configure` └─ ... - ├─ pear/ # PEAR installation └─ sapi/ # PHP SAPI modules └─ cli/ ├─ mime_type_map.h # Generated by `sapi/cli/generate_mime_type_map.php` @@ -258,27 +252,14 @@ For information on PHP internal C functions see Various external resources can be found on the web. A standard printed reference is the book "Extending and Embedding PHP" by Sara Golemon. -## PECL extensions +## Extensions -If you are fixing broken functionality in a [PECL](https://pecl.php.net) -extension then create a bug or identify an existing bug at -[bugs.php.net](https://bugs.php.net). A bug can be used to track the change +If you are fixing broken functionality in a PHP extension then create a bug or +identify an existing bug at GitHub. A bug can be used to track the change progress and prevent your changes getting lost in the PHP mail archives. Some -PECL extensions have their own bug tracker locations and different contributing +extensions have their own bug tracker locations and different contributing procedures. -If your change is large then create a -[Request for Comments (RFC)](https://wiki.php.net/rfc), discuss it with the -extension maintainer, and discuss it on the development mailing list -pecl-dev@lists.php.net depending on the extension. PECL mailing list -subscription is explained on the -[PECL support page](https://pecl.php.net/support.php). - -Update any open bugs and add a link to the source of your change. Send the patch -or pointer to the bug to pecl-dev@lists.php.net. Also CC the extension -maintainer. Explain what has been changed by your patch. Test scripts should be -included. - ## Checklist for submitting contribution - Read [Coding standards](/CODING_STANDARDS.md) before you start working. diff --git a/README.md b/README.md index 5b8ec6f0d7dc0..a4bb1b0ee6312 100644 --- a/README.md +++ b/README.md @@ -128,8 +128,7 @@ permissions. ## PHP extensions Extensions provide additional functionality on top of PHP. PHP consists of many -essential bundled extensions. Additional extensions can be found in the PHP -Extension Community Library - [PECL](https://pecl.php.net). +essential bundled extensions. Additional extensions can be found in Packagist ## Contributing diff --git a/configure.ac b/configure.ac index 77fc8c89cdf40..1057284393444 100644 --- a/configure.ac +++ b/configure.ac @@ -1142,46 +1142,6 @@ esac EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS" unset LIBS -dnl PEAR -dnl ---------------------------------------------------------------------------- - -PHP_HELP_SEPARATOR([PEAR:]) -PHP_CONFIGURE_PART([Configuring PEAR]) - -dnl If CLI is disabled disable PEAR. -AS_VAR_IF([PHP_CLI], [no], [with_pear=no]) - -PHP_ARG_WITH([pear], - [whether to install PEAR], - [AS_HELP_STRING([[--with-pear[=DIR]]], - [Install PEAR in DIR [PREFIX/lib/php]])], - [no], - [yes]) - -AS_VAR_IF([PHP_PEAR], [no],, [ - AC_MSG_WARN([The --with-pear option is deprecated]) - - dnl PEAR dependencies. - AS_VAR_IF([PHP_XML], [no], [AC_MSG_ERROR(m4_text_wrap([ - PEAR requires XML to be enabled. Add '--enable-xml' to the configure line, - or disable PEAR (--without-pear). - ]))]) - - install_pear=install-pear - - AS_VAR_IF([PHP_PEAR], [yes], - [AS_CASE([$PHP_LAYOUT], - [GNU], [PEAR_INSTALLDIR=$datadir/pear], - [PEAR_INSTALLDIR=$libdir/php])], - [PEAR_INSTALLDIR=$PHP_PEAR]) - - PHP_SUBST([PEAR_INSTALLDIR]) - PHP_ADD_BUILD_DIR([pear]) - PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/pear/Makefile.frag], - [$abs_srcdir/pear], - [pear]) -]) - dnl Configuring Zend and TSRM. dnl ---------------------------------------------------------------------------- @@ -1622,7 +1582,7 @@ else fi; all_targets="\$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_BINARIES) $pharcmd" -install_targets="$install_sapi $install_modules $install_binaries install-build install-headers install-programs $install_pear $pharcmd_install" +install_targets="$install_sapi $install_modules $install_binaries install-build install-headers install-programs $pharcmd_install" PHP_SUBST([all_targets]) PHP_SUBST([install_targets]) diff --git a/docs-old/self-contained-extensions.md b/docs-old/self-contained-extensions.md index 524b2e19f65de..2691cd9b76e73 100644 --- a/docs-old/self-contained-extensions.md +++ b/docs-old/self-contained-extensions.md @@ -155,19 +155,3 @@ an existing module called `foo`. ZEND_GET_MODULE(foo) #endif ``` - -## PECL site conformity - -If you plan to release an extension to the PECL website, there are several -points to be regarded. - -1. Add `LICENSE` or `COPYING` to the `package.xml` - -2. The following should be defined in one of the extension header files - -```c -#define PHP_FOO_VERSION "1.2.3" -``` - -This macro has to be used within your foo_module_entry to indicate the -extension version. diff --git a/docs/release-process.md b/docs/release-process.md index 08b95df53513f..f248caf04c6dd 100644 --- a/docs/release-process.md +++ b/docs/release-process.md @@ -610,9 +610,6 @@ slightly different steps. We'll call attention where the steps differ. ./scripts/dev/makedist php-X.Y.Z ``` - > 💬 **Hint** \ - > Check if the PEAR files are updated (Phar). - > 💡 **Tip** \ > On some systems the behavior of GNU tar can default to produce POSIX > compliant archives with PAX headers. As not every application is diff --git a/ext/standard/credits.c b/ext/standard/credits.c index 4e8722db4d663..df09e227514a9 100644 --- a/ext/standard/credits.c +++ b/ext/standard/credits.c @@ -111,7 +111,7 @@ PHPAPI ZEND_COLD void php_print_credits(int flag) /* {{{ */ php_info_print_table_start(); php_info_print_table_colspan_header(2, "Websites and Infrastructure team"); - /* www., wiki., windows., master., and others, I guess pecl. too? */ + /* www., wiki., windows., master., and others */ CREDIT_LINE("PHP Websites Team", "Rasmus Lerdorf, Hannes Magnusson, Philip Olson, Lukas Kahwe Smith, Pierre-Alain Joye, Kalle Sommer Nielsen, Peter Cowburn, Adam Harvey, Ferenc Kovacs, Levi Morrison"); CREDIT_LINE("Event Maintainers", "Damien Seguy, Daniel P. Brown"); /* Mirroring */ diff --git a/pear/Makefile.frag b/pear/Makefile.frag deleted file mode 100644 index 642267cc242e4..0000000000000 --- a/pear/Makefile.frag +++ /dev/null @@ -1,34 +0,0 @@ -peardir=$(PEAR_INSTALLDIR) - -# Skip all php.ini files altogether -PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dopen_basedir= -derror_reporting=1803 -dmemory_limit=-1 - -WGET = `which wget 2>/dev/null` -FETCH = `which fetch 2>/dev/null` -PEAR_PREFIX = -dp a${program_prefix} -PEAR_SUFFIX = -ds a$(program_suffix) -PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar - -install-pear-installer: $(SAPI_CLI_PATH) - @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX} - -install-pear: - @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" - @if test ! -f $(builddir)/install-pear-nozlib.phar; then \ - if test -f $(srcdir)/install-pear-nozlib.phar; then \ - cp $(srcdir)/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \ - else \ - if test ! -z "$(WGET)" && test -x "$(WGET)"; then \ - "$(WGET)" "${PEAR_INSTALLER_URL}" -nd -P $(builddir)/; \ - elif test ! -z "$(FETCH)" && test -x "$(FETCH)"; then \ - "$(FETCH)" -o $(builddir)/ "${PEAR_INSTALLER_URL}"; \ - else \ - $(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \ - fi \ - fi \ - fi - @if test -f $(builddir)/install-pear-nozlib.phar && $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \ - $(MAKE) -s install-pear-installer; \ - else \ - cat $(srcdir)/install-pear.txt; \ - fi diff --git a/pear/fetch.php b/pear/fetch.php deleted file mode 100644 index 56767b62cb707..0000000000000 --- a/pear/fetch.php +++ /dev/null @@ -1,74 +0,0 @@ - \n", $argv[0]); - exit(1); -} - -function stream_notification_callback($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max) { - static $filesize = null; - - switch($notification_code) { - case STREAM_NOTIFY_RESOLVE: - case STREAM_NOTIFY_AUTH_REQUIRED: - case STREAM_NOTIFY_COMPLETED: - case STREAM_NOTIFY_FAILURE: - case STREAM_NOTIFY_AUTH_RESULT: - /* Ignore */ - break; - - case STREAM_NOTIFY_REDIRECTED: - echo "Being redirected to: ", $message, "\n"; - break; - - case STREAM_NOTIFY_CONNECT: - echo "Connected...\n"; - break; - - case STREAM_NOTIFY_FILE_SIZE_IS: - $filesize = $bytes_max; - echo "Filesize: ", $filesize, "\n"; - break; - - case STREAM_NOTIFY_MIME_TYPE_IS: - echo "Mime-type: ", $message, "\n"; - break; - - case STREAM_NOTIFY_PROGRESS: - if ($bytes_transferred > 0) { - if (!isset($filesize)) { - printf("\rUnknown filesize.. %2d kb done..", $bytes_transferred/1024); - } else { - $length = (int)(($bytes_transferred/$filesize)*100); - printf("\r[%-100s] %d%% (%2d/%2d kb)", str_repeat("=", $length). ">", $length, ($bytes_transferred/1024), $filesize/1024); - } - } - break; - } -} - -isset($argv[1], $argv[2]) or usage($argv); - -if (!isset($_ENV['http_proxy'])) { - $copt = null; -} else { - $copt = array( - 'http' => array( - 'proxy' => preg_replace('/^http/i', 'tcp', $_ENV['http_proxy']), - 'request_fulluri' => true, - ), - ); -} - -$ctx = stream_context_create($copt, array("notification" => "stream_notification_callback")); - -$fp = fopen($argv[1], "r", false, $ctx); -if (is_resource($fp) && file_put_contents($argv[2], $fp)) { - echo "\nDone!\n"; - exit(0); -} - -$err = error_get_last(); -echo "\nError..\n", $err["message"], "\n"; -exit(1); diff --git a/pear/install-pear.txt b/pear/install-pear.txt deleted file mode 100644 index 2005a56997210..0000000000000 --- a/pear/install-pear.txt +++ /dev/null @@ -1,12 +0,0 @@ -+----------------------------------------------------------------------+ -| The installation process is not complete. The following resources | -| were not installed: | -| | -| PEAR: PHP Extension and Application Repository | -| | -| To install these components, download | -| https://pear.php.net/install-pear-nozlib.phar to php-src/pear/ | -| become the superuser and execute: | -| | -| # make install-pear | -+----------------------------------------------------------------------+ diff --git a/php.ini-development b/php.ini-development index 7018682fb0d9a..425dd5c68e3d8 100644 --- a/php.ini-development +++ b/php.ini-development @@ -735,7 +735,7 @@ default_charset = "UTF-8" ; Windows: "\path1;\path2" ;include_path = ".;c:\php\includes" ; -; PHP's default setting for include_path is ".;/path/to/php/pear" +; PHP's default setting for include_path is "." ; https://php.net/include-path ; The root of the PHP pages, used only if nonempty. @@ -910,7 +910,7 @@ default_socket_timeout = 60 ; Notes for Windows environments : ; ; - Many DLL files are located in the ext/ -; extension folders as well as the separate PECL DLL download. +; extension folders as well as the separate DLL download. ; Be sure to appropriately set the extension_dir directive. ; ;extension=bz2 diff --git a/php.ini-production b/php.ini-production index 602d005afd54f..a24f50390277c 100644 --- a/php.ini-production +++ b/php.ini-production @@ -737,7 +737,7 @@ default_charset = "UTF-8" ; Windows: "\path1;\path2" ;include_path = ".;c:\php\includes" ; -; PHP's default setting for include_path is ".;/path/to/php/pear" +; PHP's default setting for include_path is "." ; https://php.net/include-path ; The root of the PHP pages, used only if nonempty. @@ -912,7 +912,7 @@ default_socket_timeout = 60 ; Notes for Windows environments : ; ; - Many DLL files are located in the ext/ -; extension folders as well as the separate PECL DLL download. +; extension folders as well as the separate DLL download. ; Be sure to appropriately set the extension_dir directive. ; ;extension=bz2 diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4 index 76c2d64e8c8a3..d0bc8c4bb1c95 100644 --- a/sapi/cli/config.m4 +++ b/sapi/cli/config.m4 @@ -1,7 +1,7 @@ PHP_ARG_ENABLE([cli], [for CLI build], [AS_HELP_STRING([--disable-cli], - [Disable building CLI version of PHP (this forces --without-pear)])], + [Disable building CLI version of PHP])], [yes], [no]) diff --git a/scripts/dev/makedist b/scripts/dev/makedist index 9417515fe1d8b..dc14ed2db4b84 100755 --- a/scripts/dev/makedist +++ b/scripts/dev/makedist @@ -160,20 +160,6 @@ fi # Remove not needed files. rm -rf autom4te.cache/ -# Download PEAR. -echo "" -echo "makedist: Attempting to download PEAR's phar archive." -if test ! -x wget; then - wget https://pear.php.net/install-pear-nozlib.phar -nd -P pear/ - if [ "x$?" != "x0" ]; then - echo "makedist: PEAR download failed." >&2 - exit 1 - fi -else - echo "makedist: Missing wget binary needed for PEAR download." >&2 - exit 1 -fi - # Reset the modification and access times of all files to be packaged. commitDate="$(git log -1 --format=%cI $treeish)" echo "makedist: Resetting the modification and access times of package files to $commitDate" diff --git a/win32/build/Makefile.phpize b/win32/build/Makefile.phpize index 762b42444bfb1..0c2f873595944 100644 --- a/win32/build/Makefile.phpize +++ b/win32/build/Makefile.phpize @@ -16,26 +16,16 @@ DEBUGGER_CMD= DEBUGGER_ARGS= !endif -all: $(EXT_TARGETS) $(PECL_TARGETS) +all: $(EXT_TARGETS) build_dirs: $(BUILD_DIR) $(BUILD_DIRS_SUB) -clean-pecl: - @echo Cleaning PECL targets only - -rd /s /q $(BUILD_DIR)\pecl - clean-all: @echo Cleaning standard build dirs cd $(BUILD_DIR) @for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @rd /s /q %D -@del /f /q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.manifest $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk $(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF) $(BUILD_DIR)\*.rc $(BUILD_DIR)\*.dbg $(BUILD_DIR)\*.bin $(BUILD_DIR)\php*.dll $(BUILD_DIR)\php*.exe > NUL -clean: clean-pecl - @echo Cleaning distribution build dirs - cd $(BUILD_DIR) - @for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @del /F /Q %D\*.* > NUL - -@del /F /Q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk $(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF) $(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32.zip $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip > NUL - !if "$(EXT_TARGETS)" == "" _EXTENSION_DLL=$(PECL_TARGETS) !else diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in index 7b1bb4d932d33..5e93bba60d747 100644 --- a/win32/build/config.w32.h.in +++ b/win32/build/config.w32.h.in @@ -10,12 +10,11 @@ /* Default PHP / PEAR directories */ #define PHP_CONFIG_FILE_PATH "" -#define PEAR_INSTALLDIR "@PREFIX@\\pear" #define PHP_BINDIR "@PREFIX@" #define PHP_SBINDIR "@PREFIX@" #define PHP_DATADIR "@PREFIX@" #define PHP_EXTENSION_DIR "@PREFIX@\\ext" -#define PHP_INCLUDE_PATH ".;@PREFIX@\\pear" +#define PHP_INCLUDE_PATH "." #define PHP_LIBDIR "@PREFIX@" #define PHP_LOCALSTATEDIR "@PREFIX@" #define PHP_PREFIX "@PREFIX@"