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

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/04/05 15:50:27

Modified files:
        .              : ChangeLog configure.ac 
        macros         : firefox.m4 libXML.m4 opengl.m4 

Log message:
        * configure.ac: Fix --disable-xml option.
        * macros/firefox.m4: Don't use the mozilla or firefox config
        script to get the path to install the plugin. Check the users
        home directory and install there in the plugins directory.
        * macros/libXML.m4: Don't do anything if XML support is disabled.
        * macros/opengl.m4: Adjust how the libray path gets set so we
        don't wind up with a path with no -L option.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.203&tr2=1.204&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/firefox.m4.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/libXML.m4.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/opengl.m4.diff?tr1=1.15&tr2=1.16&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.203 gnash/ChangeLog:1.204
--- gnash/ChangeLog:1.203       Wed Apr  5 05:40:17 2006
+++ gnash/ChangeLog     Wed Apr  5 15:50:27 2006
@@ -1,3 +1,21 @@
+2006-04-05  Rob Savoye  <address@hidden>
+
+       * configure.ac: Fix --disable-xml option.
+       * macros/firefox.m4: Don't use the mozilla or firefox config
+       script to get the path to install the plugin. Check the users
+       home directory and install there in the plugins directory.
+       * macros/libXML.m4: Don't do anything if XML support is disabled.
+       * macros/opengl.m4: Adjust how the libray path gets set so we
+       don't wind up with a path with no -L option.
+
+2006-04-04  Rob Savoye  <address@hidden>
+
+       * backend/Makefile.am: Don't use ../backend in the path to
+       libgnashbackend.la, as it causes problems with parallel
+       builds using -j.
+
+       * macros/libXML.m4: Don't configure XML if it's disabled.
+
 2006-04-04  John Gilmore  <address@hidden>
 
        * README:  Add more basic information.  Thank contributors.
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.56 gnash/configure.ac:1.57
--- gnash/configure.ac:1.56     Fri Mar 31 17:37:18 2006
+++ gnash/configure.ac  Wed Apr  5 15:50:27 2006
@@ -75,7 +75,7 @@
 fi
 
 dnl Add XML support, if specified.
-AC_ARG_ENABLE(libxml, [  --disable-xml           Disable support for xml and 
xmlsocket],
+AC_ARG_ENABLE(xml, [  --disable-xml           Disable support for XML and 
XMLSocket],
 [case "${enableval}" in
   yes) xml=yes ;;
   no)  xml=no ;;
Index: gnash/macros/firefox.m4
diff -u gnash/macros/firefox.m4:1.14 gnash/macros/firefox.m4:1.15
--- gnash/macros/firefox.m4:1.14        Wed Mar 29 05:42:41 2006
+++ gnash/macros/firefox.m4     Wed Apr  5 15:50:27 2006
@@ -58,45 +58,18 @@
       [FIREFOX_PLUGINS=$withval]
     )
 
+dnl Always install the plugin in the users home directory.
     if test x"${FIREFOX_PLUGINS}" = "x" ; then
-      dnl this is the path to where the plugin gets installed
-      AC_CHECK_PROG(mconfig, firefox-config, firefox-config)
-
-      if test x"${mconfig}" = "x" ; then
-        AC_CHECK_PROG(mconfig, mozilla-config, mozilla-config)
-      fi
-
-      if test x"${mconfig}" != "x" ; then
-        plugindir=`${mconfig} --libs plugin`
-        FIREFOX_PLUGINS=`echo ${plugindir} | sed -e 's:-L\(@<:@^ @:>@*\) 
.*$:\1:' -e  's:^-L::'`/plugins
-      fi
-    fi
-
-    if test x"${FIREFOX_PLUGINS}" = "x" ; then
-      AC_MSG_CHECKING([for path to install plugin])
-      dirlist="${prefix}/usr/lib64 /usr/lib64 /usr/lib /sw/lib /usr/local/lib 
/opt/lib /usr/pkg/lib /usr/X11R6/lib"
-      for i in $dirlist; do
-        if test -f $i/firefox/libnullplugin.so; then
-         FIREFOX_PLUGINS=$i/firefox/plugins
-         break
-        else
-         if test -f $i/mozilla/libnullplugin.so; then
-           FIREFOX_PLUGINS=$i/mozilla/plugins
-           break
-          fi
-        fi
-      done
-      if test x"${FIREFOX_PLUGINS}" = "x"; then
-        AC_MSG_RESULT(no)
-        AC_MSG_WARN([no path was found for the plugin installation! ])
+      if test -d $HOME/.mozilla/plugins; then
         FIREFOX_PLUGINS=$HOME/.mozilla/plugins
       else
-        AC_MSG_RESULT(yes)
+        FIREFOX_PLUGINS=$HOME/.firefox/plugins
       fi
     fi
   fi
 
   AC_SUBST(FIREFOX_PLUGINS)
+
 ])dnl end of GNASH_PATH_FIREFOX
 
 dnl This is the old version which we're keeping around for now. It
Index: gnash/macros/libXML.m4
diff -u gnash/macros/libXML.m4:1.14 gnash/macros/libXML.m4:1.15
--- gnash/macros/libXML.m4:1.14 Thu Mar  9 19:29:06 2006
+++ gnash/macros/libXML.m4      Wed Apr  5 15:50:27 2006
@@ -57,6 +57,7 @@
     LIBXML_CFLAGS="-I$libxml_prefix/include"
   fi
 
+  if test x"${xml}" = x"yes"; then
   dnl
   dnl Give xml2-config a chance
   dnl
@@ -100,6 +101,10 @@
       fi
     done
   fi
+  else
+    LIBXML_CFLAGS=
+    LIBXML_LIBS=
+  fi
 
   if test "x$LIBXML_CFLAGS" != "x" -a  "x$LIBXML_LIBS" != "x"; then
     AC_MSG_RESULT(yes)
Index: gnash/macros/opengl.m4
diff -u gnash/macros/opengl.m4:1.15 gnash/macros/opengl.m4:1.16
--- gnash/macros/opengl.m4:1.15 Tue Apr  4 20:42:56 2006
+++ gnash/macros/opengl.m4      Wed Apr  5 15:50:27 2006
@@ -117,13 +117,16 @@
             if test x"$i" != x"/usr/lib"; then
               ac_cv_path_opengl_lib="-L$i -lGL -lGLU"
               break
-            else
-            if test -f $i/libopengl32.a; then
-              ac_cv_path_opengl_lib="-L$i -lopengl32 -lglu32"
-              break
-            fi
-              break
-            fi
+           else
+              ac_cv_path_opengl_lib="-lGL -lGLU"
+           fi
+          else
+           if test -f $i/libopengl32.a; then
+             ac_cv_path_opengl_lib="-L$i -lopengl32 -lglu32"
+             break
+           else
+             ac_cv_path_opengl_lib="-lopengl32 -lglu32"
+           fi
           fi
         done])
     else