[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=7f19cbb

The following commit has been merged in the master branch:
commit 7f19cbbc070f84377d8135d553dd084da7e907f3
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Jun 13 21:14:39 2016 +0000

    #1192 Thank You, Matthieu for the patch.
---
 config/configure.ac | 4 +++-
 src/CMakeLists.txt  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/config/configure.ac b/config/configure.ac
index 467c43c..2e5f484 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -318,8 +318,10 @@ AC_SUBST(EXV_LIB_STATIC)
 case "$host_os" in
 *mingw* | *cygwin*)
     LDFLAGS="$LDFLAGS -no-undefined -lpsapi -lwldap32 -lws2_32" ;;
-*)
+*linux-gnu*)
     LDFLAGS="$LDFLAGS -ldl -lpthread" ;;
+*)
+    LDFLAGS="$LDFLAGS -lpthread" ;;
 esac
 
 # 1099
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f4d2826..8823957 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -246,7 +246,7 @@ if ( MSVC )
     source_group("Header Files" FILES ${SSH_HDR} )
     TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${SSH_LIBRARIES} )
 else()
-    if ( NOT MINGW )
+    if ( LINUX )
         TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${EXPAT_LIBRARIES} )
         TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${CURL_LIBRARIES} )
         TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${SSH_LIBRARIES} )

-- 
exiv2 packaging