compiler issues, warnings, makefile spiffs

[goodguy/history.git] / cinelerra-5.1 / configure.ac

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 625797199c14fbab94b13a929d4730bd386d7e3f..c1cbd8884b37da11ccef72a747576114d51e749e 100644 (file)
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -461,12 +461,12 @@ AC_ARG_WITH(m4_tolower([$1]),
 # WANT_$1
 if test "x$WANT_$1" != "xno" ; then
  m4_quote($3)
-fi
-if test "x$RESULT" = "xno" -a "x$PKG_$1" = "x"; then
- echo "=== want $1 Failed."
- WANT_$1=no
-else
- WANT_$1=yes
+ if test "x$RESULT" = "xno" -a "x$PKG_$1" = "x"; then
+  echo "=== want $1 Failed."
+  WANT_$1=no
+ else
+  WANT_$1=yes
+ fi
 fi
 CFG_WANTS+=" $1"
 AC_SUBST([WANT_$1])
@@ -731,7 +731,15 @@ echo "WANT_CIN := $WANT_CIN"
 for w in $CFG_WANTS; do ww=WANT_$w; echo "WANT_$w := ${!ww}"; done
 echo ""
 
-echo "CFLAGS ?= ${CFLAGS:--g -O2}"
+echo "ifndef CFLAGS_"
+echo "ifdef CFLAGS"
+echo "CFLAGS_ := \$(CFLAGS)"
+echo "else"
+echo "CFLAGS_ := ${CFLAGS:--g -O2}"
+echo "endif"
+echo "endif"
+
+echo "CFLAGS := \$(CFLAGS_)"
 echo "CFLAGS += '-DCIN=\"\$(WANT_CIN)\"'"
 echo "CFLAGS += '-DCINLIB_DIR=\"$WANT_CINLIB_DIR\"'"
 echo "CFLAGS += '-DCINDAT_DIR=\"$WANT_CINDAT_DIR\"'"
@@ -742,7 +750,6 @@ echo "CFLAGS += '-DLADSPA_DIR=\"$WANT_LADSPA_DIR\"'"
 for flg in $CFG_CFLAGS; do echo "CFLAGS += $flg"; done
 echo ""
 for flg in $CFG_CXXFLAGS; do echo "CXXFLAGS += $flg"; done
-echo "unexport CFLAGS CXXFLAGS"
 echo ""
 
 if test  $WANT_X264_HIDEPTH = "yes" ; then
@@ -792,5 +799,7 @@ echo "libraries += -Wl,--end-group"
 echo "libraries += \$(thirdparty_libraries)"
 echo "libraries += \$(system_libs)"
 echo "libraries += \$(EXTRA_LIBS)"
-echo "export thirdparty_libraries libraries"
 echo ""
+echo "export thirdparty_libraries libraries"
+echo "export CFLAGS_ CXXFLAGS_ LDFLAGS_"
+echo "unexport CFLAGS CXXFLAGS LDFLAGS"