[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - configure.ac

Michael Stahl mstahl at redhat.com
Fri Jun 28 05:47:15 PDT 2013


 configure.ac |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 3d736faef1cfc619f965d80c0eb112dc7c7426e3
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri May 31 15:24:34 2013 +0200

    configure: use -isystem for GSTREAMER_CFLAGS
    
    ... to work around GCC 4.8.0 -Werror=literal-suffix in gst/video/video.h
    definition of GST_VIDEO_CAPS_RGB8_PALETTED.
    
    Change-Id: I514b29d58f348bad0b13c7ef66db4b3ee34516cd
    (cherry picked from commit 18b0bda1be62da1b0f9c1fc40864ccc486d5b43c)
    
    Signed-off-by: Luboš Luňák <l.lunak at suse.cz>

diff --git a/configure.ac b/configure.ac
index 299ee69..06e7954 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9509,6 +9509,7 @@ if test "$build_gstreamer" = "yes"; then
         ENABLE_GSTREAMER="TRUE"
         AC_MSG_RESULT([yes])
         PKG_CHECK_MODULES( GSTREAMER, gstreamer-1.0 gstreamer-plugins-base-1.0 gstreamer-video-1.0 )
+        GSTREAMER_CFLAGS="`echo $GSTREAMER_CFLAGS | sed -e \"s/-I/${ISYSTEM}/g\"`"
     else
         AC_MSG_RESULT([no])
     fi
@@ -9528,6 +9529,7 @@ if test "$build_gstreamer_0_10" = "yes"; then
         PKG_CHECK_MODULES( [GSTREAMER_0_10], [gstreamer-0.10 gstreamer-plugins-base-0.10 gstreamer-interfaces-0.10],, [
             PKG_CHECK_MODULES(  [GSTREAMER_0_10], [gstreamer-0.10 gstreamer-plugins-base-0.10] )
         ])
+        GSTREAMER_0_10_CFLAGS="`echo $GSTREAMER_0_10_CFLAGS | sed -e \"s/-I/${ISYSTEM}/g\"`"
     else
         AC_MSG_RESULT([no])
     fi


More information about the Libreoffice-commits mailing list