[ekiga] Fix name conflict in configure.ac just introduced
- From: Eugen Dedu <ededu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Fix name conflict in configure.ac just introduced
- Date: Sat, 11 Jun 2016 17:50:10 +0000 (UTC)
commit c28ae87ff43fec6ef5100ed0c2fce51692087cf8
Author: Eugen Dedu <eugen dedu univ-fcomte fr>
Date: Sat Jun 11 19:49:07 2016 +0200
Fix name conflict in configure.ac just introduced
GSTREAMER was already used in another PKG_CHECK_MODULE.
configure.ac | 2 +-
lib/Makefile.am | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b9a9221..ec60c03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,7 +158,7 @@ dnl ##########################################
dnl Mandatory GST Clutter & Clutter support
dnl ##########################################
PKG_CHECK_MODULES([CLUTTER_GTK], [clutter-gtk-1.0])
-PKG_CHECK_MODULES([GSTREAMER], [gstreamer-plugins-base-1.0])
+PKG_CHECK_MODULES([GSTREAMER_PLUGINS_BASE], [gstreamer-plugins-base-1.0])
dnl ###############################
dnl Mandatory BOOST support
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 38c18f9..6e26b5f 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -479,7 +479,7 @@ endif
# Sources of the Clutter video output component
##
-AM_CPPFLAGS += $(CLUTTER_GTK_CFLAGS) $(GSTREAMER_CFLAGS) \
+AM_CPPFLAGS += $(CLUTTER_GTK_CFLAGS) $(GSTREAMER_PLUGINS_BASE_CFLAGS) \
-I$(top_srcdir)/lib/engine/components/clutter-gst-videooutput
libekiga_la_SOURCES += \
@@ -488,7 +488,7 @@ libekiga_la_SOURCES += \
engine/components/clutter-gst-videooutput/videooutput-main-clutter-gst.cpp \
engine/components/clutter-gst-videooutput/videooutput-main-clutter-gst.h
-libekiga_la_LDFLAGS += $(CLUTTER_GTK_LIBS) $(GSTREAMER_LIBS)
+libekiga_la_LDFLAGS += $(CLUTTER_GTK_LIBS) $(GSTREAMER_PLUGINS_BASE_LIBS)
##
# Sources of the foe list component
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]