From d81209c6f41eb3f939b8d380c4326adf8b886403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Fri, 8 Jun 2018 02:04:22 +0200
Subject: cmake: Fix build of ogg plugin in mpeglib This relates to bug 2844
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
---
 ConfigureChecks.cmake      | 2 +-
 config.h.cmake             | 2 +-
 mpeglib/lib/CMakeLists.txt | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 6eb512e2..12c977ef 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -247,7 +247,7 @@ if( WITH_VORBIS )
   endif( )
 
   set( HAVE_VORBIS 1 )
-  set( HAVE_OGG_VORBIS 1 )
+  set( OGG_VORBIS 1 )
 
 endif( WITH_VORBIS )
 
diff --git a/config.h.cmake b/config.h.cmake
index 6f46a622..bee10800 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -26,7 +26,7 @@
 
 #cmakedefine HAVE_LIBFLAC 1
 #cmakedefine HAVE_VORBIS 1
-#cmakedefine HAVE_OGG_VORBIS 1
+#cmakedefine OGG_VORBIS 1
 
 /* mpeglib */
 #cmakedefine ATTRIBUTE_ALIGNED_MAX @ATTRIBUTE_ALIGNED_MAX@
diff --git a/mpeglib/lib/CMakeLists.txt b/mpeglib/lib/CMakeLists.txt
index 0cb4b49a..a2e324fe 100644
--- a/mpeglib/lib/CMakeLists.txt
+++ b/mpeglib/lib/CMakeLists.txt
@@ -62,6 +62,7 @@ tde_add_library( mpeg SHARED
   LINK
     mcop kmedia2_idl soundserver_idl artsflow_idl artsmodules-shared
     X11 ${XEXT_LIBRARIES} m ${XV_LIBRARIES} ${DGA_LIBRARIES} ${XVIDMODE_LIBRARIES}
-    ${CDPARANOIA_LIBRARIES} ${VORBIS_LIBRARIES} ${VORBISFILE_LIBRARIES} pthread
+    ${CDPARANOIA_LIBRARIES} ${OGG_LIBRARIES} ${VORBIS_LIBRARIES} ${VORBISFILE_LIBRARIES}
+    pthread
   DESTINATION ${LIB_INSTALL_DIR}
 )
-- 
cgit v1.2.3