From fdb50e4ff2c1c226ed0e77dcf4729c7c3474e8e4 Mon Sep 17 00:00:00 2001
From: Zigiria Kalmara <zigiria.kalmara@timesys.com>
Date: Thu, 7 May 2020 15:01:33 +0530
Subject: [PATCH 2/2] Various fixes for the SWIG build

---
 bindings/python/python2/Makefile.in | 2 +-
 bindings/swig/python/Makefile.in    | 4 ++--
 bindings/swig/python3/Makefile.in   | 2 +-
 bindings/swig/src/auditswig.i       | 2 +-
 configure                           | 8 ++++----
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bindings/python/python2/Makefile.in b/bindings/python/python2/Makefile.in
index 11cc560..d2d9a20 100644
--- a/bindings/python/python2/Makefile.in
+++ b/bindings/python/python2/Makefile.in
@@ -386,7 +386,7 @@ top_srcdir = @top_srcdir@
 use_python3 = @use_python3@
 CONFIG_CLEAN_FILES = *.loT *.rej *.orig
 AM_CFLAGS = -fPIC -DPIC -fno-strict-aliasing
-AM_CPPFLAGS = -I$(top_builddir) -I@PYINCLUDEDIR@
+AM_CPPFLAGS = -I$(top_builddir) -I$(PYINCLUDEDIR)
 pyexec_LTLIBRARIES = auparse.la
 auparse_la_SOURCES = $(top_srcdir)/bindings/python/auparse_python.c
 auparse_la_CPPFLAGS = -I$(top_srcdir)/auparse $(AM_CPPFLAGS)
diff --git a/bindings/swig/python/Makefile.in b/bindings/swig/python/Makefile.in
index 5e9e339..8593804 100644
--- a/bindings/swig/python/Makefile.in
+++ b/bindings/swig/python/Makefile.in
@@ -389,9 +389,9 @@ use_python3 = @use_python3@
 #
 CONFIG_CLEAN_FILES = *.loT *.rej *.orig
 AM_CFLAGS = -fPIC -DPIC -fno-strict-aliasing
-AM_CPPFLAGS = -I. -I$(top_builddir) -I${top_srcdir}/lib -I@PYINCLUDEDIR@
+AM_CPPFLAGS = -I. -I$(top_builddir) -I${top_srcdir}/lib -I$(PYINCLUDEDIR)
 SWIG_FLAGS = -python
-SWIG_INCLUDES = -I. -I$(top_builddir) -I${top_srcdir}/lib -I@PYINCLUDEDIR@
+SWIG_INCLUDES = -I. -I$(top_builddir) -I${top_srcdir}/lib -I$(PYINCLUDEDIR) $(SWIG_EXTRA_INCLUDES)
 pyexec_PYTHON = audit.py
 pyexec_LTLIBRARIES = _audit.la
 pyexec_SOLIBRARIES = _audit.so
diff --git a/bindings/swig/python3/Makefile.in b/bindings/swig/python3/Makefile.in
index e410d6b..001b28e 100644
--- a/bindings/swig/python3/Makefile.in
+++ b/bindings/swig/python3/Makefile.in
@@ -390,7 +390,7 @@ CONFIG_CLEAN_FILES = *.loT *.rej *.orig
 AM_CFLAGS = -fPIC -DPIC -fno-strict-aliasing $(PYTHON3_CFLAGS)
 AM_CPPFLAGS = -I. -I$(top_builddir) -I${top_srcdir}/lib $(PYTHON3_INCLUDES)
 SWIG_FLAGS = -python -py3 -modern
-SWIG_INCLUDES = -I. -I$(top_builddir) -I${top_srcdir}/lib $(PYTHON3_INCLUDES)
+SWIG_INCLUDES = -I. -I$(top_builddir) -I${top_srcdir}/lib $(PYTHON3_INCLUDES) $(SWIG_EXTRA_INCLUDES)
 # REMOVE SOMEDAY - without overriding this macro, it uses python2
 am__py_compile = PYTHON=$(PYTHON3) $(SHELL) $(py_compile)
 py3exec_PYTHON = audit.py
diff --git a/bindings/swig/src/auditswig.i b/bindings/swig/src/auditswig.i
index 7ebb373..424fb68 100644
--- a/bindings/swig/src/auditswig.i
+++ b/bindings/swig/src/auditswig.i
@@ -39,7 +39,7 @@ signed
 #define __attribute(X) /*nothing*/
 typedef unsigned __u32;
 typedef unsigned uid_t;
-%include "/usr/include/linux/audit.h"
+%include "linux/audit.h"
 #define __extension__ /*nothing*/
 #include <stdint.h>
 %include "../lib/libaudit.h"
diff --git a/configure b/configure
index 7067693..63be574 100755
--- a/configure
+++ b/configure
@@ -14937,7 +14937,7 @@ $as_echo "$am_cv_python_pyexecdir" >&6; }
   fi
 
 
-PYINCLUDEDIR=`python${am_cv_python_version} -c "from distutils import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))"`
+test -n "$PYINCLUDEDIR" || PYINCLUDEDIR=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))"`
 if test -f ${PYINCLUDEDIR}/Python.h ; then
 	python_found="yes"
 
@@ -15079,9 +15079,9 @@ fi
 		echo "pass --without-python3 to ./configure."
 		exit 1
 	fi
-	PYTHON3_CFLAGS=`python3-config --cflags 2> /dev/null`
-	PYTHON3_LIBS=`python3-config --libs 2> /dev/null`
-	PYTHON3_INCLUDES=`python3-config --includes 2> /dev/null`
+	PYTHON3_CFLAGS=`$PYTHON3 $ac_cv_path_use_python3 --cflags 2> /dev/null || $ac_cv_path_use_python3 --cflags 2> /dev/null`
+	PYTHON3_LIBS=`$PYTHON3 $ac_cv_path_use_python3 --libs 2> /dev/null || $ac_cv_path_use_python3 --libs 2> /dev/null`
+	PYTHON3_INCLUDES=`$PYTHON3 $ac_cv_path_use_python3 --includes 2> /dev/null || $ac_cv_path_use_python3 --includes 2> /dev/null`
 	PYTHON3_PREFIX='${prefix}'
 
 	PYTHON3_EXEC_PREFIX='${exec_prefix}'
-- 
2.17.1