mirror of https://github.com/getdnsapi/getdns.git
Merge branch 'develop' into features/mingw-win10
This commit is contained in:
Jim Hague
commit
0895522734
|
|
@ -1,3 +1,7 @@
|
|||
* 2017-1?-??: Version 1.2.1
|
||||
* Fix Makefile dependencies for parallel install.
|
||||
Thanks ilovezfs
|
||||
|
||||
* 2017-09-29: Version 1.2.0
|
||||
* Bugfix of rc1: authentication of first query with TLS
|
||||
Thanks Travis Burtrum
|
||||
|
|
|
|||
84
configure.ac
84
configure.ac
|
|
@ -36,12 +36,12 @@ sinclude(./m4/acx_getaddrinfo.m4)
|
|||
sinclude(./m4/ax_check_compile_flag.m4)
|
||||
sinclude(./m4/pkg.m4)
|
||||
|
||||
AC_INIT([getdns], [1.2.0], [users@getdnsapi.net], [], [https://getdnsapi.net])
|
||||
AC_INIT([getdns], [1.2.1], [users@getdnsapi.net], [], [https://getdnsapi.net])
|
||||
|
||||
# Dont forget to put a dash in front of the release candidate!!!
|
||||
# That is how it is done with semantic versioning!
|
||||
#
|
||||
AC_SUBST(RELEASE_CANDIDATE, [])
|
||||
AC_SUBST(RELEASE_CANDIDATE, [rc1])
|
||||
|
||||
# Set current date from system if not set
|
||||
AC_ARG_WITH([current-date],
|
||||
|
|
@ -51,7 +51,7 @@ AC_ARG_WITH([current-date],
|
|||
[CURRENT_DATE="`date -u +%Y-%m-%dT%H:%M:%SZ`"])
|
||||
|
||||
AC_SUBST(GETDNS_VERSION, ["AC_PACKAGE_VERSION$RELEASE_CANDIDATE"])
|
||||
AC_SUBST(GETDNS_NUMERIC_VERSION, [0x01020000])
|
||||
AC_SUBST(GETDNS_NUMERIC_VERSION, [0x010200C1])
|
||||
AC_SUBST(API_VERSION, ["December 2015"])
|
||||
AC_SUBST(API_NUMERIC_VERSION, [0x07df0c00])
|
||||
GETDNS_COMPILATION_COMMENT="AC_PACKAGE_NAME $GETDNS_VERSION configured on $CURRENT_DATE for the $API_VERSION version of the API"
|
||||
|
|
@ -86,9 +86,10 @@ GETDNS_COMPILATION_COMMENT="AC_PACKAGE_NAME $GETDNS_VERSION configured on $CURRE
|
|||
# getdns-1.1.1 had libversion 6:1:0
|
||||
# getdns-1.1.2 had libversion 7:0:1
|
||||
# getdns-1.1.3 had libversion 7:1:1
|
||||
# getdns-1.2.0 has libversion 8:0:2
|
||||
# getdns-1.2.0 had libversion 8:0:2
|
||||
# getdns-1.2.1 will have libversion 8:1:2
|
||||
#
|
||||
GETDNS_LIBVERSION=8:0:2
|
||||
GETDNS_LIBVERSION=8:1:2
|
||||
|
||||
AC_SUBST(GETDNS_COMPILATION_COMMENT)
|
||||
AC_SUBST(GETDNS_LIBVERSION)
|
||||
|
|
@ -1146,8 +1147,8 @@ AC_SUBST(INSTALL_STUBBY)
|
|||
AC_SUBST(UNINSTALL_STUBBY)
|
||||
AC_SUBST(STUBBY_XTRA_OBJS)
|
||||
|
||||
STUBBY_LDFLAGS=""
|
||||
STUBBY_LIBS=""
|
||||
STUBBY_LDFLAGS=""
|
||||
|
||||
if test $my_with_yaml = 1
|
||||
then
|
||||
|
|
@ -1155,8 +1156,8 @@ then
|
|||
then
|
||||
getdns_LIBS="$LIBS"
|
||||
getdns_LDFLAGS="$LDFLAGS"
|
||||
LIBS=""
|
||||
LDFLAGS=""
|
||||
LIBS="$initial_LIBS"
|
||||
LDFLAGS="$initial_LDFLAGS"
|
||||
fi
|
||||
AC_ARG_WITH(libyaml, AS_HELP_STRING([--with-libyaml=pathname],
|
||||
[path to libyaml (default: search /usr/local ..)]),
|
||||
|
|
@ -1349,7 +1350,44 @@ AH_BOTTOM([
|
|||
# ifndef FD_SETSIZE
|
||||
# define FD_SETSIZE 1024
|
||||
# endif
|
||||
# define PRIsz "Iu"
|
||||
|
||||
/* the version of the windows API enabled */
|
||||
# ifndef WINVER
|
||||
# define WINVER 0x0600 // 0x0502
|
||||
# endif
|
||||
# ifndef _WIN32_WINNT
|
||||
# define _WIN32_WINNT 0x0600 // 0x0502
|
||||
# endif
|
||||
# ifdef HAVE_WS2TCPIP_H
|
||||
# include <ws2tcpip.h>
|
||||
# endif
|
||||
|
||||
# ifdef _MSC_VER
|
||||
# if _MSC_VER >= 1800
|
||||
# define PRIsz "zu"
|
||||
# else
|
||||
# define PRIsz "Iu"
|
||||
# endif
|
||||
# else
|
||||
# define PRIsz "Iu"
|
||||
# endif
|
||||
|
||||
# ifdef HAVE_WINSOCK2_H
|
||||
# include <winsock2.h>
|
||||
# endif
|
||||
|
||||
# ifndef USE_WINSOCK
|
||||
# define ARG_LL "%ll"
|
||||
# else
|
||||
# define ARG_LL "%I64"
|
||||
# endif
|
||||
|
||||
/* detect if we need to cast to unsigned int for FD_SET to avoid warnings */
|
||||
# ifdef HAVE_WINSOCK2_H
|
||||
# define FD_SET_T (u_int)
|
||||
# else
|
||||
# define FD_SET_T
|
||||
# endif
|
||||
|
||||
/* Windows wants us to use _strdup instead of strdup */
|
||||
# ifndef strdup
|
||||
|
|
@ -1365,34 +1403,6 @@ AH_BOTTOM([
|
|||
#include <assert.h>
|
||||
#include <string.h>
|
||||
|
||||
/* the version of the windows API enabled */
|
||||
#ifndef WINVER
|
||||
#define WINVER 0x0600 // 0x0502
|
||||
#endif
|
||||
#ifndef _WIN32_WINNT
|
||||
#define _WIN32_WINNT 0x0600 // 0x0502
|
||||
#endif
|
||||
#ifdef HAVE_WINSOCK2_H
|
||||
#include <winsock2.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_WS2TCPIP_H
|
||||
#include <ws2tcpip.h>
|
||||
#endif
|
||||
|
||||
#ifndef USE_WINSOCK
|
||||
#define ARG_LL "%ll"
|
||||
#else
|
||||
#define ARG_LL "%I64"
|
||||
#endif
|
||||
|
||||
/* detect if we need to cast to unsigned int for FD_SET to avoid warnings */
|
||||
#ifdef HAVE_WINSOCK2_H
|
||||
#define FD_SET_T (u_int)
|
||||
#else
|
||||
#define FD_SET_T
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -160,7 +160,7 @@ install-headers: getdns/getdns.h getdns/getdns_extra.h
|
|||
uninstall-headers:
|
||||
rm -rf $(DESTDIR)$(includedir)/getdns
|
||||
|
||||
install-libs: libgetdns.la
|
||||
install-libs: libgetdns.la $(EXTENSION_LIBEVENT_LIB) $(EXTENSION_LIBUV_LIB) $(EXTENSION_LIBEV_LIB)
|
||||
$(INSTALL) -m 755 -d $(DESTDIR)$(libdir)
|
||||
$(LIBTOOL) --mode=install cp libgetdns.la $(DESTDIR)$(libdir)
|
||||
if test $(have_libevent) = 1 ; then $(LIBTOOL) --mode=install cp $(EXTENSION_LIBEVENT_LIB) $(DESTDIR)$(libdir) ; fi
|
||||
|
|
|
|||
|
|
@ -32,10 +32,10 @@
|
|||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <locale.h>
|
||||
#include "config.h"
|
||||
#ifndef USE_WINSOCK
|
||||
#include <arpa/inet.h>
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -34,8 +34,8 @@
|
|||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <ctype.h>
|
||||
#include "config.h"
|
||||
#include <ctype.h>
|
||||
#ifndef USE_WINSOCK
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
|
|
|
|||
Loading…
Reference in New Issue