[Gnash-commit] /srv/bzr/gnash/trunk r11946: Fix a traversion bug in finding paths for headers

[Markus Gothe]

------------------------------------------------------------
revno: 11946
committer: Markus Gothe <address@hidden>
branch nick: trunk
timestamp: Sun 2010-02-14 18:18:27 +0100
message:
  Fix a traversion bug in finding paths for headers
modified:
  macros/gnashpkgtool.m4

=== modified file 'macros/gnashpkgtool.m4'
--- a/macros/gnashpkgtool.m4    2010-02-14 17:04:51 +0000
+++ b/macros/gnashpkgtool.m4    2010-02-14 17:18:27 +0000
@@ -107,15 +107,17 @@
                 fi
                 break
               else
-                found_$1_incl="yes"
                 if test -f $i/$name/$2; then
+                  found_$1_incl="yes"
                   ac_cv_path_$1_incl="-I$i/$name"
+                  break
                 else
                   if test -f $i/$2; then
+                    found_$1_incl="yes" 
                     ac_cv_path_$1_incl="-I$i"
+                    break
                   fi
                 fi
-                break
               fi
             done
           fi
@@ -125,20 +127,20 @@
   ])
   fi
   
-  dnl AC_MSG_CHECKING([for $2 header]) 
+  AC_MSG_CHECKING([for $2 header]) 
   if test x"${found_$1_incl}" = "xyes"; then
 
       dnl It seems we need to explicitly call AC_DEFINE as AC_CHECK_HEADER 
doesn't
       dnl do this automatically. AC_CHECK_HEADERS (not the final S) would do 
it.
       AC_DEFINE([HAVE_]UPHEADER, 1, [Define if you have the $2 header])
-      dnl AC_MSG_RESULT(${ac_cv_path_$1_incl})
+      AC_MSG_RESULT(${ac_cv_path_$1_incl})
       if test x"${ac_cv_path_$1_incl}" != x -a x"${ac_cv_path_$1_incl}" != 
x"-I/usr/include"; then
         UP[]_CFLAGS="${ac_cv_path_$1_incl}"        
       else
         UP[]_CFLAGS=""
       fi
-  dnl else
-       dnl AC_MSG_RESULT([not found])
+  else
+         AC_MSG_RESULT([not found])
     fi
   fi
   AC_SUBST(UP[]_CFLAGS)