moved files. Make _unbound python libunbound module.

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

Makefile.in

@@ -41,6 +41,7 @@ CHECKLOCK_SRC=@CHECKLOCK_SRC@
 UB_ON_WINDOWS=@UB_ON_WINDOWS@
 WITH_PYTHONMODULE=@WITH_PYTHONMODULE@
 WITH_PYUNBOUND=@WITH_PYUNBOUND@
+PYTHON_SITE_PKG=@PYTHON_SITE_PKG@
 
 SWIG=@SWIG@
 YACC=@YACC@
@@ -294,7 +295,7 @@ libunbound/python/libunbound_wrap.c:	$(srcdir)/libunbound/python/libunbound.i $(
 
 _unbound.la:	$(BUILD)libunbound/python/libunbound_wrap.lo libunbound.la
 	$(INFO) Link $@
-	$Q$(LIBTOOL) --tag=CC --mode=link $(strip $(CC) $(RUNTIME_PATH) $(CFLAGS) $(LDFLAGS) -module -no-undefined) -o $@ $< -L. -L.libs -lunbound $(LIBS)
+	$Q$(LIBTOOL) --tag=CC --mode=link $(strip $(CC) $(RUNTIME_PATH) $(CFLAGS) $(LDFLAGS) -module -version-number @LIBUNBOUND_CURRENT@:@LIBUNBOUND_REVISION@:@LIBUNBOUND_AGE@ -no-undefined) -o $@ $< -rpath $(PYTHON_SITE_PKG) L. -L.libs -lunbound $(LIBS)
 endif
 
 util/config_file.c:	util/configparser.h
@@ -341,6 +342,10 @@ tags:	$(srcdir)/*.[ch] $(srcdir)/*/*.[ch]
 doc:
 	if test -n "$(doxygen)"; then \
 		$(doxygen) $(srcdir)/doc/unbound.doxygen; fi
+	if test -x "`which sphinx-build 2>&1`"; then \
+		sphinx-build -b html pythonmod/doc/source doc/html/pythonmod
+		sphinx-build -b html libunbound/python/doc/source doc/html/pyunbound
+	fi
 
 strip:
 	strip unbound

config.h.in

@@ -413,6 +413,13 @@
    `char[]'. */
 #undef YYTEXT_POINTER
 
+/* Define to 1 if on AIX 3.
+   System headers sometimes define this.
+   We just want to avoid a redefinition error message.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
@@ -422,38 +429,6 @@
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
 
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 

doc/Changelog

@@ -1,3 +1,6 @@
+2 April 2009: Wouter
+	- pyunbound (libunbound python plugin) compiles using libtool.
+
 1 April 2009: Wouter
 	- suppress errors when trying to contact authority servers that gave
 	  ipv6 AAAA records for their nameservers with ipv4 mapped contents.

pythonmod/doc/source/_static/readme

@@ -0,0 +1 @@
+this directory exists to pacify sphinx-build.

pythonmod/interface.i

@@ -2,7 +2,7 @@
  * interface.i: unbound python module
  */
 
-%module Unbound
+%module unboundmodule
 %{
    #include <sys/types.h>
    #include <sys/socket.h>

pythonmod/pythonmod.c

@@ -98,9 +98,9 @@ int pythonmod_init(struct module_env* env, int id)
    }
    PyRun_SimpleString("sys.path.append('"RUN_DIR"') \n");
    PyRun_SimpleString("sys.path.append('"SHARE_DIR"') \n");
-   if (PyRun_SimpleString("from Unbound import *\n") < 0)
+   if (PyRun_SimpleString("from unboundmodule import *\n") < 0)
    {
-      log_err("pythonmod: cannot initialize core module: Unbound.py"); 
+      log_err("pythonmod: cannot initialize core module: unboundmodule.py"); 
       return 0;
    }