[xiph-commits] r3605 - browser_plugin/trunk

[conrad at svn.annodex.net]

Author: conrad
Date: 2008-06-02 05:45:51 -0700 (Mon, 02 Jun 2008)
New Revision: 3605

Modified:
   browser_plugin/trunk/configure.ac
Log:
add configure flags to allow building against a prebuilt Gecko SDK.
Patch by ogg.k.ogg.k


Modified: browser_plugin/trunk/configure.ac
===================================================================
--- browser_plugin/trunk/configure.ac	2008-06-02 10:07:14 UTC (rev 3604)
+++ browser_plugin/trunk/configure.ac	2008-06-02 12:45:51 UTC (rev 3605)
@@ -66,7 +66,16 @@
 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_ARG_WITH(gecko-sdk,
+	AC_HELP_STRING([--with-gecko-sdk=SOURCE_DIR],
+		       [Path to Gecko sdk tree]))
+
+if test "x$with_gecko_sdk" != x -a "x$with_gecko_sdk" != xyes -a "x$with_gecko_sdk" != xno ; then
+  FIREFOX_LIBS="-L$with_gecko_sdk/lib"
+  FIREFOX_CFLAGS="-I$with_gecko_sdk/include"
+else
+  PKG_CHECK_MODULES(FIREFOX, firefox-plugin firefox-xpcom firefox-nspr firefox-nss nspr nss)
+fi
 AC_SUBST(FIREFOX_LIBS)
 AC_SUBST(FIREFOX_CFLAGS)
 
@@ -77,7 +86,11 @@
 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
+  if test "x$with_gecko_sdk" != x -a "x$with_gecko_sdk" != xyes -a "x$with_gecko_sdk" != xno ; then
+    XPIDL="$with_gecko_sdk/bin/xpidl"
+  else
+    XPIDL=/usr/lib/firefox/xpidl
+  fi
 fi
 
 AC_ARG_WITH(xpidl_include,
@@ -87,7 +100,11 @@
 if test "x$with_xpidl_include" != x -a "x$with_xpidl_include" != xyes -a "x$with_xpidl_include" != xno ; then
   XPIDL_INCLUDE=-I"$with_xpidl_include"
 else
-  XPIDL_INCLUDE=-I/usr/share/idl/firefox
+  if test "x$with_gecko_sdk" != x -a "x$with_gecko_sdk" != xyes -a "x$with_gecko_sdk" != xno ; then
+    XPIDL_INCLUDE=-I"$with_gecko_sdk/idl"
+  else
+    XPIDL_INCLUDE=-I/usr/share/idl/firefox
+  fi
 fi
 AC_SUBST(XPIDL)
 AC_SUBST(XPIDL_INCLUDE)