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 6a1597e3e0b0a6aaf2ec1edecf3b8704847fe78d..c5870ee9e9ab6cb2ae01691af255c676d8775ecb 100644 (file)
--- 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 e4b6f4e584f13c94d69ae5298c1506f06e71773c..e6638eb8c0572370c792beb5d1d21570d333066d 100644 (file)
--- 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 96b4c90f377a740b4becfc4fd98fb5cf1b40827e..808fb2d371e4f1fc800559be0bbbce72e87bb398 100755 (executable)
--- 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 c9bb8487ccaa15a0a86dacf9315bc8208b104f2d..2fd56702b4f11c99b509d3f9005894f7e7e772d1 100644 (file)
--- 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