[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeaccessibility/kttsd
From:       Gary Cramblitt <garycramblitt () comcast ! net>
Date:       2005-08-16 1:16:46
Message-ID: 1124155006.315488.25237.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 449584 by cramblitt:

Workaround for -pthread conflict with moc -p option.

 M  +3 -2      configure.in.in  
 M  +1 -1      players/gstplayer/Makefile.am  


--- trunk/KDE/kdeaccessibility/kttsd/configure.in.in #449583:449584
@@ -36,11 +36,12 @@
 fi
 
 if test "x$have_gst" = "xno"; then
-  GST_CFLAGS=""
+  INCLUDES_GST=""
   LDADD_GST=""
   LDFLAGS_GST=""
   AC_DEFINE(HAVE_GSTREAMER, 0, [have GStreamer])
 else
+  INCLUDES_GST=`$PKG_CONFIG --cflags-only-I gstreamer-$GST_MAJORMINOR`
   LDADD_GST=`$PKG_CONFIG --libs-only-l gstreamer-$GST_MAJORMINOR`
   LDFLAGS_GST=`$PKG_CONFIG --libs-only-other gstreamer-$GST_MAJORMINOR`
 
@@ -57,7 +58,7 @@
   fi
 fi
 
-AC_SUBST(GST_CFLAGS)
+AC_SUBST(INCLUDES_GST)
 AC_SUBST(LDADD_GST)
 AC_SUBST(LDFLAGS_GST)
 
--- trunk/KDE/kdeaccessibility/kttsd/players/gstplayer/Makefile.am #449583:449584
@@ -1,7 +1,7 @@
 # Include paths.  INCLUDES is maintained by KDevelop, AM_CPPFLAGS is the preferred variable,
 # so keep them synchronized.
 INCLUDES = \
-	$(GST_CFLAGS) \
+	$(INCLUDES_GST) \
 	-I$(top_srcdir)/kttsd/libkttsd -I$(top_builddir)/kttsd/libkttsd \
 	$(all_includes)
 
[prev in list] [next in list] [prev in thread] [next in thread]