upstream/knot-dns
1
0
Fork 0
mirror of https://gitlab.nic.cz/knot/knot-dns.git synced 2026-05-28 04:02:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

python: improve libknot detection

Browse source
This commit is contained in:
Daniel Salzman 2018-11-20 16:33:07 +01:00
parent 6a27e8b819
commit faf44dc421
7 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -45,7 +45,6 @@ Makefile
Makefile.in
version.h
/python/setup.py
/samples/knot.sample.conf
/src/knot/modules/static_modules.h
@ -84,4 +83,4 @@ version.h
# eclipse
/.project
/.cproject
/.settings/
/.settings/

8
configure.ac
View file

@ -21,9 +21,10 @@ AC_CANONICAL_HOST
# Update library versions
# https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
AC_SUBST([libknot_VERSION_INFO],["-version-info 8:0:0"])
AC_SUBST([libdnssec_VERSION_INFO],["-version-info 6:0:0"])
AC_SUBST([libzscanner_VERSION_INFO],["-version-info 2:0:0"])
AC_SUBST([python_libknot_VERSION], ["8"])
AC_SUBST([libknot_VERSION_INFO], ["-version-info 8:0:0"])
AC_SUBST([libdnssec_VERSION_INFO], ["-version-info 6:0:0"])
AC_SUBST([libzscanner_VERSION_INFO], ["-version-info 2:0:0"])
AC_SUBST([KNOT_VERSION_MAJOR], knot_VERSION_MAJOR)
AC_SUBST([KNOT_VERSION_MINOR], knot_VERSION_MINOR)
@ -701,6 +702,7 @@ AC_CONFIG_FILES([Makefile
distro/Makefile
python/Makefile
python/setup.py
python/libknot/__init__.py
src/Makefile
src/knot/modules/static_modules.h
])

2
python/.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
/libknot/__init__.py
/setup.py

2
python/Makefile.am
View file

@ -1,4 +1,4 @@
EXTRA_DIST = \
libknot/__init__.py \
libknot/__init__.py.in \
libknot/control.py \
setup.py.in

1
python/libknot/__init__.py
View file

@ -1 +0,0 @@
"""Python libknot interface."""

3
python/libknot/__init__.py.in Normal file
View file

@ -0,0 +1,3 @@
"""Python libknot interface."""
LIBKNOT_VERSION = "@python_libknot_VERSION@"

12
python/libknot/control.py
View file

@ -45,7 +45,17 @@ def load_lib(path=None):
"""Loads the libknot library."""
if path is None:
path = "libknot.dylib" if sys.platform == "darwin" else "libknot.so"
version = ""
try:
from libknot import LIBKNOT_VERSION
version = ".%u" % int(LIBKNOT_VERSION)
except:
pass
if sys.platform == "darwin":
path = "libknot%s.dylib" % version
else:
path = "libknot.so%s" % version
LIB = cdll.LoadLibrary(path)
global CTL_ALLOC