Merge

bindings/python/wscript

@@ -17,7 +17,7 @@ import Utils
 from waflib.Errors import WafError
 
 ## https://launchpad.net/pybindgen/
-REQUIRED_PYBINDGEN_VERSION = (0, 15, 0, 795)
+REQUIRED_PYBINDGEN_VERSION = (0, 15, 0, 797)
 REQUIRED_PYGCCXML_VERSION = (0, 9, 5)
 
 
@@ -92,10 +92,21 @@ def configure(conf):
 
     try:
         conf.check_tool('python')
+    except Configure.ConfigurationError, ex:
+        conf.report_optional_feature("python", "Python Bindings", False,
+                                     "The python interpreter was not found")
+        return
+    try:
         conf.check_python_version((2,3))
+    except Configure.ConfigurationError, ex:
+        conf.report_optional_feature("python", "Python Bindings", False,
+                                     "The python found version is too low (2.3 required)")
+        return
+    try:
         conf.check_python_headers()
     except Configure.ConfigurationError, ex:
-        conf.report_optional_feature("python", "Python Bindings", False, str(ex))
+        conf.report_optional_feature("python", "Python Bindings", False,
+                                     "Python library or headers missing")
         return
 
     # stupid Mac OSX Python wants to build extensions as "universal

src/network/model/socket.h

@@ -202,25 +202,20 @@ public:
    */
   void SetRecvCallback (Callback<void, Ptr<Socket> >);
   /** 
-   * \brief Allocate a local endpoint for this socket.
    * \param address the address to try to allocate
    * \returns 0 on success, -1 on failure.
    *
+   * Allocate a local endpoint for this socket.
    */
   virtual int Bind (const Address &address) = 0;
 
   /** 
-   * \brief Allocate a local IPv4 endpoint for this socket.
+   * Allocate a local endpoint for this socket.
+   *
    * \returns 0 on success, -1 on failure.
    */
   virtual int Bind () = 0;
 
-  /**
-   * \brief Allocate a local IPv6 endpoint for this socket.
-   * \returns 0 on success, -1 on failure.
-   */
-  virtual int Bind6 () = 0;
-
   /** 
    * \brief Close a socket.
    * \returns zero on success, -1 on failure.