Merge remote-tracking branch 'origin/fix/icurel' into fix/icurel

# Conflicts:
#	src/SPC/builder/unix/library/gettext.php
#	src/SPC/builder/unix/library/libiconv.php
#	src/SPC/builder/unix/library/libxslt.php

src/SPC/builder/linux/library/libpng.php

@@ -24,6 +24,7 @@ namespace SPC\builder\linux\library;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
 use SPC\exception\WrongUsageException;
+use SPC\util\executor\UnixAutoconfExecutor;
 
 class libpng extends LinuxLibraryBase
 {
@@ -36,28 +37,21 @@ class libpng extends LinuxLibraryBase
      */
     public function build(): void
     {
-        $optimizations = match (getenv('SPC_ARCH')) {
-            'x86_64' => '--enable-intel-sse ',
-            'aarch64' => '--enable-arm-neon ',
-            default => '',
-        };
-        shell()->cd($this->source_dir)->initializeEnv($this)
+        UnixAutoconfExecutor::create($this)
             ->exec('chmod +x ./configure')
             ->exec('chmod +x ./install-sh')
-            ->exec(
-                'LDFLAGS="-L' . BUILD_LIB_PATH . '" ' .
-                './configure ' .
-                '--disable-shared ' .
-                '--enable-static ' .
-                '--with-pic ' .
-                '--enable-hardware-optimizations ' .
-                '--with-zlib-prefix="' . BUILD_ROOT_PATH . '" ' .
-                $optimizations .
-                '--prefix='
+            ->appendEnv(['LDFLAGS' => "-L{$this->getLibDir()}"])
+            ->configure(
+                '--enable-hardware-optimizations',
+                "--with-zlib-prefix={$this->getBuildRootPath()}",
+                match (getenv('SPC_ARCH')) {
+                    'x86_64' => '--enable-intel-sse',
+                    'aarch64' => '--enable-arm-neon',
+                    default => '',
+                }
             )
-            ->exec('make clean')
-            ->exec("make -j{$this->builder->concurrency} DEFAULT_INCLUDES='-I{$this->source_dir} -I" . BUILD_INCLUDE_PATH . "' LIBS= libpng16.la")
-            ->exec('make install-libLTLIBRARIES install-data-am DESTDIR=' . BUILD_ROOT_PATH);
+            ->make('libpng16.la', 'install-libLTLIBRARIES install-data-am', after_env_vars: ['DEFAULT_INCLUDES' => "-I{$this->source_dir} -I{$this->getIncludeDir()}"]);
+
         $this->patchPkgconfPrefix(['libpng16.pc'], PKGCONF_PATCH_PREFIX);
         $this->patchLaDependencyPrefix();
     }