From e69cc42f46ecf484d30cef6c2ea828cd70063e7d Mon Sep 17 00:00:00 2001
From: Sylvain Garrigues <SylvainGarrigues@users.noreply.github.com>
Date: Sun, 8 Mar 2020 01:01:52 +0100
Subject: [PATCH] Do not override user's CFLAGS nor LDFLAGS

---
 configure.ac    | 10 +++++-----
 src/Makefile.am |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3876adbd..9a4127de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,7 @@ AS_IF([test "${PKGCONFIG}" = "no" ],[
 ###  Check pthread
 ##############################################################################
 AC_CHECK_HEADERS(pthread.h,,AC_MSG_ERROR([pthread is required.]))
-CFLAGS="${CFLAGS} -D_THREAD_SAFE "
+TEMP_CFLAGS="-D_THREAD_SAFE"
 LIBS="$LIBS -pthread "
 
 ##############################################################################
@@ -464,9 +464,9 @@ AS_IF([test "${PROTOTYPE_FLAGS}" = "yes"], [
 )
 
 
-CFLAGS="$CFLAGS $TEMP_CFLAGS"
+AC_SUBST(AM_CFLAGS, "$TEMP_CFLAGS")
 LIBS="$LIBS $TEMP_LIBS"
-LDFLAGS="$TEMP_LDFLAGS"
+AC_SUBST(AM_LDFLAGS, "$TEMP_LDFLAGS")
 
 AC_CONFIG_FILES([
 	Makefile
@@ -494,11 +494,11 @@ echo "      Configure status       "
 echo "      ${PACKAGE_NAME} ${PACKAGE_VERSION}"
 echo "   **************************"
 echo
-echo "CFLAGS: $CFLAGS"
+echo "CFLAGS: $TEMP_CFLAGS $CFLAGS"
 echo
 echo "LIBS: $LIBS"
 echo
-echo "LDFLAGS: $LDFLAGS"
+echo "LDFLAGS: $TEMP_LDFLAGS $LDFLAGS"
 echo
 echo
 echo "OS                  : $host_os"
diff --git a/src/Makefile.am b/src/Makefile.am
index bedd1b38..77d19db9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS= -Dsysconfdir=\"$(sysconfdir)/motion\" -DLOCALEDIR=\"$(DESTDIR)$(localedir)\"
+AM_CPPFLAGS= -Dsysconfdir=\"$(sysconfdir)/motion\" -DLOCALEDIR=\"$(DESTDIR)$(localedir)\"
 
 if INC_MMAL_SRC
 MMAL_SRC=raspicam/RaspiCamControl.c raspicam/RaspiCLI.c