[xiph-commits] r3476 - in browser_plugin/trunk: . src

[j at svn.annodex.net]

Author: j
Date: 2008-02-16 08:15:08 -0800 (Sat, 16 Feb 2008)
New Revision: 3476

Modified:
   browser_plugin/trunk/configure.ac
   browser_plugin/trunk/src/Makefile.am
Log:
do not hardcode firefox paths

Modified: browser_plugin/trunk/configure.ac
===================================================================
--- browser_plugin/trunk/configure.ac	2008-02-16 13:13:47 UTC (rev 3475)
+++ browser_plugin/trunk/configure.ac	2008-02-16 16:15:08 UTC (rev 3476)
@@ -122,6 +122,45 @@
 AC_SUBST(IMLIB2_CFLAGS)
 
 dnl
+dnl Detect Firefox (needed for the linux plugin)
+dnl
+PKG_CHECK_MODULES(FIREFOX, firefox-plugin firefox-xpcom firefox-nspr firefox-nss nspr nss)
+AC_SUBST(FIREFOX_LIBS)
+AC_SUBST(FIREFOX_CFLAGS)
+
+AC_ARG_WITH(xpidl,
+	AC_HELP_STRING([--with-xpidl=SOURCE_DIR],
+		       [Path to XPIDL binary]))
+
+if test "x$with_xpidl" != x -a "x$with_xpidl" != xyes -a "x$with_xpidl" != xno ; then
+  XPIDL="$with_xpidl"
+else
+  XPIDL=/usr/lib/firefox/xpidl
+fi
+
+AC_ARG_WITH(xpidl_include,
+	AC_HELP_STRING([--with-xpidl_include=INCLUDE_DIR],
+		       [Path to XPIDL include dir]))
+
+if test "x$with_xpidl_include" != x -a "x$with_xpidl_include" != xyes -a "x$with_xpidl_include" != xno ; then
+  XPIDL_INCLUDE="$with_xpidl_include"
+else
+  XPIDL_INCLUDE=-I/usr/share/idl/firefox
+fi
+AC_SUBST(XPIDL)
+AC_SUBST(XPIDL_INCLUDE)
+
+
+
+dnl
+dnl Detect GTK (needed for the linux plugin)
+dnl
+PKG_CHECK_MODULES(GTK, gtk+-2.0)
+AC_SUBST(GTK_LIBS)
+AC_SUBST(GTL_CFLAGS)
+
+
+dnl
 dnl  Detect pthreads libraries
 dnl
 
@@ -139,49 +178,6 @@
 AC_SUBST(PTHREAD_LIBS)
 
 
-dnl
-dnl Detect GLUT
-dnl
-
-HAVE_GLUT=no
-
-ac_enable_glut=yes
-AC_ARG_ENABLE(glut,
-     [  --disable-glut          disable building of GLUT player],
-     [ ac_enable_glut=no ], [ ac_enable_glut=yes ])
-
-if test "x${ac_enable_glut}" != xno ; then
-  dnl XXX: On MacOSX, assume we have GLUT and OpenGL frameworks
-  if test "x$HAVE_FRAMEWORKS" = "xyes" ; then
-    HAVE_GLUT=yes
-    GLUT_LIBS="-lm"
-    GLUT_FRAMEWORKS="-framework GLUT -framework OpenGL"
-    AC_SUBST(GLUT_LIBS)
-    AC_SUBST(GLUT_FRAMEWORKS)
-  else
-    AC_CHECK_LIB(glut, glutInit, HAVE_GLUT="maybe", , [-lGL -lm "$PTHREAD_LIBS"])
-    if test "x$HAVE_GLUT" = "xmaybe" ; then
-      AC_CHECK_HEADER([GL/glut.h], HAVE_GLUT="yes", HAVE_GLUT="no")
-    fi
-    if test "x$HAVE_GLUT" = xyes ; then
-      GLUT_LIBS="-lglut -lGL -lm $PTHREAD_LIBS"
-      AC_SUBST(GLUT_LIBS)
-    fi
-  fi
-  if test "x$HAVE_GLUT" = xyes ; then
-    browser_plugin_glut="glut-player"
-    AC_DEFINE([HAVE_GLUT], [], [Define if we have GLUT.])
-  else
-    browser_plugin_glut="
-  *** glut-player will NOT be built. GLUT could not be found."
-  fi
-else
-  HAVE_GLUT="disabled"
-  browser_plugin_glut="
-  (glut-player will NOT be built, disabled by './configure --disable-glut')"
-fi
-AM_CONDITIONAL(HAVE_GLUT, [test "x$HAVE_GLUT" = "xyes"])
-
 SEMAPHORE_LIBS="-lpthread"
 AC_SUBST(SEMAPHORE_LIBS)
 

Modified: browser_plugin/trunk/src/Makefile.am
===================================================================
--- browser_plugin/trunk/src/Makefile.am	2008-02-16 13:13:47 UTC (rev 3475)
+++ browser_plugin/trunk/src/Makefile.am	2008-02-16 16:15:08 UTC (rev 3476)
@@ -17,11 +17,9 @@
 			-g $(SSE2_CFLAGS) -Wno-strict-aliasing $(OGGZ_CFLAGS) \
 			$(IMLIB2_CFLAGS) $(OGGPLAY_CFLAGS) -Wdeclaration-after-statement
 
-XPIDL=/usr/lib/firefox/xpidl
-XPIDL_INCLUDE=-I/usr/share/idl/firefox
-XPTLINK=/usr/lib/firefox/xpt_link
-INCLUDES=-I/usr/include/firefox/plugin -I/usr/include/firefox -I/usr/include/firefox/xpcom -I/usr/include/firefox/string -I/usr/include/firefox/java -I/usr/include/firefox/nspr -I/usr/include/nspr -I$(srcdir)/include -I$(srcdir)/support -I$(srcdir)/audio -I$(top_srcdir)/include `pkg-config --cflags gtk+-2.0`
 
+INCLUDES=-I$(srcdir)/include -I$(srcdir)/support -I$(srcdir)/audio @GTK_CFLAGS@ @FIREFOX_CFLAGS@
+
 OGGPLAY_STATICLIBS = $(LIBDIR)/liboggplay.a $(LIBDIR)/liboggz.a $(LIBDIR)/libtheora.a $(LIBDIR)/libfishsound.a $(LIBDIR)/libvorbis.a $(LIBDIR)/libvorbisenc.a $(LIBDIR)/libspeex.a $(LIBDIR)/libogg.a $(LIBDIR)/libImlib2.a
 
 plugin_libs=libnpoggplugin.la  libnpoggplugin_dynamic.la