Support nsupdate with --with-nsupdate in ./configure.

diff --git a/Makefile.conf b/Makefile.conf
index fa85f1cd96c1322ee82d178fe4daf636972e65b8..d714fb6e354acc0c55eeab563768fd8936f80851 100644 (file)
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -34,6 +34,14 @@ ETC = /etc
 VARRUN = /var/run
 VARDB = /var/db
 LIBS = $(BINDLIB)
+COPTS = $(BINDDEF)
+
+## Dynamic DNS update support
+##--nsupdate--
+#BINDLIB = -L/usr/local/bind/lib -lbind
+#BINDINC = -I/usr/local/bind/include
+#BINDDEF = -DNSUPDATE 
+##--nsupdate--
 
 ## Porting::
 #
@@ -63,7 +71,7 @@ LIBS = $(BINDLIB)
 ##--nextstep--
 #CF = cf/nextstep.h
 #CC=cc
-#COPTS = -Wall
+#COPTS = -Wall $(BINDDEF)
 #BINDIR=/usr/etc
 #ADMMANDIR = /usr/local/man/cat8
 #FFMANDIR = /usr/local/man/cat5
@@ -91,7 +99,7 @@ LIBS = $(BINDLIB)
 #MANINSTALL=/usr/ucb/install
 #LIBS = $(BINDLIB) -lresolv -lsocket -lnsl -lgen 
 #CC=gcc
-#COPTS = -Wall -Wno-unused -Wno-implicit -Wno-comment \
+#COPTS = $(BINDDEF) -Wall -Wno-unused -Wno-implicit -Wno-comment \
 #       -Wno-uninitialized -Wno-char-subscripts -Wno-switch -Werror
 #CF = cf/sunos5-5.h
 #ADMMANDIR = /usr/share/man/cat1m
@@ -109,7 +117,7 @@ LIBS = $(BINDLIB)
 #MANINSTALL=/usr/ucb/install
 #LIBS = $(BINDLIB) -lresolv -lsocket -lnsl -lgen 
 #CC=cc
-#COPTS = -D__svr4__
+#COPTS = -D__svr4__ $(BINDDEF)
 #CF = cf/sunos5-5.h
 #ADMMANDIR = /usr/share/man/cat1m
 #ADMMANEXT = .1m
@@ -148,7 +156,7 @@ LIBS = $(BINDLIB)
 ##--rhapsody--
 #CF = cf/rhapsody.h
 #COPTS  = -Wall -Wno-unused -Wno-implicit -Wno-comment \
-#        -Wno-uninitialized -Wno-switch -Werror -pipe
+#        -Wno-uninitialized -Wno-switch -Werror -pipe $(BINDDEF)
 #SCRIPT=rhapsody
 ##--rhapsody--
 
@@ -156,7 +164,7 @@ LIBS = $(BINDLIB)
 ##--netbsd--
 #CF = cf/netbsd.h
 #COPTS  = -Wall -Wstrict-prototypes -Wno-unused -Wno-implicit -Wno-comment \
-#        -Wno-uninitialized -Werror -Wno-switch -pipe
+#        -Wno-uninitialized -Werror -Wno-switch -pipe $(BINDDEF)
 #SCRIPT=netbsd
 ##--netbsd--
 
@@ -175,7 +183,7 @@ LIBS = $(BINDLIB)
 
 ## Linux 1.x
 ##--linux-1--
-#COPTS = -DLINUX_MAJOR=1 -DLINUX_MINOR=0
+#COPTS = -DLINUX_MAJOR=1 -DLINUX_MINOR=0 $(BINDDEF)
 #CF = cf/linux.h
 #ADMMANDIR = /usr/man/man8
 #ADMMANEXT = .8
@@ -189,7 +197,7 @@ LIBS = $(BINDLIB)
 
 ## Linux 2.0
 ##--linux-2.0--
-#COPTS = -DLINUX_MAJOR=2 -DLINUX_MINOR=0
+#COPTS = -DLINUX_MAJOR=2 -DLINUX_MINOR=0 $(BINDDEF)
 #CF = cf/linux.h
 #ADMMANDIR = /usr/man/man8
 #ADMMANEXT = .8
@@ -203,7 +211,7 @@ LIBS = $(BINDLIB)
 
 ## Linux 2.1
 ##--linux-2.1--
-#COPTS = -DLINUX_MAJOR=2 -DLINUX_MINOR=1
+#COPTS = -DLINUX_MAJOR=2 -DLINUX_MINOR=1 $(BINDDEF)
 #CF = cf/linux.h
 #ADMMANDIR = /usr/man/man8
 #ADMMANEXT = .8
@@ -217,7 +225,7 @@ LIBS = $(BINDLIB)
 
 ## Linux 2.2
 ##--linux-2.2--
-#COPTS = -DLINUX_MAJOR=2 -DLINUX_MINOR=2
+#COPTS = -DLINUX_MAJOR=2 -DLINUX_MINOR=2 $(BINDDEF)
 #CF = cf/linux.h
 #ADMMANDIR = /usr/man/man8
 #ADMMANEXT = .8
@@ -257,7 +265,7 @@ LIBS = $(BINDLIB)
 #FFMANEXT = .5
 #MANCAT = man
 #VARRUN = /etc
-#COPTS=-w3 -Dlint
+#COPTS=-w3 -Dlint $(BINDDEF)
 #LFLAGS=$(DEBUG) "-Wl,op symfile" -l socket
 #MANINSTALL = /bin/true 
 #INSTALL = cp
@@ -290,7 +298,7 @@ LIBS = $(BINDLIB)
 ##--irix--
 #LFLAGS=$(DEBUG) -Wl,-woff,84 -Wl,-woff,85 -Wl,-woff,134
 #CC=gcc
-#COPTS = -I/usr/local/include
+#COPTS = -I/usr/local/include $(BINDDEF)
 #CF = cf/irix.h
 #BINDIR = /usr/local/etc
 #ADMMANDIR = /usr/local/man/man8

diff --git a/configure b/configure
index c3936444d45c4c200a67099f30329ab504957ba6..18256d722737ab5170741973c002ed72114c9e6e 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,17 @@
 #!/bin/sh
 
-sysname=$1
+while [ $# != 0 ]; do
+  if [ x$1 = x--with-nsupdate ]; then
+    nsupdate="-e /^##--nsupdate--/,/^##--nsupdate--/s/^#//"
+  else
+   if [ $?sysname = 0 ]; then
+     sysname=$1
+    else
+       echo "Unexpected argument: $1"
+    fi
+  fi
+  shift
+done
 
 uname=`uname -s`
 machine=`uname -m`
@@ -79,7 +90,7 @@ fi
 echo "System Type: $sysname"
 
 for foo in . client server relay common; do
-        (sed -e "/^##--${sysname}--/,/^##--${sysname}--/s/^#//" \
+        (sed $nsupdate -e "/^##--${sysname}--/,/^##--${sysname}--/s/^#//" \
                <Makefile.conf; cat site.conf; cat $foo/Makefile.dist)  \
                                >$foo/Makefile
 done

diff --git a/site.conf b/site.conf
index 6f240ee11b162413f54ad7ceb6823c616494ad2a..fced754d5b5cc7f1ec86713322f36ab1d31349a3 100644 (file)
--- a/site.conf
+++ b/site.conf
@@ -1,7 +1,2 @@
 # Put local site configuration stuff here to override the default
 # settings in Makefile.conf
-
-# Uncomment the line below and make relevant adjustments for your local
-# configuration if you are going to use the Dynamic DNS update code.
-# BINDLIB = -L/usr/local/bind/lib -lbind
-# BINDINC = -I/usr/local/bind/include