[Gnash-commit] gnash ./ChangeLog macros/atk.m4 macros/gtk2.m4 ...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/04/22 23:39:17

Modified files:
        .              : ChangeLog 
        macros         : atk.m4 gtk2.m4 gtkglext.m4 pango.m4 

Log message:
        * macros/atk.m4: Look for libraries in /usr/X11R6/lib, and headers
        in /usr/X11R6/include.
        * macros/gtk2.m4: Look for libraries in /usr/X11R6/lib, and
        headers in /usr/X11R6/include.
        * macros/gtkglext.m4: Look for libraries in /usr/X11R6/lib.
        * macros/pango.m4: Look for libraries in /usr/X11R6/lib.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.223&tr2=1.224&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/atk.m4.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/gtk2.m4.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/gtkglext.m4.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/pango.m4.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.223 gnash/ChangeLog:1.224
--- gnash/ChangeLog:1.223       Sat Apr 22 19:44:16 2006
+++ gnash/ChangeLog     Sat Apr 22 23:39:16 2006
@@ -1,5 +1,12 @@
 2006-04-22  Rob Savoye  <address@hidden>
 
+       * macros/atk.m4: Look for libraries in /usr/X11R6/lib, and headers
+       in /usr/X11R6/include.
+       * macros/gtk2.m4: Look for libraries in /usr/X11R6/lib, and
+       headers in /usr/X11R6/include.
+       * macros/gtkglext.m4: Look for libraries in /usr/X11R6/lib.
+       * macros/pango.m4: Look for libraries in /usr/X11R6/lib.
+       
        * macros/fltk.m4: Look in X11R6 for headers.
        * macros/gtkglext.m4: Look in X11R6 for headers.
        * macros/pango.m4: Look in X11R6 for headers.
Index: gnash/macros/atk.m4
diff -u gnash/macros/atk.m4:1.4 gnash/macros/atk.m4:1.5
--- gnash/macros/atk.m4:1.4     Sat Apr  1 02:36:53 2006
+++ gnash/macros/atk.m4 Sat Apr 22 23:39:17 2006
@@ -81,7 +81,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 
/opt/include /usr/include /usr/pkg/include .. ../.."
+        incllist="/sw/include /usr/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
Index: gnash/macros/gtk2.m4
diff -u gnash/macros/gtk2.m4:1.7 gnash/macros/gtk2.m4:1.8
--- gnash/macros/gtk2.m4:1.7    Thu Apr 20 17:21:40 2006
+++ gnash/macros/gtk2.m4        Sat Apr 22 23:39:17 2006
@@ -56,7 +56,7 @@
     dnl doesn't seem to get a directory that is unversioned.
     if test x"${ac_cv_path_gtk2_incl}" = x; then
       AC_MSG_CHECKING([for the Gtk Version])
-      pathlist="${prefix}/include /sw/include /usr/local/include 
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
+      pathlist="${prefix}/include /sw/include /usr/local/include 
/usr/X11R6/include /home/latest/include /opt/include /usr/include 
/usr/pkg/include .. ../.."
 
       topdir=""
       version=""
@@ -82,7 +82,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 
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
+          incllist="${prefix}/include /sw/include /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/${topdir}/gtk/gtk.h; then
@@ -121,7 +121,7 @@
     if test x"${ac_cv_path_gtk2_incl}" != x; then
       AC_CHECK_LIB(gtk-x11-2.0, gtk_init, [ac_cv_path_gtk2_lib="-lgtk-x11-2.0 
-lgdk-x11-2.0"],[
         AC_MSG_CHECKING([for libgtk2 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/X11R6/lib64 
/usr/X11R6/lib /usr/lib64 /usr/lib /sw/lib /usr/local/lib /home/latest/lib 
/opt/lib /usr/pkg/lib .. ../.."
         for i in $libslist; do
          if test -f $i/libgtk-x11-2.0.a -o -f $i/libgtk-x11-2.0.so; then
            if test x"$i" != x"/usr/lib"; then
Index: gnash/macros/gtkglext.m4
diff -u gnash/macros/gtkglext.m4:1.5 gnash/macros/gtkglext.m4:1.6
--- gnash/macros/gtkglext.m4:1.5        Sat Apr 22 19:44:16 2006
+++ gnash/macros/gtkglext.m4    Sat Apr 22 23:39:17 2006
@@ -66,7 +66,7 @@
 dnl doesn't seem to get a directory that is unversioned.
     if test x"${ac_cv_path_glext_incl}" = x ; then
       AC_MSG_CHECKING([for the Gtk GL Extensions Version])
-      pathlist="${prefix}/include /sw/include /usr/local/include 
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
+      pathlist="${prefix}/include /sw/include /usr/local/include 
/usr/X11R6/include /home/latest/include /opt/include /usr/include 
/usr/pkg/include .. ../.."
 
       topdir=""
       version=""
@@ -92,7 +92,7 @@
       AC_CHECK_HEADERS(gtk/gtkgl.h, [ac_cv_path_glext_incl=""],[
       if test x"${ac_cv_path_glext_incl}" = x; then
         AC_MSG_CHECKING([for libglext header])
-        incllist="${prefix}/include /sw/include /usr/local/include 
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
+        incllist="${prefix}/include /sw/include /usr/local/include 
/usr/X11R6/include /home/latest/include /opt/include /usr/include 
/usr/pkg/include .. ../.."
 
        ac_cv_path_glext_incl=""
         for i in $incllist; do
@@ -128,7 +128,7 @@
       if test x"${ac_cv_path_glext_incl}" != x; then
         AC_CHECK_LIB(gtkglext-x11-${version}, gtk_gl_init, 
[ac_cv_path_glext_lib="-lgtkglext-x11-${version} -lgdkglext-x11-${version}"],[
           AC_MSG_CHECKING([for libglext 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/X11R6/lib64 
/usr/X11R6/lib /usr/lib64 /usr/lib /sw/lib /usr/local/lib /home/latest/lib 
/opt/lib /usr/pkg/lib .. ../.."
           for i in $libslist; do
            if test -f $i/libgtkglext-x11-${version}.a -o -f 
$i/libgtkglext-x11-${version}.so; then
              if test x"$i" != x"/usr/lib"; then
Index: gnash/macros/pango.m4
diff -u gnash/macros/pango.m4:1.7 gnash/macros/pango.m4:1.8
--- gnash/macros/pango.m4:1.7   Sat Apr 22 19:44:16 2006
+++ gnash/macros/pango.m4       Sat Apr 22 23:39:17 2006
@@ -82,7 +82,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 /home/latest/include 
/opt/include /usr/include /usr/pkg/include .. ../.."
+            incllist="/sw/include /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/pango/pango.h; then
@@ -122,7 +122,7 @@
       if test x"${ac_cv_path_pango_incl}" != x; then
         AC_CHECK_LIB(pango-${version}, pango_engine_shape_class_init, 
[ac_cv_path_pango_lib="-lpango-${version}"],[
           AC_MSG_CHECKING([for libpango 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 /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-${version}.a -o -f 
$i/libpango-${version}.so; then
              if test x"$i" != x"/usr/lib"; then