[Gnash-commit] /srv/bzr/gnash/trunk r11811: if installing in the system location, use a default path is no browser is installed at all.

[Rob Savoye]

------------------------------------------------------------
revno: 11811
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Wed 2010-01-27 13:14:08 -0700
message:
  if installing in the system location, use a default path is no browser is 
installed at all.
modified:
  macros/firefox.m4

=== modified file 'macros/firefox.m4'
--- a/macros/firefox.m4 2010-01-01 17:48:26 +0000
+++ b/macros/firefox.m4 2010-01-27 20:14:08 +0000
@@ -60,14 +60,15 @@
 
        elif test "x${NPAPI_INSTALL_POLICY}" = "xsystem"; then
 
-          for dir in /usr/lib64/mozilla/plugins /usr/lib/mozilla/plugins 
/usr/lib64/firefox/plugins /usr/lib/firefox/plugins 
/usr/lib64/iceweasel/plugins /usr/lib/iceweasel/plugins ; do
+          for dir in /usr/lib64/mozilla/plugins /usr/lib/mozilla/plugins 
/usr/lib64/firefox/plugins /usr/lib/firefox/plugins 
/usr/lib/mozilla-firefox/plugins /usr/lib64/iceweasel/plugins 
/usr/lib/iceweasel/plugins ; do
              if test -d $dir; then
                 FIREFOX_PLUGINS=$dir
                 break
              fi
           done
           if test "x${FIREFOX_PLUGINS}" = x; then
-             AC_MSG_ERROR([Could not find system mozilla plugin dir, use 
--with-npapi-plugindir.]);
+             FIREFOX_PLUGINS=/usr/lib/mozilla/plugins
+             AC_MSG_WARN([Could not find system mozilla plugin dir, use 
--with-npapi-plugindir. Defaulting to ${FIREFOX_PLUGINS}]);
           fi
 
        elif test "x${NPAPI_INSTALL_POLICY}" = "xprefix"; then