[Gnash-commit] gnash/macros gtkglext.m4 glib.m4

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/05/16 02:40:24

Modified files:
        macros         : gtkglext.m4 glib.m4 

Log message:
        * glib.m4, gtkglext.m4: Change the order of /usr/lib and
        /usr/lib64 when looking for the config files.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/gtkglext.m4.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/glib.m4.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gnash/macros/glib.m4
diff -u gnash/macros/glib.m4:1.7 gnash/macros/glib.m4:1.8
--- gnash/macros/glib.m4:1.7    Fri May 12 17:48:40 2006
+++ gnash/macros/glib.m4        Tue May 16 02:40:24 2006
@@ -123,7 +123,7 @@
   if test x"${ac_cv_path_glib_incl}" != x; then
     AC_CHECK_LIB(glib-${version}, g_io_channel_init, 
[ac_cv_path_glib_lib="-lglib-${version}"],[
       AC_MSG_CHECKING([for libglib 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/lib /usr/lib64 /sw/lib 
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
       for i in $libslist; do
        if test -f $i/glib-${version}/include/glibconfig.h; then
          ac_cv_path_glib_incl="${ac_cv_path_glib_incl} 
-I${i}/glib-${version}/include"
Index: gnash/macros/gtkglext.m4
diff -u gnash/macros/gtkglext.m4:1.10 gnash/macros/gtkglext.m4:1.11
--- gnash/macros/gtkglext.m4:1.10       Fri May 12 17:48:40 2006
+++ gnash/macros/gtkglext.m4    Tue May 16 02:40:24 2006
@@ -127,7 +127,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/X11R6/lib64 
/usr/X11R6/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/lib /usr/lib64 /sw/lib /usr/local/lib /home/latest/lib 
/opt/lib /usr/pkg/lib .. ../.."
           for i in $libslist; do
            if test -f $i/gtkglext-${version}/include/gdkglext-config.h; then
              ac_cv_path_glext_incl="${ac_cv_path_glext_incl} 
-I${i}/gtkglext-${version}/include"