mirror of
https://github.com/znc/znc.git
synced 2026-05-18 15:25:53 +02:00
Use pkg-config for modpython.
python3-config fails when python is installed not system-wide. It doesn't return -L/path/to/libs. pkg-config resurns it. Note that this changes meaning of optional argument to ./configure --enable-python=...
This commit is contained in:
+3
-1
@@ -25,7 +25,9 @@ LDFLAGS := @LDFLAGS@
|
||||
# LIBS := @LIBS@
|
||||
PERL_ON := @PERL@
|
||||
PERL := @PERL_BINARY@
|
||||
PYCFG := @PYTHONCFG_BINARY@
|
||||
PYTHON_ON:= @PYTHON@
|
||||
PY_CFLAGS:= @python_CFLAGS@
|
||||
PY_LDFLAGS:=@python_LIBS@
|
||||
SWIG := @SWIG_BINARY@
|
||||
MODDIR := @MODDIR@
|
||||
DATADIR := @DATADIR@
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# vim: filetype=make
|
||||
|
||||
ifneq "$(PYCFG)" ""
|
||||
PYTHONCOMMON := $(shell $(PYCFG) --includes) $(shell $(PYCFG) --ldflags)
|
||||
ifeq "$(PYTHON_ON)" "yes"
|
||||
PYTHONCOMMON := $(PY_CFLAGS) $(PY_LDFLAGS)
|
||||
PYTHONCOMMON += -DSWIG_TYPE_TABLE=znc
|
||||
PYTHONCOMMON += -Wno-missing-field-initializers -Wno-unused -Wno-shadow
|
||||
PYTHONCOMMON += -Wno-missing-declarations -Wno-uninitialized
|
||||
@@ -28,7 +28,7 @@ install: $(PYTHONHOOK)
|
||||
$(E) Compiling $@...
|
||||
$(Q)$^ $@
|
||||
|
||||
ifneq "$(PYCFG)" ""
|
||||
ifeq "$(PYTHON_ON)" "yes"
|
||||
all: modpython_all
|
||||
endif
|
||||
modpython_all: modpython/_znc_core.so modpython/swigpyrun.h modpython/znc.pyc modpython/znc_core.pyc
|
||||
|
||||
Reference in New Issue
Block a user