diff options
| -rw-r--r-- | config_host.mk.in | 4 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | external/mingw-dlls/makefile.mk | 1 | ||||
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/mingw_dlls.scp | 6 | ||||
| -rw-r--r-- | solenv/inc/libs.mk | 6 |
6 files changed, 0 insertions, 27 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index fc348b326616..9a5fbfde5d52 100644 --- a/config_host.mk.in +++ b/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@ diff --git a/configure.ac b/configure.ac index 0556a9a5d296..6f654a2b709f 100644 --- a/configure.ac +++ b/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 =================================================================== diff --git a/external/mingw-dlls/makefile.mk b/external/mingw-dlls/makefile.mk index 8a7b3c5e18e6..3aa71cfb0d47 100644 --- a/external/mingw-dlls/makefile.mk +++ b/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) \ diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index c1b3c44b9bfc..ddd498d3e6c3 100644 --- a/scp2/InstallModule_ooo.mk +++ b/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 \ diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp index 7124530a3ddd..33f7d6778f4a 100644 --- a/scp2/source/ooo/mingw_dlls.scp +++ b/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 ) diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index f705d5f0b8fb..2720144ed79b 100644 --- a/solenv/inc/libs.mk +++ b/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) |