[Gnash-commit] gnash configure.ac ChangeLog gui/Makefile.am ma...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    07/01/26 19:41:41

Modified files:
        .              : configure.ac ChangeLog 
        gui            : Makefile.am 
        macros         : firefox.m4 x11.m4 
        plugin         : Makefile.am plugin.cpp 

Log message:
                * configure.ac: Look for libexpat too to resolve a stupid 
library
                dependency on some systems.
                * gui/Makefile.am: Add EXPAT_LIBS for GTK builds. Add XFT and 
X11
                libs for FLTK2 builds
                * macros/x11.m4: New file for X11. The default one from aclocal
                doesn't support cross configuration very well, so now we have 
our
                own. Also look for Xinerama to keep Debian Etch happy.
                * macros/firefox.m4: Add an --with-gnashexe to specify an 
optional
                path to find the gnash executable if it's not in $prefix/bin.
                * plugin/Makefile.am: 
                * plugin/plugin.cpp: Use GNASHBINDIR instead of PREFIX to be 
clearer.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.239&r2=1.240
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2182&r2=1.2183
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/firefox.m4?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/x11.m4?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/Makefile.am?cvsroot=gnash&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&r1=1.70&r2=1.71

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -b -r1.239 -r1.240
--- configure.ac        25 Jan 2007 21:25:37 -0000      1.239
+++ configure.ac        26 Jan 2007 19:41:41 -0000      1.240
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.239 2007/01/25 21:25:37 martinwguy Exp $
+dnl $Id: configure.ac,v 1.240 2007/01/26 19:41:41 rsavoye Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -586,6 +586,11 @@
   GNASH_PKG_FIND(Xft, [Xft.h], [xft library], XftGlyphRender)
 fi
 
+dnl Some systems have a pervered set of dependencies. Although Gnash itself 
uses libXML,
+dnl Fedora Core 6 appears to have a dependency on expat for fontconfig. We 
only need the
+dnl library, but this is the easy wind to find it.
+GNASH_PKG_FIND(expat, [expat.h], [Expat library], XML_ErrorString)
+
 dnl these conditionals were moved out of kde.m4
 AM_CONDITIONAL(HAS_KDE, [test x$kde = xyes])
 # used to disable x11-specific stuff on special platforms

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2182
retrieving revision 1.2183
diff -u -b -r1.2182 -r1.2183
--- ChangeLog   26 Jan 2007 13:31:30 -0000      1.2182
+++ ChangeLog   26 Jan 2007 19:41:41 -0000      1.2183
@@ -1,3 +1,17 @@
+2007-01-26  Rob Savoye  <address@hidden>
+
+       * configure.ac: Look for libexpat too to resolve a stupid library
+       dependency on some systems.
+       * gui/Makefile.am: Add EXPAT_LIBS for GTK builds. Add XFT and X11
+       libs for FLTK2 builds
+       * macros/x11.m4: New file for X11. The default one from aclocal
+       doesn't support cross configuration very well, so now we have our
+       own. Also look for Xinerama to keep Debian Etch happy.
+       * macros/firefox.m4: Add an --with-gnashexe to specify an optional
+       path to find the gnash executable if it's not in $prefix/bin.
+       * plugin/Makefile.am: 
+       * plugin/plugin.cpp: Use GNASHBINDIR instead of PREFIX to be clearer.
+
 2007-01-25 Sandro Santilli <address@hidden>
 
        * backend/render_handler.h (Detection of regions update page):

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- gui/Makefile.am     21 Jan 2007 22:41:02 -0000      1.58
+++ gui/Makefile.am     26 Jan 2007 19:41:41 -0000      1.59
@@ -17,7 +17,7 @@
 
 # 
 
-# $Id: Makefile.am,v 1.58 2007/01/21 22:41:02 rsavoye Exp $
+# $Id: Makefile.am,v 1.59 2007/01/26 19:41:41 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -49,7 +49,8 @@
        $(CAIRO_LIBS) \
        $(PANGO_LIBS) \
        $(ATK_LIBS) \
-       $(GLIB_LIBS)
+       $(GLIB_LIBS) \
+       $(EXPAT_LIBS)
 #        $(PNG_CFLAGS) \
 #        $(JPEG_CFLAGS) \
 #        $(MP3_CFLAGS) \
@@ -169,7 +170,7 @@
 if USE_GUI_FLTK
  FLTK_SRCS = fltk.cpp fltksup.h $(FLTK_AGG_SRCS) $(FLTK_CAIRO_SRCS)
  AM_CPPFLAGS += $(FLTK2_CFLAGS) 
- AM_LDFLAGS += $(FLTK2_LIBS)
+ AM_LDFLAGS += $(FLTK2_LIBS) $(XFT_LIBS) $(X11_LIBS)
 else
  FLTK_SRCS = 
 endif

Index: macros/firefox.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/firefox.m4,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- macros/firefox.m4   9 Jan 2007 00:43:43 -0000       1.20
+++ macros/firefox.m4   26 Jan 2007 19:41:41 -0000      1.21
@@ -33,14 +33,28 @@
 dnl     *)   AC_MSG_ERROR([bad value ${enableval} for disable-plugin option]) 
;;
 dnl   esac], plugin=yes)
 
+  FIREFOX_PLUGINS=""
+  GNASHEXE=""
   if test x"${plugin}" = x"yes"; then
 
-    FIREFOX_PLUGINS=""
     AC_ARG_WITH(plugindir, AC_HELP_STRING([--with-plugindir=DIR], [Directory 
to install Firefox plugin in]),
       [FIREFOX_PLUGINS=$withval]
     )
 
-dnl Always install the plugin in the users home directory.
+    dnl Allow setting a path for the Gnash executable to be different from the 
prefix. This
+    dnl is mostly only used for cross compiling.
+    AC_ARG_WITH(gnashexe, AC_HELP_STRING([--with-gnashexe=DIR], [Directory to 
where the gnash executable is]),
+      [gnashbindir=$withval]
+    )
+
+    dnl default to the prefix if no path is specified. As $prefix isn't set at 
this time by
+    dnl configure, we set this to the variable itself so it gets resolved at 
make time.
+    if test x"${gnashbindir}" = "x" ; then
+      GNASHEXE="\${prefix}/bin"
+    else
+      GNASHEXE=${gnashbindir}
+    fi
+    dnl Always install the plugin in the users home directory.
     if test x"${FIREFOX_PLUGINS}" = "x" ; then
       if test -d $HOME/.mozilla/plugins; then
         FIREFOX_PLUGINS=$HOME/.mozilla/plugins
@@ -50,6 +64,7 @@
     fi
   fi
 
+  AC_SUBST(GNASHEXE)
   AC_SUBST(FIREFOX_PLUGINS)
 
 ])dnl end of GNASH_PATH_FIREFOX

Index: macros/x11.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/x11.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- macros/x11.m4       26 Jan 2007 05:15:59 -0000      1.2
+++ macros/x11.m4       26 Jan 2007 19:41:41 -0000      1.3
@@ -15,11 +15,11 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-dnl $Id: x11.m4,v 1.2 2007/01/26 05:15:59 rsavoye Exp $
+dnl $Id: x11.m4,v 1.3 2007/01/26 19:41:41 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_X11],
 [
-  AC_ARG_ENABLE(x11, AC_HELP_STRING([--enable-x11], [Enable support for x11 
images]),
+  AC_ARG_ENABLE(x11, AC_HELP_STRING([--disable-x11], [Disable support for 
X11]),
   [case "${enableval}" in
     yes) x11=yes ;;
     no)  x11=no ;;
@@ -28,7 +28,7 @@
 
   if test x"$x11" = x"yes"; then
   dnl Look for the header
-    AC_ARG_WITH(x11_incl, AC_HELP_STRING([--with-x11-incl], [Directory where 
libx11 header is]), with_x11_incl=${withval})
+    AC_ARG_WITH(x11_incl, AC_HELP_STRING([--with-x11-incl], [Directory where 
x11 header is]), with_x11_incl=${withval})
     AC_CACHE_VAL(ac_cv_path_x11_incl, [
       if test x"${with_x11_incl}" != x ; then
         if test -f ${with_x11_incl}/X11/X.h ; then
@@ -41,7 +41,7 @@
 
     dnl If the path hasn't been specified, go look for it.
     if test x"${ac_cv_path_x11_incl}" = x; then
-      AC_MSG_CHECKING([for libx11 headers])
+      AC_MSG_CHECKING([for X11 headers])
       for i in $incllist; do
        if test -f $i/X11/X.h; then
          if test x"$i" != x"/usr/include"; then
@@ -82,14 +82,17 @@
 
     dnl If the header doesn't exist, there is no point looking for the library.
     if test x"${ac_cv_path_x11_incl}" = x; then
-      AC_MSG_CHECKING([for libx11 library])
+      AC_MSG_CHECKING([for X11 library])
       for i in $libslist; do
              if test -f $i/libX11.a -o -f $i/libX11.so; then
+          if test -f $i/libXinerama.a -o -f $i/libXinerama.so; then
+            ac_cv_path_x11_lib="-lXinerama"
+          fi
                if test x"$i" != x"/usr/lib"; then
-                 ac_cv_path_x11_lib="-L$i"
+                 ac_cv_path_x11_lib="-L$i -lX11 ${ac_cv_path_x11_lib}"
                  break
           else
-                 ac_cv_path_x11_lib=""
+                 ac_cv_path_x11_lib="-lX11 ${ac_cv_path_x11_lib}"
                  break
                fi
           AC_MSG_RESULT(yes)
@@ -98,7 +101,7 @@
     fi
 
     if test x"${ac_cv_path_x11_lib}" = x; then
-      AC_CHECK_LIB(x11, x11_mem_init, [ac_cv_path_x11_lib=""])
+      AC_CHECK_LIB(X11, x11_mem_init, [ac_cv_path_x11_lib=""])
       AC_MSG_RESULT(${ac_cv_path_x11_lib})
     fi
 
@@ -110,7 +113,7 @@
   fi
 
   if test x"${ac_cv_path_x11_lib}" != x ; then
-      X11_LIBS="${ac_cv_path_x11_lib} -lx11"
+      X11_LIBS="${ac_cv_path_x11_lib}"
   else
       X11_LIBS="-lX11"
   fi

Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- plugin/Makefile.am  25 Jan 2007 17:20:36 -0000      1.56
+++ plugin/Makefile.am  26 Jan 2007 19:41:41 -0000      1.57
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.56 2007/01/25 17:20:36 rsavoye Exp $
+# $Id: Makefile.am,v 1.57 2007/01/26 19:41:41 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -34,7 +34,7 @@
 # XP_UNIX      This needs to get defined for npapi.h on unix platforms.
 # PLUGIN_TRACE Enable this define to get debug prints whenever the plugin
 #              api gets control.
-AM_CPPFLAGS = -DPLUGIN_TRACE -DXP_UNIX -DMOZ_X11 -DPREFIX=\""${prefix}"\" \
+AM_CPPFLAGS = -DPLUGIN_TRACE -DXP_UNIX -DMOZ_X11 -DGNASHBINDIR=\"$(GNASHEXE)" \
         -I.. \
         -I$(srcdir) \
         -I$(top_srcdir)/server \

Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- plugin/plugin.cpp   6 Dec 2006 10:58:34 -0000       1.70
+++ plugin/plugin.cpp   26 Jan 2007 19:41:41 -0000      1.71
@@ -14,10 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-// 
-//
-
-/* $Id: plugin.cpp,v 1.70 2006/12/06 10:58:34 strk Exp $ */
+/* $Id: plugin.cpp,v 1.71 2007/01/26 19:41:41 rsavoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -472,8 +469,8 @@
     string procname;
     char *gnash_env = getenv("GNASH_PLAYER");
     if (!gnash_env) {
-      procname = PREFIX;
-      procname += "/bin/gnash";
+      procname = GNASHBINDIR;
+      procname += "/gnash";
     } else {
       procname = gnash_env;
     }