From e63ce93b8823ba6497fc72612a8ecba3bd45df9c Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Aug 18 2017 09:31:29 +0000 Subject: Use PKG_CHECK_MODULES for python2 The hardcoded python CFLAGS and CLIBS are not working on Archlinux where default python is python3. Changed to use PKG_CHECK_MODULES to detect CFLAGS and LDFLAGS of python. Signed-off-by: Gris Ge --- diff --git a/Makefile.am b/Makefile.am index 4569bbf..e0535ac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,6 @@ ACLOCAL_AMFLAGS = -I m4 AM_CPPFLAGS = $(blkid_CFLAGS) $(glib_CFLAGS) $(GPGME_CFLAGS) \ $(libcryptsetup_CFLAGS) $(nss_CFLAGS) LOCALEDIR_CPPFLAGS = -DLOCALEDIR='"$(localedir)"' -PYTHON_CPPFLAGS = -I/usr/include/python$(PYTHON_VERSION) ## Targets SUBDIRS = po @@ -63,9 +62,10 @@ lib_libvolume_key_la_LIBADD = $(blkid_LIBS) $(glib_LIBS) $(GPGME_LIBS) \ $(LTLIBINTL) $(libcryptsetup_LIBS) $(nss_LIBS) python__volume_key_la_SOURCES = python/volume_key_wrap.c -python__volume_key_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_CPPFLAGS) -python__volume_key_la_LDFLAGS = -module -avoid-version $(glib_LIBS) -python__volume_key_la_LIBADD = lib/libvolume_key.la -lpython$(PYTHON_VERSION) \ +python__volume_key_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_CFLAGS) +python__volume_key_la_LDFLAGS = -module -avoid-version $(glib_LIBS) \ + $(PYTHON_LIBS) +python__volume_key_la_LIBADD = lib/libvolume_key.la \ $(glib_LIBS) $(nss_LIBS) src_volume_key_SOURCES = src/volume_key.c diff --git a/configure.ac b/configure.ac index 5dbb326..e1f576f 100644 --- a/configure.ac +++ b/configure.ac @@ -42,6 +42,7 @@ AC_DEFINE(G_DISABLE_DEPRECATED, 1, [Stay away from deprecated glib functionality.]) PKG_CHECK_MODULES(libcryptsetup, [libcryptsetup]) PKG_CHECK_MODULES(nss, [nss]) +PKG_CHECK_MODULES([PYTHON], [python2]) AM_PATH_GPGME