From: Bert Hubert Date: Sat, 21 Jun 2008 18:32:11 +0000 (+0000) Subject: 3.1.7-rc3 X-Git-Tag: rec-3.1.7.1~29 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d451f5f158a16559cd613cace7184c751698cb8;p=thirdparty%2Fpdns.git 3.1.7-rc3 git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1212 d19b8d6e-7fed-0310-83ef-9ca221ded41b --- diff --git a/pdns/Makefile-recursor b/pdns/Makefile-recursor index 6a1597e3e0..c5870ee9e9 100644 --- a/pdns/Makefile-recursor +++ b/pdns/Makefile-recursor @@ -39,11 +39,13 @@ endif ifeq ($(STATIC),semi) - STATICFLAGS=-Wl,-Bstatic -lstdc++ $(LUALIBS) -lgcc -Wl,-Bdynamic -static-libgcc -lm -lc - LINKCC=$(CC) -elseifeq ($(STATIC),full) - STATICFLAGS=-lstdc++ -lm $(LUALIBS) -static - LINKCC=$(CC) + STATICFLAGS=-Wl,-Bstatic -lstdc++ $(LUALIBS) -lgcc -Wl,-Bdynamic -static-libgcc -lm -lc + LINKCC=$(CC) + LDFLAGS += -ldl +else ifeq ($(STATIC),full) + STATICFLAGS=-lstdc++ -lm $(LUALIBS) -static + LDFLAGS += -ldl + LINKCC=$(CC) else LDFLAGS += $(LUALIBS) endif diff --git a/pdns/config-recursor.h b/pdns/config-recursor.h index e4b6f4e584..e6638eb8c0 100644 --- a/pdns/config-recursor.h +++ b/pdns/config-recursor.h @@ -1,6 +1,6 @@ #define SYSCONFDIR "/etc/powerdns/" #define LOCALSTATEDIR "/var/run/" -#define VERSION "3.1.7" +#define VERSION "3.1.7-rc3" #define RECURSOR #ifndef WIN32 diff --git a/pdns/dist-recursor b/pdns/dist-recursor index 96b4c90f37..808fb2d371 100755 --- a/pdns/dist-recursor +++ b/pdns/dist-recursor @@ -1,4 +1,4 @@ -VERSION=3.1.7 +VERSION=3.1.7-rc3 INCLUDES="iputils.hh arguments.hh base64.hh zoneparser-tng.hh \ rcpgenerator.hh lock.hh dnswriter.hh dnsrecords.hh dnsparser.hh utility.hh \ diff --git a/pdns/pdns-recursor.spec b/pdns/pdns-recursor.spec index c9bb8487cc..2fd56702b4 100644 --- a/pdns/pdns-recursor.spec +++ b/pdns/pdns-recursor.spec @@ -2,7 +2,7 @@ Buildroot: /tmp/pdns/ Name: pdns-recursor -Version: 3.1.7 +Version: 3.1.7rc3 Release: 1 Summary: extremely powerful and versatile recursing nameserver License: GPL