X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=0ee5d8535e252cf183b7c5b0b40b1b9353bf1696;hb=37a2578ce4265f4ed495290923e3fa674c662656;hp=f3d58e51f3f07a52d479284deb3058e74f28bc5f;hpb=7aafdfd7e4e1b14edca3b427de1a2dbc0a36584b;p=vlc

diff --git a/configure.ac b/configure.ac
index f3d58e51f3..0ee5d8535e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1133,6 +1133,7 @@ VLC_ADD_PLUGIN([extract])
 VLC_ADD_PLUGIN([sharpen])
 VLC_ADD_PLUGIN([seamcarving])
 VLC_ADD_PLUGIN([croppadd])
+VLC_ADD_PLUGIN([canvas])
 VLC_ADD_PLUGIN([blendbench])
 VLC_ADD_PLUGIN([blend])
 VLC_ADD_PLUGIN([scale])
@@ -3571,11 +3572,11 @@ dnl
 AC_ARG_ENABLE(dirac,
 [  --enable-dirac          experimental dirac codec (default disabled)])
 if test "${enable_dirac}" = "yes"; then
-  PKG_CHECK_MODULES(DIRAC,[dirac >= 0.9.0], [
+  PKG_CHECK_MODULES(DIRAC,[dirac >= 0.10.0], [
       VLC_ADD_PLUGIN([dirac])
       VLC_ADD_CFLAGS([dirac],[$DIRAC_CFLAGS])
       VLC_ADD_LIBS([dirac],[$DIRAC_LIBS -lstdc++]) ],[
-      AC_MSG_ERROR([libdirac doesn't appear to be installed on you system.])
+      AC_MSG_ERROR([libdirac >= 0.10.0 doesn't appear to be installed on your system.])
   ])
 fi
 
@@ -4411,33 +4412,6 @@ then
       fi ])
 fi
 
-dnl
-dnl  Glide module
-dnl
-AC_ARG_ENABLE(glide,
-  [  --enable-glide          Glide (3dfx) support (default disabled)])
-if test "${enable_glide}" = "yes"
-then
-  CFLAGS_save="${CFLAGS}"
-  AC_ARG_WITH(glide,
-    [    --with-glide=PATH     path to libglide],
-    [ if test "${with_glide}" != "no" -a -n "${with_glide}"
-      then
-        VLC_ADD_CPPFLAGS([glide],[-I${with_glide}/include])
-        VLC_ADD_LIBS([glide],[-L${with_glide}/lib])
-        CFLAGS="$CFLAGS -I${with_glide}/include"
-    fi ])
-   CFLAGS="$CFLAGS -I/usr/include/glide"
-   AC_CHECK_HEADER(glide.h,[   
-      VLC_ADD_PLUGIN([glide])
-      VLC_ADD_LIBS([glide],[-lglide2x -lm])
-      VLC_ADD_CPPFLAGS([glide],[-I/usr/include/glide])
-    ],[
-      AC_MSG_ERROR([You don't have libglide. Install it or do not use --enable-glide])
-     ])
-   CFLAGS="${CFLAGS_save}"
-fi
-
 dnl
 dnl  AA plugin
 dnl
@@ -5423,24 +5397,70 @@ then
         CPPFLAGS="${CPPFLAGS_save}"
       ],
       [
-        AC_PATH_PROG(MOZILLA_CONFIG, mozilla-config, no)
-        if test "${MOZILLA_CONFIG}" = "no"
-        then
-          AC_PATH_PROG(SEAMONKEY_CONFIG, seamonkey-config, no)
-          if test "${SEAMONKEY_CONFIG}" = "no"
-          then
-            AC_PATH_PROG(XULRUNNER_CONFIG, xulrunner-config, no)
-            if test "${XULRUNNER_CONFIG}" = "no"
+        PKG_CHECK_MODULES([XULRUNNER], [libxul],
+          [
+            PKG_CHECK_MODULES([FIREFOX_XPCOM], [firefox-xpcom],
+              [],
+              [
+                PKG_CHECK_MODULES([MOZILLA_NSPR], [mozilla-nspr],
+                  [],
+                  [
+                    PKG_CHECK_MODULES([NSPR], [nspr],
+                      [],
+                      [
+                        AC_MSG_ERROR([Please install the nspr development tools.])
+                      ]
+                    )
+                  ]
+                )
+              ]
+            )
+            CPPFLAGS="${CPPFLAGS_save} ${XULRUNNER_CFLAGS} ${XULRUNNER_CPPFLAGS} ${FIREFOX_XPCOM_CFLAGS} ${MOZILLA_NSPR_CFLAGS} ${NSPR_CFLAGS} ${MOZILLA_CPPFLAGS}"
+            MOZILLA_REQUIRED_HEADERS=1
+            AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0)
+            AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0,
+              [#if HAVE_NPAPI_H
+               # include <npapi.h>
+               #endif
+              ])
+            if test "${MOZILLA_REQUIRED_HEADERS}" = "0"; then
+                AC_MSG_ERROR([Please install the Mozilla runtime package xulrunner-devel; plugplugin/npapi.h and plugin/npruntime.h were not found.])
+            fi
+            MOZILLA_REQUIRED_HEADERS=
+            mozilla=:
+            AC_DEFINE([XP_UNIX],[1],[Defined for Mozilla as we are Unix])
+            AC_DEFINE([MOZ_X11],[1],[Defined as Unix mozilla uses X11])
+            AC_DEFINE([OJI],[1],[Java Runtime Interface])
+            AC_CHECK_HEADERS(X11/xpm.h,,AC_MSG_ERROR([Please install libXpm-devel library for required X11/xpm.h]))
+            VLC_ADD_LIBS([mozilla], [${X_LIBS} ${X_PRE_LIBS} -lX11 -lXt -lXpm])
+            VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS}])
+            VLC_ADD_LDFLAGS([mozilla],[${MOZILLA_LDFLAGS}])
+            VLC_ADD_LIBS([mozilla],[${FIREFOX_LIBS} ${MOZILLA_NSPR_LIBS} ${NSPR_LIBS}])
+            VLC_ADD_PLUGIN([mozilla])
+            MOZILLA_CONFIG=
+            CPPFLAGS="${CPPFLAGS_save}"
+          ],
+          [
+            AC_PATH_PROG(MOZILLA_CONFIG, mozilla-config, no)
+            if test "${MOZILLA_CONFIG}" = "no"
             then
-              AC_MSG_ERROR([Please install the Mozilla development tools, mozilla-config was not found.])
-            else
-              have_xul=true
-              MOZILLA_CONFIG="${XULRUNNER_CONFIG}"
+              AC_PATH_PROG(SEAMONKEY_CONFIG, seamonkey-config, no)
+              if test "${SEAMONKEY_CONFIG}" = "no"
+              then
+                AC_PATH_PROG(XULRUNNER_CONFIG, xulrunner-config, no)
+                if test "${XULRUNNER_CONFIG}" = "no"
+                then
+                  AC_MSG_ERROR([Please install the Mozilla development tools, mozilla-config was not found.])
+                else
+                  have_xul=true
+                  MOZILLA_CONFIG="${XULRUNNER_CONFIG}"
+                fi
+              else
+                MOZILLA_CONFIG="${SEAMONKEY_CONFIG}"
+              fi
             fi
-          else
-            MOZILLA_CONFIG="${SEAMONKEY_CONFIG}"
-          fi
-        fi
+          ]
+        )
       ]
     )
     if test ! -z "${MOZILLA_CONFIG}"