Merge pull request zeromq#1051 from twhittock/master

hintjens · hintjens · commit 5e6c1257a615 · 2015-07-30T12:29:18.000+02:00
Problem: Python tests failing.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -204,8 +204,6 @@ install(TARGETS czmq
     RUNTIME DESTINATION bin              # .dll file
 )
 
-include(${CMAKE_CURRENT_SOURCE_DIR}/src/CMakeLists-local.txt) # Optional project-local hook
-
 ########################################################################
 # pkgconfig
 ########################################################################
diff --git a/bindings/python/czmq.py b/bindings/python/czmq.py
@@ -729,7 +729,7 @@ def new_empty():
         return Zframe(lib.zframe_new_empty(), True)
 
     @staticmethod
-    def from(string):
+    def from_(string):
         """Create a frame with a specified string content."""
         return Zframe(lib.zframe_from(string), True)
 
diff --git a/configure.ac b/configure.ac
@@ -56,8 +56,6 @@ AC_PROG_SED
 AC_PROG_AWK
 PKG_PROG_PKG_CONFIG
 
-AX_PROJECT_LOCAL_HOOK # Optional project-local hook (acinclude.m4)
-
 # Code coverage
 AC_ARG_WITH(gcov, [AS_HELP_STRING([--with-gcov=yes/no],
                   [With GCC Code Coverage reporting.])],

Original file line number	Diff line number	Diff line change
`@@ -204,8 +204,6 @@ install(TARGETS czmq`
`204`	`204`	`RUNTIME DESTINATION bin # .dll file`
`205`	`205`	`)`
`206`	`206`
`207`		`-include(${CMAKE_CURRENT_SOURCE_DIR}/src/CMakeLists-local.txt) # Optional project-local hook`
`208`		`-`
`209`	`207`	`########################################################################`
`210`	`208`	`# pkgconfig`
`211`	`209`	`########################################################################`