From 9e8f0b9d91f888c9d82a9c87878a4809ace57868 Mon Sep 17 00:00:00 2001 From: Enrico Forestieri Date: Fri, 24 Aug 2007 18:02:14 +0000 Subject: [PATCH] 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 --- config/lyxinclude.m4 | 5 +---- src/support/Makefile.am | 8 ++------ 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index 988272ed83..8793b3d3e5 100644 --- 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 d442a630e9..e26d035a6b 100644 --- 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