Skip to content

Commit

Permalink
Disable python27 checks
Browse files Browse the repository at this point in the history
Closes: #254
  • Loading branch information
catap committed Jul 26, 2023
1 parent b1479db commit 437c185
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 30 deletions.
61 changes: 32 additions & 29 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -490,35 +490,38 @@ AC_CHECK_TYPES([sa_family_t], [], [],
]]
)

################################################################
# Plugin scan_python.cpp requires header "Python.h"
# If the header is not present => Disable the source code of the plugin
#
AC_CHECK_HEADERS(python2.7/Python.h) # ==> #define HAVE_PYTHON2_7_PYTHON_H
AC_CHECK_LIB(python2.7,Py_Initialize,,[
AC_MSG_WARN([
*** Cannot find python library.
*** Please install python-devel to enable scanner python.
])
Fmissing_library="$Fmissing_library python-devel " # Validated on Fedora 25
Umissing_library="$Umissing_library libpython2.7-dev" # Should be OK: https://packages.ubuntu.com/yakkety/libpython2.7-dev
Mmissing_library="$Mmissing_library python27" # Not sure: https://github.com/macports/macports-ports/blob/master/lang/python27/Portfile
])

################################################################
# Plugin scanner_python.cpp requires header "Python.h"
# If the header is not present => Disable the source code of the plugin
#
AC_CHECK_HEADERS(python2.7/Python.h) # ==> #define HAVE_PYTHON2_7_PYTHON_H
AC_CHECK_LIB(python2.7,Py_Initialize,,[
AC_MSG_WARN([
*** Cannot find python library.
*** Please install python-devel to enable scanner python.
])
Fmissing_library="$Fmissing_library python-devel " # Validated on Fedora 25
Umissing_library="$Umissing_library libpython2.7-dev" # Should be OK: https://packages.ubuntu.com/yakkety/libpython2.7-dev
Mmissing_library="$Mmissing_library python27" # Not sure: https://github.com/macports/macports-ports/blob/master/lang/python27/Portfile
])
dnl
dnl NOTE: scan_python.cpp was disabled since 1.6.1, this checks are useless
dnl
dnl ################################################################
dnl # Plugin scan_python.cpp requires header "Python.h"
dnl # If the header is not present => Disable the source code of the plugin
dnl #
dnl AC_CHECK_HEADERS(python2.7/Python.h) # ==> #define HAVE_PYTHON2_7_PYTHON_H
dnl AC_CHECK_LIB(python2.7,Py_Initialize,,[
dnl AC_MSG_WARN([
dnl *** Cannot find python library.
dnl *** Please install python-devel to enable scanner python.
dnl ])
dnl Fmissing_library="$Fmissing_library python-devel " # Validated on Fedora 25
dnl Umissing_library="$Umissing_library libpython2.7-dev" # Should be OK: https://packages.ubuntu.com/yakkety/libpython2.7-dev
dnl Mmissing_library="$Mmissing_library python27" # Not sure: https://github.com/macports/macports-ports/blob/master/lang/python27/Portfile
dnl ])

dnl ################################################################
dnl # Plugin scanner_python.cpp requires header "Python.h"
dnl # If the header is not present => Disable the source code of the plugin
dnl #
dnl AC_CHECK_HEADERS(python2.7/Python.h) # ==> #define HAVE_PYTHON2_7_PYTHON_H
dnl AC_CHECK_LIB(python2.7,Py_Initialize,,[
dnl AC_MSG_WARN([
dnl *** Cannot find python library.
dnl *** Please install python-devel to enable scanner python.
dnl ])
dnl Fmissing_library="$Fmissing_library python-devel " # Validated on Fedora 25
dnl Umissing_library="$Umissing_library libpython2.7-dev" # Should be OK: https://packages.ubuntu.com/yakkety/libpython2.7-dev
dnl Mmissing_library="$Mmissing_library python27" # Not sure: https://github.com/macports/macports-ports/blob/master/lang/python27/Portfile
dnl ])

############## drop optimization flags if requested ################

Expand Down
5 changes: 4 additions & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,10 @@ check_include_files(unordered_map HAVE_UNORDERED_MAP)
check_include_files(unordered_set HAVE_UNORDERED_SET)
check_include_files(winsock2.h HAVE_WINSOCK2_H)
check_include_files(zlib.h HAVE_ZLIB_H)
check_include_files(python2.7/Python.h PYTHON2_7_PYTHON_H) # TODO(olibre): Use instead PYTHON_INCLUDE_DIRS

# NOTE: scan_python.cpp was disabled since 1.6.1, this checks are useless
# check_include_files(python2.7/Python.h PYTHON2_7_PYTHON_H) # TODO(olibre): Use instead PYTHON_INCLUDE_DIRS

# There are many other #define not (yet) implemented by above CMake directives.
# To list the #define use the following command lines:
# sed 's|/\* ||' config.h | awk '$1 ~ /#undef|#define/{print $2}' | sort -u | while read w ; do grep -wB1 $w config.h | grep '[^ ]*> header' -q && echo $w; done > already-implemented-using-cmake-directives
Expand Down

0 comments on commit 437c185

Please sign in to comment.