Merge remote-tracking branch 'origin/distributions-fixes-ubuntu'

yixingwang0517 · Jan 4, 2017 · f590378 · f590378
2 parents 8ad643e + 3fbc5ce
commit f590378
Show file tree

Hide file tree

Showing 10 changed files with 618 additions and 15 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -1,9 +1,9 @@
-ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
-SUBDIRS = src include examples doc 
-EXTRA_DIST = curlpp.VC8.vcproj curlpp.VC8.sln CHANGES curlpp.spec README.win32 win32/*
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = curlpp.pc
-
-bin_SCRIPTS = curlpp-config
-
+ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
+SUBDIRS = src include examples doc 
+EXTRA_DIST = curlpp.VC8.vcproj curlpp.VC8.sln CHANGES curlpp.spec README.win32 win32/*
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = curlpp.pc
+
+bin_SCRIPTS = curlpp-config
+
diff --git a/TODO b/TODO
@@ -1,2 +1,3 @@
 - Need to fix the OptionList::print function.
-- Need to put WriteStream and ReadStream to be exception safe.
+- Need to put WriteStream and ReadStream to be exception safe.
+- Need to have better define tests when boost isn't available
diff --git a/configure.ac b/configure.ac
@@ -37,6 +37,9 @@ AC_PROG_CPP
 AC_PROG_CXX
 AC_PROG_INSTALL
 
+AX_CXX_COMPILE_STDCXX_11()
+
+
 dnl AC_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL

diff --git a/curlpp-0.7.4-beta.tar.gz b/curlpp-0.7.4-beta.tar.gz
diff --git a/curlpp-0.7.4-beta.zip b/curlpp-0.7.4-beta.zip
diff --git a/examples/example18.cpp b/examples/example18.cpp
@@ -31,9 +31,7 @@
 #include <sstream>
 #include <cstdlib>
 
-#ifdef HAVE_BOOST
 #include <boost/bind.hpp>
-#endif
 #include <curlpp/cURLpp.hpp>
 #include <curlpp/Easy.hpp>
 #include <curlpp/Options.hpp>

diff --git a/include/curlpp/cURLpp.hpp b/include/curlpp/cURLpp.hpp
@@ -25,8 +25,8 @@
 #ifndef CURLPP_CURLPP_HPP
 #define CURLPP_CURLPP_HPP
 
-#define LIBCURLPP_VERSION "0.7.3"
-#define LIBCURLPP_VERSION_NUM 0x000703
+#define LIBCURLPP_VERSION "0.7.4"
+#define LIBCURLPP_VERSION_NUM 0x000704
 
 
 #include "internal/buildconfig.h"