]> git.sesse.net Git - vlc/commitdiff
If --disable-xosd is given then xosdtext is not build.
authorJean-Paul Saman <jpsaman@videolan.org>
Sat, 29 Mar 2003 10:35:48 +0000 (10:35 +0000)
committerJean-Paul Saman <jpsaman@videolan.org>
Sat, 29 Mar 2003 10:35:48 +0000 (10:35 +0000)
If --enable-xose is given then xosdtext is build also.

configure.ac.in

index f87093a44f2598e7c7a01336d4c2066abb8d1a7f..9c81d2cfbbc6fb8d3d47e1b924d65888942bf0c3 100644 (file)
@@ -2004,7 +2004,7 @@ then
       fi ])
   AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no, ${FREETYPE_PATH})
 
-  if test "x${FREETYPE_CONFIG}" != "xno"
+  if test "x${FREETYPE_CONFIG}" != "xno" -a "x${have_xosd}" = "xtrue"
   then
     PLUGINS="${PLUGINS} osdtext"
     CFLAGS_osdtext="${CFLAGS_osdtext} `${FREETYPE_CONFIG} --cflags`"
@@ -2896,7 +2896,8 @@ if test "x${NEED_QTE_MAIN}" != "xno"
 then
     PLUGINS="${PLUGINS} qte_main"
     CPPFLAGS_qte="${CPPFLAGS_qte} -DNEED_QTE_MAIN"
-       CPPFLAGS_opie="${CPPFLAGS_opie} -DNEED_QTE_MAIN"
+    CPPFLAGS_opie="${CPPFLAGS_opie} -DNEED_QTE_MAIN"
+    CFLAGS_vout_sdl="${CFLAGS_vout_sdl} -DNEED_QTE_MAIN"
     CPPFLAGS_qte_main="${CFLAGS_qte_main} ${CPPFLAGS_qte}"
     LDFLAGS_qte_main="${LDFLAGS_qte_main} ${LDFLAGS_qte}"
 fi