Permalink
Browse files

Specify full path of "crypt", "nsl", "m" and "util" libraries

Anticipate issue similar to the one fixed in previous commit 6043a5d by
using full path for libraries specified using only a name.
  • Loading branch information...
1 parent 6043a5d commit 96cd3183d24c93cd8b67e2bc585876aebcd54f5d @jcfr jcfr committed Apr 2, 2013
Showing with 4 additions and 4 deletions.
  1. +2 −2 cmake/ConfigureChecks.cmake
  2. +2 −2 cmake/extensions/CMakeLists.txt
@@ -384,9 +384,9 @@ endif()
set(CMAKE_EXTRA_INCLUDE_FILES stdio.h)
-add_cond(CMAKE_REQUIRED_LIBRARIES HAVE_LIBM m)
-add_cond(CMAKE_REQUIRED_LIBRARIES HAVE_LIBUTIL util)
+add_cond(CMAKE_REQUIRED_LIBRARIES HAVE_LIBM ${M_LIBRARIES})
add_cond(CMAKE_REQUIRED_LIBRARIES HAVE_LIBINTL ${HAVE_LIBINTL})
+add_cond(CMAKE_REQUIRED_LIBRARIES HAVE_LIBUTIL ${HAVE_LIBUTIL})
add_cond(CMAKE_EXTRA_INCLUDE_FILES HAVE_WCHAR_H wchar.h)
TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
@@ -16,7 +16,7 @@ add_python_extension(_codecs_kr SOURCES cjkcodecs/_codecs_kr.c)
add_python_extension(_codecs_tw SOURCES cjkcodecs/_codecs_tw.c)
add_python_extension(_collections SOURCES _collectionsmodule.c)
add_python_extension(cPickle SOURCES cPickle.c)
-add_python_extension(crypt REQUIRES HAVE_LIBCRYPT SOURCES cryptmodule.c LIBRARIES crypt)
+add_python_extension(crypt REQUIRES HAVE_LIBCRYPT SOURCES cryptmodule.c LIBRARIES ${HAVE_LIBCRYPT})
add_python_extension(cStringIO SOURCES cStringIO.c)
add_python_extension(_csv SOURCES _csv.c)
add_python_extension(_ctypes_test SOURCES _ctypes/_ctypes_test.c)
@@ -56,7 +56,7 @@ add_python_extension(unicodedata SOURCES unicodedata.c)
# UNIX-only extensions
add_python_extension(fcntl REQUIRES UNIX SOURCES fcntlmodule.c)
add_python_extension(grp REQUIRES UNIX SOURCES grpmodule.c)
-add_python_extension(nis REQUIRES UNIX HAVE_LIBNSL SOURCES nismodule.c LIBRARIES nsl)
+add_python_extension(nis REQUIRES UNIX HAVE_LIBNSL SOURCES nismodule.c LIBRARIES ${HAVE_LIBNSL})
add_python_extension(posix REQUIRES UNIX BUILTIN SOURCES posixmodule.c)
add_python_extension(pwd REQUIRES UNIX BUILTIN SOURCES pwdmodule.c)
add_python_extension(resource REQUIRES UNIX SOURCES resource.c)

0 comments on commit 96cd318

Please sign in to comment.