gnash-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gnash-commit] gnash ChangeLog server/Makefile.am server/actio...


From: Rob Savoye
Subject: [Gnash-commit] gnash ChangeLog server/Makefile.am server/actio...
Date: Wed, 09 Aug 2006 01:59:07 +0000

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    06/08/09 01:59:07

Modified files:
        .              : ChangeLog 
        server         : Makefile.am action_buffer.cpp as_object.h 
                         movie_def_impl.h sprite_instance.cpp 
        server/asobj   : Global.cpp Makefile.am Math.cpp 
                         NetConnection.cpp 
        macros         : atk.m4 curl.m4 glib.m4 gtk2.m4 jpeg.m4 
                         libXML.m4 mad.m4 pango.m4 sdl.m4 

Log message:
                * macros/atk.m4, curl.m4, glib.m4, gtk2.m4, jpeg.m4, libXML.m4,
                mad.m4, pango.m4, sdl.m4: Add /opt/local,{include,lib}, which is
                the path used by Darwin Ports.
                * server/as_object.h: Add math.h for Darwin.
                * server/movie_def_impl.h: Use %zu to print a size_t.
                * server/sprite_instance.cpp: Add math.h for Darwin.
                * server/asobj/Global.cpp: Include GMath.h now.
                * server/asobj/Makefile.am: Renameed Math.h to Gmath.h.
                * server/asobj/Math.cpp: Include GMath.h now.
                * server/asobj/NetConnection.cpp: Removed lines 49-48.
                * server/asobj/Math.h: Renamed to Gmath.h to avoid a name
                collision on Darwin.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.608&r2=1.609
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/gnash/server/action_buffer.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_def_impl.h?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Global.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Makefile.am?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Math.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetConnection.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/atk.m4?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/curl.m4?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/glib.m4?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtk2.m4?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/jpeg.m4?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/libXML.m4?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/mad.m4?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pango.m4?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/sdl.m4?cvsroot=gnash&r1=1.19&r2=1.20

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.608
retrieving revision 1.609
diff -u -b -r1.608 -r1.609
--- ChangeLog   8 Aug 2006 14:14:57 -0000       1.608
+++ ChangeLog   9 Aug 2006 01:59:06 -0000       1.609
@@ -1,3 +1,18 @@
+2006-08-08  Rob Savoye  <address@hidden>
+
+       * macros/atk.m4, curl.m4, glib.m4, gtk2.m4, jpeg.m4, libXML.m4,
+       mad.m4, pango.m4, sdl.m4: Add /opt/local,{include,lib}, which is
+       the path used by Darwin Ports.
+       * server/as_object.h: Add math.h for Darwin.
+       * server/movie_def_impl.h: Use %zu to print a size_t.
+       * server/sprite_instance.cpp: Add math.h for Darwin.
+       * server/asobj/Global.cpp: Include GMath.h now.
+       * server/asobj/Makefile.am: Renameed Math.h to Gmath.h.
+       * server/asobj/Math.cpp: Include GMath.h now.
+       * server/asobj/NetConnection.cpp: Removed lines 49-48.
+       * server/asobj/Math.h: Renamed to Gmath.h to avoid a name
+       collision on Darwin.
+
 2006-08-08 Vitaly Alexeev <address@hidden>
 
        * gui\gnash.cpp: ported to win32

Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- server/Makefile.am  31 Jul 2006 21:49:43 -0000      1.54
+++ server/Makefile.am  9 Aug 2006 01:59:06 -0000       1.55
@@ -184,8 +184,9 @@
 
 libgnashserver_la_LIBADD = \
        $(ZLIB_LIBS) \
-       $(LIBXML_LIBS) 
-#      $(OPENGL_LIBS)
+       $(LIBXML_LIBS) \
+       $(LIBXML_LIBS) \
+       $(OPENGL_LIBS)
 
 #libserver_la_LDFLAGS = -module -avoid-version -no-undefined
 #libserver_la_LIBDADD =  address@hidden@  # $(LIBLTDL)

Index: server/action_buffer.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/action_buffer.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/action_buffer.cpp    8 Aug 2006 10:51:36 -0000       1.13
+++ server/action_buffer.cpp    9 Aug 2006 01:59:06 -0000       1.14
@@ -237,7 +237,7 @@
        int length = instruction_data[1] | (instruction_data[2] << 8);
        if (fmt == ARG_HEX) {
            for (int i = 0; i < length; i++) {
-               hexify(num, (const unsigned char *)&instruction_data[3 + i], 1);
+               hexify(num, (const unsigned char *)&instruction_data[3 + i], 1, 
false);
                dbglogfile << "0x" << num << " ";
 //             dbglogfile << instruction_data[3 + i] << " ";
            }

Index: server/as_object.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/as_object.h  7 Jul 2006 23:29:51 -0000       1.5
+++ server/as_object.h  9 Aug 2006 01:59:06 -0000       1.6
@@ -42,6 +42,7 @@
 #include "config.h"
 #endif
 
+#include <math.h>
 #include "container.h"
 //#include "resource.h" // for inheritance 
 #include "ref_counted.h" // for inheritance 

Index: server/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_def_impl.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/movie_def_impl.h     7 Aug 2006 20:43:38 -0000       1.16
+++ server/movie_def_impl.h     9 Aug 2006 01:59:06 -0000       1.17
@@ -264,7 +264,7 @@
 #else
                uint32 ret = m_file_length;
 #endif
-               log_msg("get_bytes_loaded returning %u (loaded frame: %u/%u)",
+               log_msg("get_bytes_loaded returning %u (loaded frame: %zu/%zu)",
                        ret, m_loading_frame, m_frame_count);
                return ret;
        }

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- server/sprite_instance.cpp  7 Aug 2006 20:43:38 -0000       1.30
+++ server/sprite_instance.cpp  9 Aug 2006 01:59:06 -0000       1.31
@@ -50,7 +50,7 @@
 
 #include <vector>
 #include <string>
-#include <cmath>
+#include <math.h>
 
 #include "log.h" 
 //#include "action.h" 

Index: server/asobj/Global.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Global.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/Global.cpp     22 Jul 2006 23:47:56 -0000      1.1
+++ server/asobj/Global.cpp     9 Aug 2006 01:59:07 -0000       1.2
@@ -34,7 +34,7 @@
 #include "LoadVars.h"
 #include "LocalConnection.h"
 #include "Microphone.h"
-#include "Math.h"
+#include "GMath.h"
 #include "Mouse.h"
 #include "MovieClipLoader.h"
 #include "MovieClip.h" 
@@ -60,6 +60,7 @@
 #endif
 
 #include <iostream>
+
 using namespace std;
 
 namespace gnash {
@@ -563,6 +564,4 @@
        system_init(this);
 }
 
-
-
 } // namespace gnash

Index: server/asobj/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/asobj/Makefile.am    1 Aug 2006 16:57:36 -0000       1.2
+++ server/asobj/Makefile.am    9 Aug 2006 01:59:07 -0000       1.3
@@ -73,12 +73,12 @@
        CustomActions.cpp\
        Date.cpp        \
        Error.cpp       \
+       Math.cpp        \
        Global.cpp      \
        Key.cpp         \
        LoadVars.cpp    \
        LocalConnection.cpp\
        Microphone.cpp  \
-       Math.cpp        \
        Mouse.cpp       \
         MovieClipLoader.cpp\
        NetConnection.cpp\
@@ -104,7 +104,7 @@
        LoadVars.h      \
        LocalConnection.h\
        Microphone.h    \
-       Math.h          \
+       GMath.h         \
        Mouse.h         \
        MovieClipLoader.h \
        NetConnection.h \

Index: server/asobj/Math.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Math.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/asobj/Math.cpp       27 Jul 2006 01:47:11 -0000      1.2
+++ server/asobj/Math.cpp       9 Aug 2006 01:59:07 -0000       1.3
@@ -20,10 +20,11 @@
 #include "config.h"
 #endif
 
-#include "log.h"
-#include "Math.h"
+#include <math.h>
+#include "GMath.h"
 #include "tu_random.h"
 #include "fn_call.h"
+#include "log.h"
 
 namespace gnash {
 
@@ -142,7 +143,8 @@
     log_msg("%s:unimplemented \n", __FUNCTION__);
 }
 
-void math_init(as_object* s_global)
+void
+math_init(as_object* s_global)
 {
     // Create built-in math object.
     as_object* math_obj = new math_as_object;

Index: server/asobj/NetConnection.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetConnection.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/asobj/NetConnection.cpp      7 Aug 2006 17:42:48 -0000       1.4
+++ server/asobj/NetConnection.cpp      9 Aug 2006 01:59:07 -0000       1.5
@@ -49,7 +49,6 @@
 
 using namespace std;
 using namespace amf;
-using namespace rtmp;
 
 namespace gnash {
 

Index: macros/atk.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/atk.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- macros/atk.m4       24 May 2006 11:26:04 -0000      1.8
+++ macros/atk.m4       9 Aug 2006 01:59:07 -0000       1.9
@@ -54,7 +54,7 @@
   dnl doesn't seem to get a directory that is unversioned.
   if test x"${ac_cv_path_atk_incl}" = x; then
     AC_MSG_CHECKING([for the Atk Version])
-    pathlist="${prefix}/include /sw/include /usr/local/include 
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
+    pathlist="${prefix}/include /sw/include /opt/local/include 
/usr/local/include /home/latest/include /opt/include /usr/include 
/usr/pkg/include .. ../.."
 
     gnash_atk_topdir=""
     gnash_atk_version=""
@@ -80,7 +80,7 @@
     AC_CHECK_HEADERS(atk/atkgl.h, [ac_cv_path_atk_incl=""],[
     if test x"${ac_cv_path_atk_incl}" = x; then
       AC_MSG_CHECKING([for libatk header])
-      incllist="/sw/include /usr/local/include /home/latest/include 
/usr/X11R6/include /opt/include /usr/include /usr/pkg/include .. ../.."
+      incllist="/sw/include /usr/local/include /opt/local/include 
/home/latest/include /usr/X11R6/include /opt/include /usr/include 
/usr/pkg/include .. ../.."
 
       for i in $incllist; do
         if test -f $i/atk/atk.h; then
@@ -119,7 +119,7 @@
   if test x"${ac_cv_path_atk_incl}" != x; then
     AC_CHECK_LIB(atk-${gnash_atk_version}, atk_focus_tracker_init, 
[ac_cv_path_atk_lib="-latk-${gnash_atk_version}"],[
       AC_MSG_CHECKING([for libatk library])
-      libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib 
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+      libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib 
/opt/local/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. 
../.."
       for i in $libslist; do
         if test -f $i/libatk-${gnash_atk_version}.a -o -f 
$i/libatk-${gnash_atk_version}.so; then
           if test x"$i" != x"/usr/lib"; then

Index: macros/curl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/curl.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- macros/curl.m4      12 May 2006 22:17:29 -0000      1.1
+++ macros/curl.m4      9 Aug 2006 01:59:07 -0000       1.2
@@ -54,7 +54,7 @@
     AC_CHECK_HEADERS(curl/curl.h, [ac_cv_path_curl_incl=""],[
       if test x"${ac_cv_path_curl_incl}" = x; then
         AC_MSG_CHECKING([for libcurl header])
-        incllist="/sw/include /usr/local/include /home/latest/include 
/opt/include /usr/include /usr/pkg/include .. ../.."
+        incllist="/sw/include /usr/local/include /opt/local/include 
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
 
         for i in $incllist; do
    if test -f $i/curl/curl.h; then
@@ -93,7 +93,7 @@
   if test x"${ac_cv_path_curl_lib}" = x; then 
     AC_CHECK_LIB(curl, curl_global_init, [ac_cv_path_curl_lib="-lcurl"],[
       AC_MSG_CHECKING([for libcurl library])
-      libslist="/usr/lib64 /usr/lib /sw/lib /usr/local/lib /home/latest/lib 
/opt/lib /usr/pkg/lib .. ../.."
+      libslist="/usr/lib64 /usr/lib /sw/lib /opt/local/lib /usr/local/lib 
/home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
       for i in $libslist; do
  if test -f $i/libcurl.a -o -f $i/libcurl.so; then
    if test x"$i" != x"/usr/lib"; then

Index: macros/glib.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/glib.m4,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- macros/glib.m4      30 Jul 2006 01:04:18 -0000      1.14
+++ macros/glib.m4      9 Aug 2006 01:59:07 -0000       1.15
@@ -63,7 +63,7 @@
   dnl doesn't seem to get a directory that is unversioned.
   if test x"${gnash_glib_version}" = x; then
     AC_MSG_CHECKING([for the Glib Version])
-    pathlist="${with_glib_incl} ${prefix}/include /sw/include 
/usr/local/include /home/latest/include /opt/include /usr/include 
/usr/pkg/include .. ../.."
+    pathlist="${with_glib_incl} ${prefix}/include /sw/include 
/opt/local/include /usr/local/include /home/latest/include /opt/include 
/usr/include /usr/pkg/include .. ../.."
 
     gnash_glib_topdir=""
     gnash_glib_version=""
@@ -90,7 +90,7 @@
     AC_CHECK_HEADERS(glib.h, [ac_cv_path_glib_incl=""],[
       if test x"${ac_cv_path_glib_incl}" = x; then
         AC_MSG_CHECKING([for libglib header])
-        incllist="${prefix}/include /sw/include /usr/local/include 
/home/latest/include /usr/include /opt/include /usr/pkg/include .. ../.."
+        incllist="${prefix}/include /sw/include /opt/local/include 
/usr/local/include /home/latest/include /usr/include /opt/include 
/usr/pkg/include .. ../.."
 
         for i in $incllist; do
           if test -f $i/glib.h; then
@@ -127,7 +127,7 @@
   if test x"${ac_cv_path_glib_lib}" = x; then
     AC_CHECK_LIB(glib-${gnash_glib_version}, g_io_channel_init, 
[ac_cv_path_glib_lib="-lglib-${gnash_glib_version}"],[
       AC_MSG_CHECKING([for libglib library])
-      libslist="${ac_cv_path_glib_lib} ${prefix}/lib64 ${prefix}/lib /usr/lib 
/usr/lib64 /sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. 
../.."
+      libslist="${ac_cv_path_glib_lib} ${prefix}/lib64 ${prefix}/lib /usr/lib 
/usr/lib64 /sw/lib /usr/local/lib /opt/local/lib /home/latest/lib /opt/lib 
/usr/pkg/lib .. ../.."
       for i in $libslist; do
         if test -f $i/libglib-${gnash_glib_version}.a -o -f 
$i/libglib-${gnash_glib_version}.so; then
           if test x"$i" != x"/usr/lib"; then

Index: macros/gtk2.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtk2.m4,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- macros/gtk2.m4      26 Jul 2006 17:17:55 -0000      1.22
+++ macros/gtk2.m4      9 Aug 2006 01:59:07 -0000       1.23
@@ -58,7 +58,7 @@
   dnl doesn't seem to get a directory that is unversioned.
   if test x"${gnash_gtk2_version}" = x; then
     AC_MSG_CHECKING([for the Gtk Version])
-    pathlist="${prefix}/include /sw/include /usr/local/include 
/usr/X11R6/include /home/latest/include /opt/include /usr/include 
/usr/pkg/include .. ../.."
+    pathlist="${prefix}/include /sw/include /opt/local/include 
/usr/local/include /usr/X11R6/include /home/latest/include /opt/include 
/usr/include /usr/pkg/include .. ../.."
 
     gnash_gtk2_topdir=""
     gnash_gtk2_version=""
@@ -85,7 +85,7 @@
     AC_CHECK_HEADERS(gtk/gtk.h, [ac_cv_path_gtk2_incl=""],[
       if test x"${ac_cv_path_gtk2_incl}" = x; then
         AC_MSG_CHECKING([for libgtk2 header])
-        incllist="${prefix}/include /sw/include /usr/local/include 
/usr/X11R6/include /home/latest/include /opt/include /usr/include 
/usr/pkg/include .. ../.."
+        incllist="${prefix}/include /sw/include /opt/local/lib 
/usr/local/include /usr/X11R6/include /home/latest/include /opt/include 
/usr/include /usr/pkg/include .. ../.."
 
         for i in $incllist; do
           if test -f $i/${gnash_gtk2_topdir}/gtk/gtk.h; then

Index: macros/jpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/jpeg.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- macros/jpeg.m4      27 Apr 2006 15:31:18 -0000      1.11
+++ macros/jpeg.m4      9 Aug 2006 01:59:07 -0000       1.12
@@ -61,7 +61,7 @@
       AC_CHECK_HEADERS(jpeglib.h, [ac_cv_path_jpeg_incl=""],[
       if test x"${ac_cv_path_jpeg_incl}" = x; then
         AC_MSG_CHECKING([for libjpeg header])
-        incllist="${prefix}/include /sw/include /usr/local/include 
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
+        incllist="${prefix}/include /sw/include /opt/local/include 
/usr/local/include /home/latest/include /opt/include /usr/include 
/usr/pkg/include .. ../.."
 
         for i in $incllist; do
          if test -f $i/jpeglib.h; then

Index: macros/libXML.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/libXML.m4,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- macros/libXML.m4    28 Jul 2006 16:45:53 -0000      1.18
+++ macros/libXML.m4    9 Aug 2006 01:59:07 -0000       1.19
@@ -91,7 +91,7 @@
   dnl Try finding out yourself
   dnl
   if test "x$LIBXML_CFLAGS" = "x" -o "x$LIBXML_LIBS" = "x"; then
-    dirlist="${prefix} /lib64 /usr/lib64 /lib /usr/lib /usr/pkg /usr 
/usr/local /opt /home/latest"
+    dirlist="${prefix} /lib64 /usr/lib64 /opt/local/lib /lib /usr/lib /usr/pkg 
/usr /usr/local /opt /home/latest"
     for i in $dirlist; do
       if test "x$LIBXML_CFLAGS" = "x"; then
         for j in `ls -dr $i/include/libxml2* 2>/dev/null ` ; do

Index: macros/mad.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/mad.m4,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- macros/mad.m4       24 Apr 2006 23:05:55 -0000      1.9
+++ macros/mad.m4       9 Aug 2006 01:59:07 -0000       1.10
@@ -62,7 +62,7 @@
       AC_CHECK_HEADERS(mad.h, [ac_cv_path_mad_incl=""],[
       if test x"${ac_cv_path_mad_incl}" = x; then
         AC_MSG_CHECKING([for libmad header])
-        incllist="${prefix}/include /sw/include /usr/local/include 
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
+        incllist="${prefix}/include /sw/include /opt/local/include 
/usr/local/include /home/latest/include /opt/include /usr/include 
/usr/pkg/include .. ../.."
 
         for i in $incllist; do
          if test -f $i/mad.h; then
@@ -108,7 +108,7 @@
       if test x"${ac_cv_path_mad_lib}" = x; then
         AC_CHECK_LIB(mad, mad_copyright, [ac_cv_path_mad_lib="-lmad"],[
           AC_MSG_CHECKING([for libmad library])
-          libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib 
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+          libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /opt/local/lib 
/usr/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
           for i in $libslist; do
            if test -f $i/libmad.a -o -f $i/libmad.so; then
              if test x"$i" != x"/usr/lib"; then

Index: macros/pango.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pango.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- macros/pango.m4     24 May 2006 11:26:04 -0000      1.11
+++ macros/pango.m4     9 Aug 2006 01:59:07 -0000       1.12
@@ -54,7 +54,7 @@
   dnl doesn't seem to get a directory that is unversioned.
   if test x"${ac_cv_path_pango_incl}" = x; then
     AC_MSG_CHECKING([for the Pango Version])
-      pathlist="/sw/include /usr/local/include /usr/X11R6/include 
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
+      pathlist="/sw/include /usr/local/include /opt/local/include 
/usr/X11R6/include /home/latest/include /opt/include /usr/include 
/usr/pkg/include .. ../.."
 
       gnash_pango_topdir=""
       gnash_pango_version=""
@@ -80,7 +80,7 @@
     AC_CHECK_HEADERS(pango/pango.h, [ac_cv_path_pango_incl=""],[
       if test x"${ac_cv_path_pango_incl}" = x; then
         AC_MSG_CHECKING([for libpango header])
-        incllist="/sw/include /usr/local/include /usr/X11R6/include 
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
+        incllist="/sw/include /usr/local/include /opt/local/include 
/usr/X11R6/include /home/latest/include /opt/include /usr/include 
/usr/pkg/include .. ../.."
 
         for i in $incllist; do
           if test -f $i/pango/pango.h; then
@@ -120,7 +120,7 @@
   if test x"${ac_cv_path_pango_incl}" != x; then
     AC_CHECK_LIB(pango-${gnash_pango_version}, pango_engine_shape_class_init, 
[ac_cv_path_pango_lib="-lpango-${gnash_pango_version}"],[
       AC_MSG_CHECKING([for libpango library])
-      libslist="/usr/lib64 /usr/lib /sw/lib /usr/X11R6/lib64 /usr/X11R6/lib 
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+      libslist="/usr/lib64 /usr/lib /sw/lib /opt/local/lib /usr/X11R6/lib64 
/usr/X11R6/lib /usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
       for i in $libslist; do
         if test -f $i/libpango-${gnash_pango_version}.a -o -f 
$i/libpango-${gnash_pango_version}.so; then
           if test x"$i" != x"/usr/lib"; then

Index: macros/sdl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/sdl.m4,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- macros/sdl.m4       25 Jul 2006 13:56:02 -0000      1.19
+++ macros/sdl.m4       9 Aug 2006 01:59:07 -0000       1.20
@@ -55,7 +55,7 @@
   dnl doesn't seem to get a directory that is unversioned.
   if test x"${ac_cv_path_sdl_incl}" = x; then
     AC_MSG_CHECKING([for the SDL Version])
-    pathlist="/sw/include /usr/local/include /home/latest/include /opt/include 
/usr/include /usr/pkg/include .. ../.."
+    pathlist="/sw/include /usr/local/include /opt/local/include 
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
 
     gnash_sdl_topdir=""
     gnash_sdl_version=""
@@ -80,7 +80,7 @@
 
   if test x"${ac_cv_path_sdl_incl}" = x ; then
     AC_MSG_CHECKING([for SDL header])
-    incllist="${prefix} /usr /usr/pkg /sw /usr/local /home/latest /opt /usr .. 
../.."
+    incllist="${prefix} /usr /usr/pkg /sw /opt/local /usr/local /home/latest 
/opt /usr .. ../.."
 
     for i in $incllist; do
       if test -f $i/SDL/include/SDL.h; then
@@ -133,7 +133,7 @@
   if test x"${ac_cv_path_sdl_lib}" = x ; then
     AC_CHECK_LIB(SDL, SDL_Init, [ac_cv_path_sdl_lib="-lSDL"],[
       AC_MSG_CHECKING([for SDL library])
-      liblist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /usr/pkg/lib 
/sw/lib /usr/local/lib /home/latest/lib /opt/lib.. ../.."
+      liblist="${prefix}/lib64 ${prefix}/lib /opt/local/lib /usr/lib64 
/usr/lib /usr/pkg/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib.. ../.."
       for i in $liblist; do
         if test -f $i/libSDL.a -o -f $i/libSDL.so; then
           if test x"$i" != x"/usr/lib"; then
@@ -195,7 +195,7 @@
   ])
   if test x"${ac_cv_path_sdl_mixer_incl}" = x ; then
     AC_MSG_CHECKING([for SDL_mixer header])
-    incllist="${prefix} /usr/pkg /sw /usr/local /home/latest /opt /usr .. 
../.."
+    incllist="${prefix} /usr/pkg /sw /opt/local /usr/local /home/latest /opt 
/usr .. ../.."
 
     for i in $incllist; do
       if test -f $i/SDL/include/SDL_mixer.h; then
@@ -257,7 +257,7 @@
 
   if test x"${ac_cv_path_sdl_mixer_lib}" = x ; then
     AC_MSG_CHECKING([for SDL_mixer library])
-    liblist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /usr/pkg/lib 
/sw/lib /usr/local/lib /home/latest/lib /opt/lib.. ../.."
+    liblist="${prefix}/lib64 ${prefix}/lib /opt/local/lib /usr/lib64 /usr/lib 
/usr/pkg/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib.. ../.."
     for i in $liblist; do
       if test -f $i/libSDL_mixer.a -o -f $i/libSDl_mixer.so; then
         if test x"$i" != x"/usr/lib"; then




reply via email to

[Prev in Thread] Current Thread [Next in Thread]