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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/12 15:58:27

Modified files:
        .              : ChangeLog 
        macros         : atk.m4 

Log message:
        removed bogus if/else/fi blocks; added some # }{ labels to help 
debugging.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1168&r2=1.1169
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/atk.m4?cvsroot=gnash&r1=1.18&r2=1.19

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1168
retrieving revision 1.1169
diff -u -b -r1.1168 -r1.1169
--- ChangeLog   12 Oct 2006 15:44:10 -0000      1.1168
+++ ChangeLog   12 Oct 2006 15:58:27 -0000      1.1169
@@ -2,7 +2,8 @@
 
        * macros/atk.m4: added missing switches in lib detection;
          always look for atk version and topdir as those might eventually
-         be needed by subsequent library seeking.
+         be needed by subsequent library seeking; removed bogus if/else/fi
+         blocks; added some # }{ labels to help debugging.
        * server/gnash.h: document enclose_transformed_rect() function.
 
 2006-10-12 Markus Gothe <address@hidden>

Index: macros/atk.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/atk.m4,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- macros/atk.m4       12 Oct 2006 15:44:10 -0000      1.18
+++ macros/atk.m4       12 Oct 2006 15:58:27 -0000      1.19
@@ -35,7 +35,7 @@
 dnl  
 dnl 
 
-dnl $Id: atk.m4,v 1.18 2006/10/12 15:44:10 strk Exp $
+dnl $Id: atk.m4,v 1.19 2006/10/12 15:58:27 strk Exp $
 
 AC_DEFUN([GNASH_PATH_ATK],
 [
@@ -130,34 +130,20 @@
   dnl If the header doesn't exist, there is no point looking for
   dnl the library.
   AC_MSG_CHECKING([for libatk library])
-  if test x"${ac_cv_path_atk_incl}" != x -a x"ac_cv_path_atk_lib" = x ; then
+  if test x"${ac_cv_path_atk_incl}" != x -a x"ac_cv_path_atk_lib" = x ; then #{
     AC_CHECK_LIB(atk-${gnash_atk_version}, atk_focus_tracker_init, 
[ac_cv_path_atk_lib="-latk-${gnash_atk_version}"],[
       libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib 
/opt/local/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib /opt/local/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
+        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 #{
             ac_cv_path_atk_lib="-L$i -latk-${gnash_atk_version}"
-            break
-          else
+          else #}{
             ac_cv_path_atk_lib="-latk-${gnash_atk_version}"
+          fi #}
             break
-          fi
-        else
-          if test -f $i/libatk-${gnash_atk_version}.a -o -f 
$i/libatk-${gnash_atk_version}.so; then
-            ac_cv_path_atk_lib="-L$i/${gnash_atk_topdir} 
-latk-${gnash_atk_version}"
-         fi
-           break
-        fi
+        fi #}
       done])
-  else
-    if test -f $i/libatk-${gnash_atk_version}.a -o -f 
$i/libatk-${gnash_atk_version}.so; then
-      if test x"${ac_cv_path_atk_lib}" != x"/usr/lib"; then
-        ac_cv_path_atk_lib="-L${ac_cv_path_atk_lib} -latk-${gnash_atk_version}"
-        else
-        ac_cv_path_atk_lib="-latk-${gnash_atk_version}"
-      fi
-    fi
-  fi
+  fi #}
 
   if test x"${ac_cv_path_atk_lib}" != x ; then
        AC_MSG_RESULT(yes)