Fix zlib-ng directory

.gitmodules

@@ -13,10 +13,6 @@
 [submodule "lib/openssl"]
 	path = lib/openssl
 	url = https://github.com/hakasenyang/openssl-custom.git
-[submodule "lib/zlib"]
-	path = lib/zlib
-	url = https://github.com/cloudflare/zlib.git
-	branch = gcc.amd64
 [submodule "lib/ngx_http_geoip2_module"]
 	path = lib/ngx_http_geoip2_module
 	url = https://github.com/leev/ngx_http_geoip2_module.git
@@ -41,3 +37,6 @@
 [submodule "lib/zstd-nginx-module"]
 	path = lib/zstd-nginx-module
 	url = https://github.com/tokers/zstd-nginx-module
+[submodule "lib/zlib-ng"]
+	path = lib/zlib-ng
+	url = https://github.com/zlib-ng/zlib-ng

auto.sh

@@ -41,20 +41,20 @@ if [ ! -f "lib/pcre/configure" ]; then
 fi
 
 ### ZLIB reconf
-if [ "$BITCHK" = 64 ]; then
-    if [ ! -f "lib/zlib/Makefile" ]; then
-        cd lib/zlib
-        ./configure --64
-        cd ../..
-    fi
-else
-    if [ ! -f "lib/zlib_x86/Makefile" ]; then
-        git submodule add --force https://github.com/madler/zlib.git lib/zlib_x86
-        cd lib/zlib_x86
-        ./configure
-        cd ../..
-    fi
-fi
+#if [ "$BITCHK" = 64 ]; then
+#    if [ ! -f "lib/zlib/Makefile" ]; then
+#        cd lib/zlib
+#        ./configure --64
+#        cd ../..
+#    fi
+#else
+#    if [ ! -f "lib/zlib_x86/Makefile" ]; then
+#        git submodule add --force https://github.com/madler/zlib.git lib/zlib_x86
+#        cd lib/zlib_x86
+#        ./configure
+#        cd ../..
+#    fi
+#fi
 
 ### PSOL Download (PageSpeed)
 if [ ! -d "lib/pagespeed" ] && [ "$PAGESPEED" = 1 ]; then
@@ -74,12 +74,13 @@ fi
 
 ### x86, x64 Check (Configuration)
 if [ "$BITCHK" = 64 ]; then
-    BUILD_BIT="-m64 "
-    BUILD_ZLIB="./lib/zlib"
+    # Temporary remove
+    #BUILD_BIT="-m64 "
+    BUILD_ZLIB="./lib/zlib-ng"
     BUILD_LD="-lrt -ljemalloc -Wl,-z,relro -Wl,-z,now -fPIC"
 else
     BUILD_BIT=""
-    BUILD_ZLIB="./lib/zlib_x86"
+    BUILD_ZLIB="./lib/zlib-ng"
     BUILD_LD=""
 fi
 

auto/lib/zlib/make

@@ -52,7 +52,7 @@ END
 
 $ZLIB/libz.a:	$NGX_MAKEFILE
 	cd $ZLIB \\
-	&& \$(MAKE) distclean \\
+	&& \$(MAKE) clean \\
 	&& \$(MAKE) -f win32/Makefile.gcc \\
 		CFLAGS="$ZLIB_OPT" CC="\$(CC)" \\
 		libz.a
@@ -75,10 +75,10 @@ END
 
 $ZLIB/libz.a:	$NGX_MAKEFILE
 	cd $ZLIB \\
-	&& \$(MAKE) distclean \\
+	&& \$(MAKE) clean \\
 	&& cp contrib/asm586/match.S . \\
 	&& CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\
-		./configure \\
+		./configure --zlib-compat \\
 	&& \$(MAKE) OBJA=match.o libz.a
 
 END
@@ -92,10 +92,10 @@ END
 
 $ZLIB/libz.a:	$NGX_MAKEFILE
 	cd $ZLIB \\
-	&& \$(MAKE) distclean \\
+	&& \$(MAKE) clean \\
 	&& cp contrib/asm686/match.S . \\
 	&& CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\
-		./configure \\
+		./configure --zlib-compat \\
 	&& \$(MAKE) OBJA=match.o libz.a
 
 END
@@ -125,9 +125,9 @@ if [ $done = NO ]; then
 
 $ZLIB/libz.a:	$NGX_MAKEFILE
 	cd $ZLIB \\
-	&& \$(MAKE) distclean \\
+	&& \$(MAKE) clean \\
 	&& CFLAGS="$ZLIB_OPT" CC="\$(CC)" \\
-		./configure \\
+		./configure --zlib-compat \\
 	&& \$(MAKE) libz.a
 
 END