mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-04-18 13:07:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Do not override user's CFLAGS nor LDFLAGS

Browse Source
This commit is contained in:
Sylvain Garrigues
2020-03-08 01:01:52 +01:00
committed by GitHub
parent a4a48baf86
commit e69cc42f46
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@@ -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"

2
src/Makefile.am
View File

@@ -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