minizip is not used anymore

Change-Id: I0ddc4d343882248d208c9f96366625bcbe6ac4f7

config_host.mk.in

@@ -384,7 +384,6 @@ export MINGW_LIBEXSLT_DLL=@MINGW_LIBEXSLT_DLL@
 export MINGW_LIBXML_DLL=@MINGW_LIBXML_DLL@
 export MINGW_LIBXSLT_DLL=@MINGW_LIBXSLT_DLL@
 export MINGW_LPSOLVE_DLL=@MINGW_LPSOLVE_DLL@
-export MINGW_MINIZIP_DLL=@MINGW_MINIZIP_DLL@
 export MINGW_MYTHES_DLL=@MINGW_MYTHES_DLL@
 export MINGW_NEON_DLL=@MINGW_NEON_DLL@
 export MINGW_NSPR4_DLL=@MINGW_NSPR4_DLL@
@@ -413,8 +412,6 @@ export MINGW_SYSROOT=@MINGW_SYSROOT@
 export MINGW_TASN1_DLL=@MINGW_TASN1_DLL@
 export MINGW_TERMCAP_DLL=@MINGW_TERMCAP_DLL@
 export MINGW_ZLIB_DLL=@MINGW_ZLIB_DLL@
-export MINIZIP_CFLAGS=@MINIZIP_CFLAGS@
-export MINIZIP_LIBS=@MINIZIP_LIBS@
 export MKDEPENDSOLVER=TRUE
 export ML_EXE=@ML_EXE@
 export MOC4=@MOC4@
@@ -606,7 +603,6 @@ export SYSTEM_LIBXSLT=@SYSTEM_LIBXSLT@
 export SYSTEM_LIBXSLT_FOR_BUILD=@SYSTEM_LIBXSLT_FOR_BUILD@
 export SYSTEM_LPSOLVE=@SYSTEM_LPSOLVE@
 export SYSTEM_MDDS=@SYSTEM_MDDS@
-export SYSTEM_MINIZIP=@SYSTEM_MINIZIP@
 export SYSTEM_MESA_HEADERS=@SYSTEM_MESA_HEADERS@
 export SYSTEM_MOZILLA=@SYSTEM_MOZILLA@
 export SYSTEM_MOZILLA_HEADERS=@SYSTEM_MOZILLA_HEADERS@

configure.ac

@@ -6824,16 +6824,9 @@ if test "$with_system_zlib" = "yes"; then
         [AC_MSG_ERROR(zlib.h not found. install zlib)], [])
     AC_CHECK_LIB(z, deflate, [ ZLIB=-lz ],
         [AC_MSG_ERROR(zlib not found or functional)], [])
-    if test "$WITH_MINGW" = "yes"; then
-        # we need minizip too
-        PKG_CHECK_MODULES([MINIZIP], [minizip])
-        libo_MINGW_CHECK_DLL([MINIZIP], [libminizip])
-        SYSTEM_MINIZIP=YES
-    fi
 else
     AC_MSG_RESULT([internal])
     SYSTEM_ZLIB=NO
-    SYSTEM_MINIZIP=NO
     BUILD_TYPE="$BUILD_TYPE ZLIB"
     ZLIB_CFLAGS="-I${OUTDIR}/inc/external/zlib"
     ZLIB_LIBS="-L${OUTDIR}/lib -lz"
@@ -6842,8 +6835,6 @@ fi
 AC_SUBST(ZLIB_CFLAGS)
 AC_SUBST(ZLIB_LIBS)
 AC_SUBST(SYSTEM_ZLIB)
-AC_SUBST([SYSTEM_MINIZIP])
-AC_SUBST([MINGW_MINIZIP_DLL])
 AC_SUBST(ZLIB_TARBALL)
 
 dnl ===================================================================

external/mingw-dlls/makefile.mk

@@ -68,7 +68,6 @@ MINGW_DLLS:= \
     $(MINGW_LIBXML_DLL) \
     $(MINGW_LIBXSLT_DLL) \
     $(MINGW_LPSOLVE_DLL) \
-    $(MINGW_MINIZIP_DLL) \
     $(MINGW_MYTHES_DLL) \
     $(MINGW_NEON_DLL) \
     $(MINGW_NSPR4_DLL) \

scp2/InstallModule_ooo.mk

@@ -117,7 +117,6 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
 	MINGW_LIBXML_DLL \
 	MINGW_LIBXSLT_DLL \
 	MINGW_LPSOLVE_DLL \
-	MINGW_MINIZIP_DLL \
 	MINGW_MYTHES_DLL \
 	MINGW_NEON_DLL \
 	MINGW_NSPR4_DLL \

scp2/source/ooo/mingw_dlls.scp

@@ -136,12 +136,6 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgrahpite, MINGW_GRAPHITE2_DLL )
 #endif
 #endif
 
-#ifdef SYSTEM_MINIZIP
-#ifdef NEEDS_MINGW_MINIZP_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libminizip, MINGW_MINIZIP_DLL )
-#endif
-#endif
-
 #ifdef SYSTEM_NEON
 #ifdef NEEDS_MINGW_TASN1_DLL
 MINGW_DLL( gid_Brand_File_Lib_Mingw_Libtasn,   MINGW_TASN1_DLL )

solenv/inc/libs.mk

@@ -187,12 +187,6 @@ ZLIB3RDLIB=-lz
 .ELSE
 ZLIB3RDLIB=-lzlib
 .ENDIF
-.IF "$(SYSTEM_MINIZIP)"=="YES"
-MINIZIP3RDLIB=$(MINIZIP_LIBS)
-.ELSE
-# internally, minizip is included in zlib
-MINIZIP3RDLIB=
-.ENDIF
 JPEG3RDLIB=-ljpeg
 .IF "$(SYSTEM_DB)" == "YES"
 BERKELEYLIB=-l$(DB_LIB)