Attachment 587064 Details for Bug 825519 – check and use python2.7-config instead of python-config

[patch] check and use python2.7-config instead of python-config

wireshark-1.6.8-python-config.patch (text/plain), 1.24 KB, created by Niels de Vos on 2012-05-27 10:33:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Niels de Vos

Created: 2012-05-27 10:33:07 UTC

Size: 1.24 KB

patch

obsolete

>diff --git a/acinclude.m4 b/acinclude.m4
>index cc1501b..2d37ec4 100644
>--- a/acinclude.m4
>+++ b/acinclude.m4
>@@ -1795,7 +1795,7 @@ AC_DEFUN([AC_WIRESHARK_PYTHON_CHECK],
>     #
> #  AC_CACHE_CHECK([checking python devel package], ac_cv_wireshark_python_devel,
> #    [
>-    AC_CHECK_PROG([ac_ws_python_config], python-config, "yes", "no")
>+    AC_CHECK_PROG([ac_ws_python_config], python2.7-config, "yes", "no")
>     if test "x$ac_ws_python_config" = "xno"; then
>       ac_cv_wireshark_python_devel=no
> 	if test "x$want_python" = "xyes"
>@@ -1810,8 +1810,8 @@ AC_DEFUN([AC_WIRESHARK_PYTHON_CHECK],
>       AC_MSG_CHECKING([python devel])
>       ac_save_ws_cflags=$CFLAGS
>       ac_save_ws_libs=$LIBS
>-      CFLAGS=$(python-config --includes)
>-      LIBS=$(python-config --ldflags)
>+      CFLAGS=$(python2.7-config --includes)
>+      LIBS=$(python2.7-config --ldflags)
>       AC_COMPILE_IFELSE(
>         [
>           AC_LANG_PROGRAM(
>diff --git a/cmake/modules/FindPYTHON.cmake b/cmake/modules/FindPYTHON.cmake
>index f7ca398..21f38d5 100644
>--- a/cmake/modules/FindPYTHON.cmake
>+++ b/cmake/modules/FindPYTHON.cmake
>@@ -13,7 +13,7 @@
> 
> FIND_PROGRAM(CMAKE_PYTHON_CONFIG_EXECUTABLE
>   NAMES
>-    python-config
>+    python2.7-config
>   DOC
>     "python-config executable"
>   PATHS

Actions: View | Diff

Attachments on bug 825519: 587064