X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fconfigure.ac;h=60497a06150dce72d15a1f6cac4f81bed6dad61f;hp=374a233ba8ee2b2506757929d16a5c1131f9b14a;hb=5877eaa318ed3060f57621657c0888258da41a59;hpb=efb3600851fd27b13d3053ffbdb6434535580bfd

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 374a233b..60497a06 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -11,10 +11,13 @@ AC_PROG_CXX
 CFG_CFLAGS+=" -fno-omit-frame-pointer -fno-math-errno -fno-signed-zeros"
 CFG_CFLAGS+=" -pthread -Wall"
 # misguided pedantic warnings
+CFG_CFLAGS+=" -Wno-unknown-warning"
 CFG_CFLAGS+=" -Wno-unused-result"
 CFG_CFLAGS+=" -Wno-stringop-overflow"
 CFG_CFLAGS+=" -Wno-format-truncation"
 CFG_CFLAGS+=" -Wno-format-overflow"
+CFG_CFLAGS+=" -Wno-parentheses"
+CFG_CFLAGS+=" -Wno-stringop-truncation"
 CFG_CFLAGS+=" -D__STDC_CONSTANT_MACROS"
 CFG_CFLAGS+=" -D__STDC_LIMIT_MACROS"
 CFG_CFLAGS+=" -DPNG_SKIP_SETJMP_CHECK=1"
@@ -41,6 +44,7 @@ CHECK_WITH([ladspa-dir],[ladspa install dir],[LADSPA_DIR],[auto])
 CHECK_WITH([config-dir],[.bcast config dir],[CONFIG_DIR],[$$HOME/.bcast5])
 CHECK_WITH([browser],[cin_browser path],[CIN_BROWSER],[firefox])
 CHECK_WITH([git-ffmpeg],[git ffmpeg using url],[GIT_FFMPEG],[no])
+CHECK_WITH([noelision],[use noelision/libpthread],[NOELISION],[auto])
 
 if test "x$WANT_LV2" != "xno"; then
   if test "x$WANT_LV2UI" != "xno"; then
@@ -790,6 +794,7 @@ echo "  using: with-plugin-dir = $WANT_PLUGIN_DIR"
 echo "  using: with-ladspa-dir = $WANT_LADSPA_DIR"
 echo "  using: with-opencv = $WANT_OPENCV"
 echo "  using: with-git-ffmpeg = $WANT_GIT_FFMPEG"
+echo "  using: with-noelision = $WANT_NOELISION"
 echo ""
 echo "  using: single-user  = $WANT_CINBIN_BUILD"
 echo "  using: static-build = $WANT_STATIC_BUILD"
@@ -815,6 +820,16 @@ if test "x$HAVE_opus" = "xyes"; then
   FFMPEG_EXTRA_CFG+=' --enable-libopus'
 fi
 
+# intel lock elision bugs
+if test "x$WANT_NOELISION" != "xno"; then
+  CFG_RPATH=`ls -1fd 2> /dev/null \
+ /usr/lib/noelision \
+ /lib/noelision \
+ /usr/lib64/noelision \
+ /lib64/noelision \
+  | tail -1`
+fi
+
 AC_SUBST(EXTRA_LIBS)
 AC_SUBST(FFMPEG_EXTRA_CFG)
 AC_SUBST(WANT_X264_HIDEPTH)
@@ -914,6 +929,11 @@ echo "export static_pkgs static_blds shared_libs system_libs"
 echo ""
 
 echo "thirdparty_libraries := \$(static_libs) \$(shared_libs)"
+
+if test "x$CFG_RPATH" != "x"; then
+  echo "libraries+= -Wl,-rpath=$CFG_RPATH"
+fi
+
 echo "libraries += -Wl,--start-group"
 echo "libraries += \$(thirdparty_libraries)"
 echo "libraries += \$(system_libs)"