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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/11 10:40:19

Modified files:
        .              : ChangeLog 
        macros         : gtk2.m4 

Log message:
        fix handling of --with-gtk2-libs (and commented-out the caching call 
due to ignorance about it :)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1135&r2=1.1136
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtk2.m4?cvsroot=gnash&r1=1.26&r2=1.27

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1135
retrieving revision 1.1136
diff -u -b -r1.1135 -r1.1136
--- ChangeLog   11 Oct 2006 10:38:40 -0000      1.1135
+++ ChangeLog   11 Oct 2006 10:40:19 -0000      1.1136
@@ -1,5 +1,7 @@
 2006-10-11 Sandro Santilli <address@hidden>
 
+       * macros/gtk2.m4: fix handling of --with-gtk2-libs (and commented-out
+         the caching call due to ignorance about it :)
        * configure.ac: print GTK, PANGO and GLIB and ATK variables if gtk
          gui is requested (even if not with opengl renderer)
        * configure.ac, testsuite/Makefile.am, testsuite/server/Makefile.am,

Index: macros/gtk2.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtk2.m4,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- macros/gtk2.m4      11 Oct 2006 10:14:38 -0000      1.26
+++ macros/gtk2.m4      11 Oct 2006 10:40:19 -0000      1.27
@@ -35,7 +35,7 @@
 dnl  
 dnl 
 
-dnl $Id: gtk2.m4,v 1.26 2006/10/11 10:14:38 nihilus Exp $
+dnl $Id: gtk2.m4,v 1.27 2006/10/11 10:40:19 strk Exp $
 
 AC_DEFUN([GNASH_PATH_GTK2],
 [
@@ -116,10 +116,13 @@
        [  --with-gtk2-lib         directory where gtk2 library is],
        with_gtk2_lib=${withval})
 
-    AC_CACHE_VAL(ac_cv_path_gtk2_lib, [ 
ac_cv_path_gtk2_lib=-L${with_gtk2_lib}])
+  dnl disabled as semantic is not really clear to me:
+  dnl when should we set the cache ? what should we set in it ?
+  dnl should any piece of code get disabled if a cache exists ?
+  dnl AC_CACHE_VAL(ac_cv_path_gtk2_lib, [ 
ac_cv_path_gtk2_lib=-L${with_gtk2_lib}])
 
-
-  if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_gtk2_lib}" = x; then
+  dnl Use PKG_CONFIG only if no --with-gtk2-lib has been specified
+  if test x"$PKG_CONFIG" != x -a x"${with_gtk2_lib}" = x; then
     $PKG_CONFIG --exists gtk+-2.0 && ac_cv_path_gtk2_lib=`$PKG_CONFIG --libs 
gtk+-2.0`
   fi
 
@@ -128,7 +131,7 @@
   AC_MSG_CHECKING([for libgtk2 library])
   if test x"${ac_cv_path_gtk2_incl}" != x -a x"$ac_cv_path_gtk2_lib" = x; then
     AC_CHECK_LIB(gtk-x11-2.0, gtk_init, [ac_cv_path_gtk2_lib="-lgtk-x11-2.0 
-lgdk-x11-2.0"],[
-      libslist="${prefix}/lib64 ${prefix}/lib /usr/X11R6/lib64 /usr/X11R6/lib 
/usr/lib64 /usr/lib /sw/lib /usr/local/lib /opt/local/lib /home/latest/lib 
/opt/lib /usr/pkg/lib .. ../.."
+      libslist="${with_gtk2_lib} ${prefix}/lib64 ${prefix}/lib 
/usr/X11R6/lib64 /usr/X11R6/lib /usr/lib64 /usr/lib /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/libgtk-x11-2.0.a -o -f $i/libgtk-x11-2.0.so; then
           if test x"$i" != x"/usr/lib"; then