install uninstall for python.

git-svn-id: file:///svn/unbound/trunk@1588 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/Makefile.in b/Makefile.in
index 7338a2cd512e3eadc79c3e69686565059e30fb3c..4f06a3f536f412b257a5ad3689db241558691336 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -367,6 +367,15 @@ install:
        $(LIBTOOL) --mode=install cp unbound-checkconf $(DESTDIR)$(sbindir)/unbound-checkconf
        $(LIBTOOL) --mode=install cp unbound-control $(DESTDIR)$(sbindir)/unbound-control
        $(LIBTOOL) --mode=install cp unbound-host $(DESTDIR)$(sbindir)/unbound-host
+ifeq "$(WITH_PYTHONMODULE)" "yes"
+       $(INSTALL) -m 755 -d $(DESTDIR)$(PYTHON_SITE_PKG)
+       $(INSTALL) -c -m 644 pythonmod/unboundmodule.py $(DESTDIR)$(PYTHON_SITE_PKG)/unboundmodule.py
+endif
+ifeq "$(WITH_PYUNBOUND)" "yes"
+       $(INSTALL) -m 755 -d $(DESTDIR)$(PYTHON_SITE_PKG)
+       $(INSTALL) -c -m 644 libunbound/python/unbound.py $(DESTDIR)$(PYTHON_SITE_PKG)/unbound.py
+       $(LIBTOOL) --mode=install cp _unbound.la $(DESTDIR)$(PYTHON_SITE_PKG)
+endif
        $(INSTALL) -c -m 644 doc/unbound.8 $(DESTDIR)$(mandir)/man8
        $(INSTALL) -c -m 644 doc/unbound-checkconf.8 $(DESTDIR)$(mandir)/man8
        $(INSTALL) -c -m 644 doc/unbound-control.8 $(DESTDIR)$(mandir)/man8
@@ -385,6 +394,13 @@ uninstall:
        rm -f -- $(DESTDIR)$(mandir)/man1/unbound-host.1 $(DESTDIR)$(mandir)/man3/libunbound.3
        rm -f -- $(DESTDIR)$(includedir)/unbound.h
        $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/libunbound.la
+ifeq "$(WITH_PYTHONMODULE)" "yes"
+       rm -f -- $(DESTDIR)$(PYTHON_SITE_PKG)/unboundmodule.py
+endif
+ifeq "$(WITH_PYUNBOUND)" "yes"
+       rm -f -- $(DESTDIR)$(PYTHON_SITE_PKG)/unbound.py
+       $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(PYTHON_SITE_PKG)/_unbound.la
+endif
        @echo
        @echo "You still need to remove "`dirname $(DESTDIR)$(configfile)`" , $(DESTDIR)$(configfile) by hand"
 

diff --git a/doc/Changelog b/doc/Changelog
index a5046d9c2b56ed55b3ce9dc27d782958d7375742..89117520966f147c9bb9a236e6638bb0585294a3 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,14 @@
        - windows compile fix.
        - Detect FreeBSD jail without ipv6 addresses assigned.
        - python libunbound wrapper unit test.
+       - installs the following files. Default is to not build them.
+               from configure --with-pythonmodule:
+         /usr/lib/python2.x/site-packages/unboundmodule.py
+               from configure --with-pyunbound:
+         /usr/lib/python2.x/site-packages/unbound.py
+         /usr/lib/python2.x/site-packages/_unbound.so*
+         The example python scripts (pythonmod/examples and
+         libunbound/python/examples) are not installed.
 
 3 April 2009: Wouter
        - Fixed a bug that caused messages to be stored in the cache too 

diff --git a/doc/README b/doc/README
index da84d47563fae762326c8751966f8c62f1d3b389..eaa781fb815db557ed87ec070bc74ce758d07711 100644 (file)
--- a/doc/README
+++ b/doc/README
@@ -58,6 +58,11 @@ This software is under BSD license, see LICENSE for details.
   * --with-username=user
        Set default user name to change to,
        the default is the "unbound" user.
+  * --with-pyunbound
+       Create libunbound wrapper usable from python.
+       Needs python-devel and swig development tools.
+  * --with-pythonmodule
+       Compile the python module that processes responses in the server.
 
 * 'make test' attempts to run a series of tests, depending on the support
   programs that are installed.

diff --git a/doc/TODO b/doc/TODO
index 98be6dc80ccc49b7aceb416f48761f23cbe88628..8a23298cc7b3efb6bd2513c391fdf86c715148ae 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -38,8 +38,7 @@ o option to ignore all inception and expiration dates for rrsigs.
 o option to use builtin ldns explicitly.  Or stop shipping builtin tarball.
 o cleaner code; return and func statements on newline.
 o memcached module that sits before validator module; checks for memcached
-  data (on local lan), stores recursion lookup.  Provides one cache for
-  multiple resolver machines, coherent reply content in anycast setup.
+  data (on local lan), stores recursion lookup.  Provides one cache for multiple resolver machines, coherent reply content in anycast setup.
 o no openssl_add_all_algorithms, but only the ones necessary, less space.
 
 *** Features features, for later
@@ -51,12 +50,9 @@ o no openssl_add_all_algorithms, but only the ones necessary, less space.
   of responses over a time interval is collected, and each is validated.
   or try in TCP mode. Do not 'try all servers several times', since we must
   not create packet storms with operator errors.
-* Windows port features
 o on windows version, implement that OS ancillary data capabilities for
   interface-automatic. IPPKTINFO, IP6PKTINFO for WSARecvMsg, WSASendMsg.
 o local-zone directive with authority service, full authority server 
   is a non-goal.
-o remote control read ssl information while priviledged.
- 
 o infra and lame cache: easier size config (in Mb), show usage in graphs.
-o see if we can include the python bindings (contrib).
+