[linux] don't statically link expat on systems that have it

This commit is contained in:
Darafei Praliaskouski 2013-07-30 18:05:09 +03:00 committed by Alex Zolotarev
parent c0d0baea74
commit a9113ff284
4 changed files with 15 additions and 5 deletions

View file

@ -2,7 +2,11 @@
TEMPLATE = subdirs
SUBDIRS = expat freetype fribidi zlib bzip2 jansson tomcrypt protobuf
SUBDIRS = freetype fribidi zlib bzip2 jansson tomcrypt protobuf
!linux*:android* {
SUBDIRS *= expat
}
!iphone*:!bada*:!android* {
SUBDIRS += gflags \

View file

@ -8,7 +8,11 @@ DEPENDENCIES = base bzip2 zlib tomcrypt
include($$ROOT_DIR/common.pri)
INCLUDEPATH += ../3party/tomcrypt/src/headers ../3party/zlib
INCLUDEPATH *= ../3party/tomcrypt/src/headers ../3party/zlib
!linux*:android* {
INCLUDEPATH *= ../3party/expat/lib
}
SOURCES += \
internal/file_data.cpp \

View file

@ -35,7 +35,7 @@
//-----------------------------------------------------------------------------
#include <assert.h>
#include "../expat/lib/expat.h"
#include <expat.h>
//-----------------------------------------------------------------------------
//

6
debian/control vendored
View file

@ -2,7 +2,7 @@ Source: mapswithme
Section: utils
Priority: extra
Maintainer: Darafei A. Praliaskouski <komzpa@mapswith.me>
Build-Depends: debhelper (>= 8), qt5-default|qt4-qmake, mesa-common-dev, qtbase5-dev|libqt4-dev, libqt5opengl5-dev|libqt4-opengl-dev, git, libssl-dev, ca-certificates
Build-Depends: debhelper (>= 8), qt5-default|qt4-qmake, mesa-common-dev, qtbase5-dev|libqt4-dev, libqt5opengl5-dev|libqt4-opengl-dev, git, libssl-dev, ca-certificates, libexpat-dev
Standards-Version: 3.9.3
Homepage: http://mapswith.me/
@ -34,7 +34,9 @@ Architecture: any
Depends: fonts-roboto|fonts-mapswithme, ttf-dejavu-core|fonts-mapswithme, ttf-wqy-microhei|fonts-mapswithme, fonts-dzongkha|fonts-mapswithme, fonts-sil-padauk|fonts-mapswithme, fonts-khmeros-core|fonts-mapswithme, fonts-tlwg-umpush|fonts-mapswithme, fonts-sil-abyssinica|fonts-mapswithme, fonts-paktype|fonts-mapswithme, mapswithme-data, ${shlibs:Depends}, ${misc:Depends}
Description: MapsWithMe server application
This package contains server application for using MapsWithMe engine in
userless environments.
userless environments. Maps work everywhere!
.
If you're not a developer you probably don't need this package.
Package: fonts-mapswithme
Architecture: all