Compile all minizip sources also on *nix platforms, as platform

specific code is #ifdef'd out.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19782 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 988272ed8345328a446c729bbbe797c39ee5ffc9..8793b3d3e5638a2300659feddf2841c72e8963ba 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -580,7 +580,6 @@ AC_ARG_WITH(packaging,
   esac])
 AC_MSG_RESULT($lyx_use_packaging)
 lyx_install_macosx=false
-lyx_install_windows=false
 case $lyx_use_packaging in
    macosx) AC_DEFINE(USE_MACOSX_PACKAGING, 1, [Define to 1 if LyX should use a MacOS X application bundle file layout])
           PACKAGE=LyX${version_suffix}
@@ -598,8 +597,7 @@ case $lyx_use_packaging in
           libdir='${prefix}/Resources'
           datadir='${prefix}/Resources'
           pkgdatadir='${datadir}'
-          mandir='${prefix}/Resources/man'
-          lyx_install_windows=true ;;
+          mandir='${prefix}/Resources/man' ;;
     posix) AC_DEFINE(USE_POSIX_PACKAGING, 1, [Define to 1 if LyX should use a POSIX-style file layout])
           PACKAGE=lyx${version_suffix}
           program_suffix=$version_suffix
@@ -608,7 +606,6 @@ case $lyx_use_packaging in
     *) LYX_ERROR([Unknown packaging type $lyx_use_packaging]) ;;
 esac
 AM_CONDITIONAL(INSTALL_MACOSX, $lyx_install_macosx)
-AM_CONDITIONAL(INSTALL_WINDOWS, $lyx_install_windows)
 AC_SUBST(pkgdatadir)
 AC_SUBST(program_suffix)
 ])

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index d442a630e9826152bc74a94b5d6a35a97dfffd38..e26d035a6b7bef069d684bec9911d695de5e0188 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -96,17 +96,13 @@ liblyxsupport_la_SOURCES = \
        minizip/crypt.h \
        minizip/ioapi.c \
        minizip/ioapi.h \
+       minizip/iowin32.c \
+       minizip/iowin32.h \
        minizip/unzip.c \
        minizip/unzip.h \
        minizip/zip.c \
        minizip/zip.h
 
-if INSTALL_WINDOWS
-liblyxsupport_la_SOURCES += \
-       minizip/iowin32.c \
-       minizip/iowin32.h
-endif
-
 Package.cpp: build_package
 
 # Solaris sed does not like spaces bewteen the ;-delimited commands