[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=cc8fcb0

The following commit has been merged in the master branch:
commit cc8fcb08c1be0f4fb365879d3b5d69066af39864
Author: Robin Mills <robin at clanmills.com>
Date:   Fri Jan 2 09:49:16 2015 +0000

    #1012. r3508 broke the build on macosx and linux.
    Fixed cosmetic issues in samples/httptest.cpp and <exiv2dir>/Makefile.
---
 Makefile               | 1 +
 include/exiv2/http.hpp | 7 +++++++
 samples/httptest.cpp   | 5 -----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 8912e54..c45b2f5 100644
--- a/Makefile
+++ b/Makefile
@@ -124,6 +124,7 @@ mostlyclean clean: config/config.mk
 # for packaging.
 distclean: clean
 	rm -f config.log config.status libtool
+	rm -rf test/data/eps test/data/video
 	rm -f *~ *.bak
 	if [ -e bin ]; then rm -rf bin ; fi
 
diff --git a/include/exiv2/http.hpp b/include/exiv2/http.hpp
index 88c0c33..4431680 100644
--- a/include/exiv2/http.hpp
+++ b/include/exiv2/http.hpp
@@ -5,6 +5,8 @@
 #include <map>
 #include <algorithm>
 
+#include <exiv2/exiv2.hpp>
+
 namespace Exiv2 {
     typedef std::map<std::string,std::string> dict_t;
     typedef dict_t::iterator                  dict_i;
@@ -12,4 +14,9 @@ namespace Exiv2 {
     EXIV2API int http(dict_t& request,dict_t& response,std::string& errors);
 
 }
+
+#if EXV_USE_CURL
+#include <curl/curl.h>
+#endif
+
 #endif
diff --git a/samples/httptest.cpp b/samples/httptest.cpp
index d2764a1..deae7d5 100644
--- a/samples/httptest.cpp
+++ b/samples/httptest.cpp
@@ -9,11 +9,6 @@
 #include <stdlib.h>
 using namespace std;
 
-#if     defined(_MSC_VER)
-#pragma comment(lib, "ws2_32.lib")
-#pragma comment(lib, "wldap32.lib")
-#endif
-
 static int testSyntax(const char* arg)
 {
 	if ( !arg ) {

-- 
exiv2 packaging