[Gnash-commit] gnash macros/firefox.m4 ./configure.ac

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/02/13 19:57:34

Modified files:
        macros         : firefox.m4 
        .              : configure.ac 

Log message:
        * macros/firefox.m4: Set FIREFOX_PLUGINS correctly at the proper
        time. Add another pattern to the sed rule to munge the path.
        * configure.ac: Print out where the plugin will get installed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/firefox.m4.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.36&tr2=1.37&r1=text&r2=text

Patches:
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.36 gnash/configure.ac:1.37
--- gnash/configure.ac:1.36     Mon Feb 13 17:48:28 2006
+++ gnash/configure.ac  Mon Feb 13 19:57:34 2006
@@ -390,6 +390,7 @@
   if test x"$FIREFOX_CFLAGS" != x; then
     echo "        Firefox flags are: $FIREFOX_CFLAGS"
     echo "        Firefox libs are: $FIREFOX_LIBS"
+    echo "        Plugin will be installed in ${FIREFOX_PLUGINS}"
   else
     echo "ERROR: No Firefox or Mozilla development package installed!"
     nogo=true
@@ -412,11 +413,11 @@
 
 if test x"$docbook" = x"yes"; then
   if test x"$DB2X_XSLTPROC" = x -o x"$DB2X_TEXIXML" = x -o x"$MAKEINFO" = x -o 
x"$XSLTPROC" = x; then
-    echo "ERROR: No DocBook tools installed!\
+    echo "ERROR: No DocBook2X tools installed!\
  docbook, docbook-xml, docbook2Xm docbook-utils, docbook-xsl (using apt-get or 
yum)."
     nogo=true
   else
-    echo "        You have all the DocBook tools installed."
+    echo "        You have all the DocBook2X tools installed."
     echo "        You have version $db2x_version of the DocBook2X tools."
 
   fi
Index: gnash/macros/firefox.m4
diff -u gnash/macros/firefox.m4:1.9 gnash/macros/firefox.m4:1.10
--- gnash/macros/firefox.m4:1.9 Thu Feb  9 02:33:53 2006
+++ gnash/macros/firefox.m4     Mon Feb 13 19:57:34 2006
@@ -41,7 +41,7 @@
 AC_ARG_WITH(firefox-includes,[  --with-firefox-includes=DIR   Directory where 
firefox header files are installed (optional)], 
   [firefox_includes=$withval], [firefox_includes=""])
 AC_ARG_WITH(plugin-dir, [  --with-plugin-dir=DIR        Mozilla plugin dir],
-  [FIREFOX_PLUGINS=$withval], [FIREFOX_PLUGINS="${libdir}/mozilla/plugins/"])
+  [FIREFOX_PLUGINS=$withval])
  
   if test "x${firefox_libraries}" != "x" ; then
     FIREFOX_LIBS="-L$firefox_libraries"
@@ -82,8 +82,8 @@
     if test "x${FIREFOX_LIBS}" != "x" ; then
       FIREFOX_DEFS=`${mconfig} --defines java plugin`
 dnl   if we don't have a path for the plugin by now, pick a default one
-      if test x"${FIREFOX_PLUGINS}" != "x" ; then
-        FIREFOX_PLUGINS=`echo ${FIREFOX_LIBS} | sed -e 's:-L::'`/plugins
+      if test x"${FIREFOX_PLUGINS}" = "x" ; then
+       FIREFOX_PLUGINS=`echo ${FIREFOX_LIBS} | sed -e 's:-L\(@<:@^ @:>@*\) 
.*$:\1:' -e  's:^-L::'`/plugins
       fi
     fi
   fi